diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60a4b68..7d673fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ build_base:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
 
 include:
-  - "base/coder-cli/.gitlab-ci.yml"
-  - "base/terraform-shell/.gitlab-ci.yml"
+  - "tools/coder-cli/.gitlab-ci.yml"
+  - "tools/terraform-shell/.gitlab-ci.yml"
   - "java/.gitlab-ci.yml"
   - "php/.gitlab-ci.yml"
\ No newline at end of file
diff --git a/base/coder-cli/.gitlab-ci.yml b/tools/coder-cli/.gitlab-ci.yml
similarity index 93%
rename from base/coder-cli/.gitlab-ci.yml
rename to tools/coder-cli/.gitlab-ci.yml
index 3d5d257..d07fa0c 100644
--- a/base/coder-cli/.gitlab-ci.yml
+++ b/tools/coder-cli/.gitlab-ci.yml
@@ -7,5 +7,5 @@ build_cli:
     - buildah push ${FQ_IMAGE_NAME}:coder-cli
   rules:
     - changes:
-        - base/coder-cli/**
+        - tools/coder-cli/**
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
\ No newline at end of file
diff --git a/base/coder-cli/Dockerfile b/tools/coder-cli/Dockerfile
similarity index 100%
rename from base/coder-cli/Dockerfile
rename to tools/coder-cli/Dockerfile
diff --git a/base/terraform-shell/.gitlab-ci.yml b/tools/terraform-shell/.gitlab-ci.yml
similarity index 92%
rename from base/terraform-shell/.gitlab-ci.yml
rename to tools/terraform-shell/.gitlab-ci.yml
index 3ef70e2..ea020f8 100644
--- a/base/terraform-shell/.gitlab-ci.yml
+++ b/tools/terraform-shell/.gitlab-ci.yml
@@ -7,5 +7,5 @@ build_shell:
     - buildah push ${FQ_IMAGE_NAME}:terraform-shell
   rules:
     - changes:
-        - base/terraform-shell/**
+        - tools/terraform-shell/**
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
\ No newline at end of file
diff --git a/base/terraform-shell/Dockerfile b/tools/terraform-shell/Dockerfile
similarity index 100%
rename from base/terraform-shell/Dockerfile
rename to tools/terraform-shell/Dockerfile