diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index f325bf552..6e45523c5 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -290,8 +290,7 @@ smoke test:
     - docker
     - fbsmoke
    rules:
-#     - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
-     - if: '$CI_PIPELINE_SOURCE == "push"'
+     - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
    before_script:
      - apt-get update && apt-get install -y gnupg software-properties-common curl git
diff --git a/qa/tf/gauntlet/samsung/terraform.tfstate.backup b/qa/tf/gauntlet/samsung/terraform.tfstate.backup
index bc74976b2..5a8a4917a 100644
--- a/qa/tf/gauntlet/samsung/terraform.tfstate.backup
+++ b/qa/tf/gauntlet/samsung/terraform.tfstate.backup
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.1.2",
-  "serial": 63,
+  "serial": 64,
   "lineage": "febac4ac-400a-d207-d2d1-64c55f14767b",
   "outputs": {
     "cluster_prefix": {
@@ -145,7 +145,7 @@
             "name_prefix": null,
             "path": "/",
             "role": "gauntlet-wFQOOzXB51R3ebr-fb_cluster_node",
-            "tags": null,
+            "tags": {},
             "tags_all": {},
             "unique_id": "AIPA6HD75E55UMCWYCTQW"
           },
@@ -185,7 +185,7 @@
             "name_prefix": "",
             "path": "/",
             "permissions_boundary": null,
-            "tags": null,
+            "tags": {},
             "tags_all": {},
             "unique_id": "AROA6HD75E55XTJYYBTLB"
           },
@@ -278,7 +278,7 @@
                 "encrypted": false,
                 "iops": 3000,
                 "kms_key_id": "",
-                "tags": null,
+                "tags": {},
                 "throughput": 125,
                 "volume_id": "vol-0d9377bbf488e54ef",
                 "volume_size": 20,
@@ -311,11 +311,11 @@
           "sensitive_attributes": [],
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9LCJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
           "dependencies": [
-            "module.samsung-cluster.aws_iam_instance_profile.fb_cluster_node_profile",
-            "module.samsung-cluster.aws_iam_role.fb_cluster_node_role",
             "module.samsung-cluster.aws_key_pair.gitlab-featurebase-ci",
             "module.samsung-cluster.aws_security_group.featurebase",
-            "module.samsung-cluster.data.aws_ami.amazon_linux_2"
+            "module.samsung-cluster.data.aws_ami.amazon_linux_2",
+            "module.samsung-cluster.aws_iam_instance_profile.fb_cluster_node_profile",
+            "module.samsung-cluster.aws_iam_role.fb_cluster_node_role"
           ]
         },
         {
@@ -395,7 +395,7 @@
                 "encrypted": false,
                 "iops": 3000,
                 "kms_key_id": "",
-                "tags": null,
+                "tags": {},
                 "throughput": 125,
                 "volume_id": "vol-0598ebf8df0eaf12f",
                 "volume_size": 20,
@@ -428,11 +428,11 @@
           "sensitive_attributes": [],
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9LCJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
           "dependencies": [
+            "module.samsung-cluster.aws_security_group.featurebase",
+            "module.samsung-cluster.data.aws_ami.amazon_linux_2",
             "module.samsung-cluster.aws_iam_instance_profile.fb_cluster_node_profile",
             "module.samsung-cluster.aws_iam_role.fb_cluster_node_role",
-            "module.samsung-cluster.aws_key_pair.gitlab-featurebase-ci",
-            "module.samsung-cluster.aws_security_group.featurebase",
-            "module.samsung-cluster.data.aws_ami.amazon_linux_2"
+            "module.samsung-cluster.aws_key_pair.gitlab-featurebase-ci"
           ]
         },
         {
@@ -512,7 +512,7 @@
                 "encrypted": false,
                 "iops": 3000,
                 "kms_key_id": "",
-                "tags": null,
+                "tags": {},
                 "throughput": 125,
                 "volume_id": "vol-04ca311d0f009fbd4",
                 "volume_size": 20,
@@ -545,11 +545,11 @@
           "sensitive_attributes": [],
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9LCJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
           "dependencies": [
-            "module.samsung-cluster.aws_iam_instance_profile.fb_cluster_node_profile",
             "module.samsung-cluster.aws_iam_role.fb_cluster_node_role",
             "module.samsung-cluster.aws_key_pair.gitlab-featurebase-ci",
             "module.samsung-cluster.aws_security_group.featurebase",
-            "module.samsung-cluster.data.aws_ami.amazon_linux_2"
+            "module.samsung-cluster.data.aws_ami.amazon_linux_2",
+            "module.samsung-cluster.aws_iam_instance_profile.fb_cluster_node_profile"
           ]
         }
       ]
@@ -638,7 +638,7 @@
                 "encrypted": false,
                 "iops": 3000,
                 "kms_key_id": "",
-                "tags": null,
+                "tags": {},
                 "throughput": 125,
                 "volume_id": "vol-0c996c15a2fbed5da",
                 "volume_size": 20,
@@ -671,11 +671,11 @@
           "sensitive_attributes": [],
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9LCJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
           "dependencies": [
+            "module.samsung-cluster.data.aws_ami.amazon_linux_2",
             "module.samsung-cluster.aws_iam_instance_profile.fb_cluster_node_profile",
             "module.samsung-cluster.aws_iam_role.fb_cluster_node_role",
             "module.samsung-cluster.aws_key_pair.gitlab-featurebase-ci",
-            "module.samsung-cluster.aws_security_group.ingest",
-            "module.samsung-cluster.data.aws_ami.amazon_linux_2"
+            "module.samsung-cluster.aws_security_group.ingest"
           ]
         }
       ]
@@ -697,7 +697,7 @@
             "key_name_prefix": "",
             "key_pair_id": "key-00da6c5ab0ac3a651",
             "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC91hhpVHNonAG7ku2ugpxEskf9KHeyHJPQJT26OHrMUw7R+T5A8TjqSzTau07sXQ/E9SO3ebV8SJ5PqeaQOnQB8VEvVNK0DjQH7ppvNg1Rfs42FZT9ttzTMvOjsSbK3vZTHXdoKQEdC9NxBwSkFIRGQojK1HUOq9xGrw31fA1OjSwlpLcbx7yyg18lcqW6UOptnVR8U9Yy9qQ5jZF1HtkQ6L9J+gv4o1UyNAUK2bopeGiXpBc3PQ/CFaFT2h/aqLBP66qAHsHVyAFD3PIRtplC5EHa8jXDgLacEls0uF7Q3kRPxvzcuo4g4VkOn1rDy9qH3vd2hT3aKVnM73FIDUiL",
-            "tags": null,
+            "tags": {},
             "tags_all": {}
           },
           "sensitive_attributes": [],