diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8d7c0e..cd4e41f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ include:
 
 format:
   stage: lint
+  image: docker.durp.info/hashicorp/terraform:light
   variables:
     WORKDIR: $CI_PROJECT_DIR/terraform
   allow_failure: false
@@ -27,6 +28,7 @@ format:
 
 validate:
   stage: lint
+  image: docker.durp.info/hashicorp/terraform:light
   variables:
     WORKDIR: $CI_PROJECT_DIR/terraform
   allow_failure: false
@@ -42,6 +44,7 @@ validate:
 
 plan:
   stage: lint
+  image: docker.durp.info/hashicorp/terraform:light
   variables:
     WORKDIR: $CI_PROJECT_DIR/terraform
     ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
@@ -59,6 +62,7 @@ plan:
 
 k3s:
   stage: build
+  image: docker.durp.info/hashicorp/terraform:light
   variables:
     WORKDIR: $CI_PROJECT_DIR/terraform
     ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
@@ -109,6 +113,7 @@ k3s-ansible:
 
 k3s-dns:
   stage: build
+  image: docker.durp.info/hashicorp/terraform:light
   variables:
     WORKDIR: $CI_PROJECT_DIR/ansible
     FILE: dns.yml
@@ -142,6 +147,7 @@ k3s-update:
 
 k3s-destroy:
   stage: destroy
+  image: docker.durp.info/hashicorp/terraform:light
   variables:
     WORKDIR: $CI_PROJECT_DIR/terraform
     ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
@@ -163,35 +169,3 @@ k3s-destroy:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: never              
     - when: never   
-
-
-
-#destroy:
-#  stage: destroy
-#  image:
-#    name: hashicorp/terraform:light
-#    entrypoint:
-#      - '/usr/bin/env'
-#      - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-#  variables:
-#    PLAN: plan.tfplan
-#    JSON_PLAN_FILE: tfplan.json
-#    TF_IN_AUTOMATION: "true"
-#    GITLAB_TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/${CI_PROJECT_NAME}
-#  cache:
-#    key: "$CI_COMMIT_SHA"
-#    paths:
-#      - .terraform
-#  script:
-#    - apk add --update curl jq
-#    - alias convert_report="jq -r '([.resource_changes[].change.actions?]|flatten)|{\"create\":(map(select(.==\"create\"))|length),\"update\":(map(select(.==\"update\"))|length),\"delete\":(map(select(.==\"delete\"))|length)}'"
-#    - terraform --version
-#    - terraform init -reconfigure -backend-config="address=${GITLAB_TF_ADDRESS}" -backend-config="lock_address=${GITLAB_TF_ADDRESS}/lock" -backend-config="unlock_address=${GITLAB_TF_ADDRESS}/lock" -backend-config="username=gitlab-ci-token" -backend-config="password=${CI_JOB_TOKEN}" -backend-config="lock_method=POST" -backend-config="unlock_method=DELETE" -backend-config="retry_wait_min=5"      
-#    - terraform destroy -auto-approve -var-file=terraform.tfvars
-#  only:
-#    changes:
-#      - terraform.tf 
-#      - terraform.tfvars 
-#      - jobs/main.yml     
-#  when: manual          
-