diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14337de6ba4e992b70bf00a49cb8bd2a8a55bcee..fd188b803b35354004729b23712171c9ef2448ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,6 +209,8 @@ aws/rke2/cluster up:
     - .rke2 up
   needs:
     - job: aws/network up
+    - job: pre vars
+      artifacts: true
   environment:
     name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
@@ -281,6 +283,8 @@ aws/rke2/cluster down:
     - .rke2 down
   needs:
     - job: aws/rke2/bigbang down
+    - job: pre vars
+      artifacts: true
   environment:
     name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
diff --git a/.gitlab-ci/templates.yml b/.gitlab-ci/templates.yml
index c4c7ad631fcd7c95c046f6cce616ac2df29866bf..27fc2b958a22b8fc6aa2d04dfa45e2b2dae1f53f 100644
--- a/.gitlab-ci/templates.yml
+++ b/.gitlab-ci/templates.yml
@@ -18,7 +18,6 @@ include:
   variables:
     TF_IN_AUTOMATION: "1"
   before_script:
-    # Shorten the env name down to 15 characters
     - echo "$TF_VAR_env"
     - cd ${CI_PROJECT_DIR}/${TF_ROOT}
     - terraform version