diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml
index 389ef8db2..375741b59 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml
@@ -29,7 +29,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml
index c38168fc2..1a51c8209 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml
@@ -29,7 +29,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml
index db65f2e2d..c7c3f37f4 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml
@@ -33,7 +33,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml
index 8ba86cf7f..8f4ddf7dc 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml
@@ -33,7 +33,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml
index 4cb374036..631cf0413 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml
@@ -33,7 +33,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml
index 65b4e47b8..d0a5b5933 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml
@@ -33,7 +33,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${KIBANA_SUITE} CHART=kibana
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-logstash.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-logstash.yml
index a88c04954..0224e363f 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-logstash.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-logstash.yml
@@ -33,7 +33,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${LOGSTASH_SUITE} CHART=logstash
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-metricbeat.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-metricbeat.yml
index c34a03a2d..05690b390 100644
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-metricbeat.yml
+++ b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-metricbeat.yml
@@ -33,7 +33,7 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-%BRANCH%"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${METRICBEAT_SUITE} CHART=metricbeat