diff --git a/.gitignore b/.gitignore
index 701774ef41a7f024e714218f800e333ce8a9be6b..98fcbf979ab4abee083a94f0a743d7251de97dea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,12 @@ certs/
 
 .DS_Store
 
+.terraform
+*.pem
+*rke2.yaml
+
+*tfstate*
+
 # dependencies
 /node_modules
 
diff --git a/.gitlab-ci/templates.yml b/.gitlab-ci/templates.yml
index fa508e91450a3cea40f06e26932f49a6e6c7b201..e2f1e65619cede940e0ce9aceee2314c32fad56f 100644
--- a/.gitlab-ci/templates.yml
+++ b/.gitlab-ci/templates.yml
@@ -17,10 +17,9 @@ include:
   interruptible: false
   variables:
     TF_IN_AUTOMATION: "1"
-    TF_VAR_env: ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+    TF_VAR_env: $(echo "${CI_COMMIT_REF_SLUG}"| cut -c 1-7)-$(echo "${CI_COMMIT_SHA}" | cut -c 1-7)
   before_script:
     # Shorten the env name down to 15 characters
-    - export TF_VAR_env=$(echo "${CI_COMMIT_REF_SLUG}"| cut -c 1-7)-$(echo "${CI_COMMIT_SHA}" | cut -c 1-7)
     - cd ${CI_PROJECT_DIR}/${TF_ROOT}
     - terraform version
     - terraform init -input=false