diff --git a/templates/terraform.tpl.yml b/templates/terraform.tpl.yml
index 9e150d2..93ec639 100644
--- a/templates/terraform.tpl.yml
+++ b/templates/terraform.tpl.yml
@@ -1,13 +1,13 @@
 .terraform_fmt:
   script:
     - ./scripts/cd-workdir.sh
-    - ./scripts/terraform-fmt.sh
+    - ./scripts/terraform/fmt.sh
 
 .terraform_validate:
   script:
     - ./scripts/cd-workdir.sh
-    - ./scripts/terraform-init.sh
-    - ./scripts/terraform-validate.sh
+    - ./scripts/terraform/init.sh
+    - ./scripts/terraform/validate.sh
     
 .terraform_plan:
   variables:
@@ -15,8 +15,8 @@
     JSON_PLAN_FILE: tfplan.json
   script:
     - ./scripts/cd-workdir.sh
-    - ./scripts/terraform-init.sh
-    - ./scripts/terraform-plan.sh
+    - ./scripts/terraform/init.sh
+    - ./scripts/terraform/plan.sh
   artifacts:
     reports:
       terraform: $WORKDIR/$JSON_PLAN_FILE
@@ -25,11 +25,11 @@
 .terraform_apply:
   script:
     - ./scripts/cd-workdir.sh
-    - ./scripts/terraform-init.sh
-    - ./scripts/terraform-apply.sh
+    - ./scripts/terraform/init.sh
+    - ./scripts/terraform/apply.sh
 
 .terraform_destroy:
   script:
     - ./scripts/cd-workdir.sh
-    - ./scripts/terraform-init.sh
-    - ./scripts/terraform-destroy.sh
\ No newline at end of file
+    - ./scripts/terraform/init.sh
+    - ./scripts/terraform/destroy.sh