diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9d6cd859eca6c2f6cea605c78a9469b90b7353d..8d23a229d3c5276c144de880bd5c476417e693cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,5 @@
 image: busybox:latest
 
-variables:
-  TF_ROOT_ELASTIC: ${CI_PROJECT_DIR}/manifests/elastic
-  TF_ROOT_MAGENTO: ${CI_PROJECT_DIR}/manifests/magento
-
-cache:
-  key: manifests-elastic
-  paths:
-    - ${TF_ROOT_ELASTIC}/.terraform
-
 # docs: https://docs.gitlab.com/ee/user/infrastructure/iac/terraform_state.html#get-started-using-gitlab-ci
 terraform-elastic:
   stage: deploy
@@ -18,10 +9,11 @@ terraform-elastic:
     name: registry.gitlab.com/gitlab-org/terraform-images/stable:latest
     entrypoint: [""]
   variables:
+    TF_ROOT: ${CI_PROJECT_DIR}/manifests/elastic
     TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/elastic
     TF_VAR_ec_apikey: $EC_API_KEY
   script: |-
-    cd $TF_ROOT_ELASTIC
+    cd $TF_ROOT
     gitlab-terraform init 
     gitlab-terraform validate
     gitlab-terraform fmt -check
@@ -37,12 +29,13 @@ terraform-magento:
     name: registry.gitlab.com/gitlab-org/terraform-images/stable:latest
     entrypoint: [""]
   variables:
+    TF_ROOT: ${CI_PROJECT_DIR}/manifests/magento
     TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/magento
     TF_VAR_ec_apikey: $EC_API_KEY
     TF_VAR_project_id: $GCP_PROJECT_ID
     GCP_SA_GITLAB: $GCP_SA_GITLAB
   script: |-
-    cd $TF_ROOT_MAGENTO
+    cd $TF_ROOT
     echo $GCP_SA_GITLAB > gcp-sa.json
     ls -l
     gitlab-terraform init