diff --git a/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml b/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml
index 13ec67540..5514ba06a 100755
--- a/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml
+++ b/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml
@@ -10,9 +10,8 @@ spec:
   - name: run
     value: (join('-', ['e2e', 'min-cluster', env('GIT_REF')]))
   - name: cluster
-    # Format the cluster name into a valid Linode label
-    # TODO: This is over-truncated to account for the Linode NodeBalancer label
-    value: (trim((truncate(($run), `21`)), '-'))
+    # Format the cluster name
+    value: (trim((truncate(($run), `32`)), '-'))
   - name: nodebalancer
     value: ($cluster)
   template: true
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml b/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml
index 0a4c96bcd..796f76d81 100755
--- a/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml
+++ b/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml
@@ -10,9 +10,8 @@ spec:
   - name: run
     value: (join('-', ['e2e', 'min-lm', env('GIT_REF')]))
   - name: cluster
-    # Format the cluster name into a valid Linode label
-    # TODO: This is over-truncated to account for the Linode NodeBalancer label
-    value: (trim((truncate(($run), `21`)), '-'))
+    # Format the cluster name
+    value: (trim((truncate(($run), `32`)), '-'))
   template: true
   steps:
   - name: step-00
diff --git a/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml b/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml
index 6bd80a00a..8ddccd91b 100755
--- a/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml
+++ b/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml
@@ -10,9 +10,8 @@ spec:
   - name: run
     value: (join('-', ['e2e', 'lm-vpc', env('GIT_REF')]))
   - name: cluster
-    # Format the cluster name into a valid Linode label
-    # TODO: This is over-truncated to account for the Linode NodeBalancer label
-    value: (trim((truncate(($run), `21`)), '-'))
+    # Format the cluster name
+    value: (trim((truncate(($run), `32`)), '-'))
   - name: vpc
     # Format the VPC name into a valid Kubernetes object name
     value: (trim((truncate(($run), `63`)), '-'))