diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 87b68da71..48bbd3b89 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -251,6 +251,7 @@ smoke test:
     - wget https://go.dev/dl/go1.17.5.linux-amd64.tar.gz
     - tar -C /usr/local -xzf go1.17.5.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
+    - export TF_VAR_cluster_prefix="smoke-$(openssl rand -base64 12 | tr -d /=+ | cut -c -16)"
   script:
     - ./qa/scripts/setupSmokeTest.sh
     - ./qa/scripts/testSmokeTest.sh
diff --git a/qa/scripts/runSamsungGauntlet.sh b/qa/scripts/runSamsungGauntlet.sh
index d99a03baa..85fd22c67 100644
--- a/qa/scripts/runSamsungGauntlet.sh
+++ b/qa/scripts/runSamsungGauntlet.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-
-#openssl rand -base64 32 | tr -d /=+ | cut -c -16
-
 ./setupSamsungGauntlet.sh
 ./testSamsungGauntlet.sh
 ./teardownSamsungGauntlet.sh
diff --git a/qa/tf/ci/smoketest/main.tf b/qa/tf/ci/smoketest/main.tf
index 397da3391..ffb858de1 100644
--- a/qa/tf/ci/smoketest/main.tf
+++ b/qa/tf/ci/smoketest/main.tf
@@ -1,7 +1,7 @@
 
 module "ci-cluster" {
     source = "../../.modules/featurebase-cluster"
-    cluster_prefix = "smoke"
+    cluster_prefix = var.cluster_prefix
     region = var.region
     profile = var.profile
     fb_data_node_type = "m6g.large"
diff --git a/qa/tf/ci/smoketest/variables.tf b/qa/tf/ci/smoketest/variables.tf
index e87a8f517..a4143bbb7 100644
--- a/qa/tf/ci/smoketest/variables.tf
+++ b/qa/tf/ci/smoketest/variables.tf
@@ -11,4 +11,4 @@ variable "profile" {
 variable "gitlab_token" {
   description = "The API token for taking to Gitlab API - expected to come from an env variable."
   type        = string
-}
\ No newline at end of file
+}
diff --git a/qa/tf/gauntlet/samsung/variables.tf b/qa/tf/gauntlet/samsung/variables.tf
index e87a8f517..a4143bbb7 100644
--- a/qa/tf/gauntlet/samsung/variables.tf
+++ b/qa/tf/gauntlet/samsung/variables.tf
@@ -11,4 +11,4 @@ variable "profile" {
 variable "gitlab_token" {
   description = "The API token for taking to Gitlab API - expected to come from an env variable."
   type        = string
-}
\ No newline at end of file
+}