diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e62db6..64da9ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build_base:
     - buildah push ${FQ_IMAGE_NAME}:base
 
 include:
-  - "coder-cli/.gitlab-ci.yml"
-  - "terraform-shell/.gitlab-ci.yml"
+  - "base/coder-cli/.gitlab-ci.yml"
+  - "base/terraform-shell/.gitlab-ci.yml"
   - "java/.gitlab-ci.yml"
   - "php/.gitlab-ci.yml"
\ No newline at end of file
diff --git a/coder-cli/.gitlab-ci.yml b/base/coder-cli/.gitlab-ci.yml
similarity index 84%
rename from coder-cli/.gitlab-ci.yml
rename to base/coder-cli/.gitlab-ci.yml
index 035e702..4be6783 100644
--- a/coder-cli/.gitlab-ci.yml
+++ b/base/coder-cli/.gitlab-ci.yml
@@ -2,6 +2,6 @@ build_cli:
   stage: base
   script:
     - buildah info
-    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:coder-cli -f coder-cli/Dockerfile .
+    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:coder-cli -f base/coder-cli/Dockerfile .
     - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
     - buildah push ${FQ_IMAGE_NAME}:coder-cli
\ No newline at end of file
diff --git a/coder-cli/Dockerfile b/base/coder-cli/Dockerfile
similarity index 81%
rename from coder-cli/Dockerfile
rename to base/coder-cli/Dockerfile
index 0f3996a..ab3515f 100644
--- a/coder-cli/Dockerfile
+++ b/base/coder-cli/Dockerfile
@@ -3,4 +3,4 @@ FROM alpine:latest
 RUN apk add --no-cache curl
 RUN curl -fsSL https://coder.com/install.sh | sh
 
-ENTRYPOINT ["/bin/sh"]
\ No newline at end of file
+ENTRYPOINT []
\ No newline at end of file
diff --git a/terraform-shell/.gitlab-ci.yml b/base/terraform-shell/.gitlab-ci.yml
similarity index 81%
rename from terraform-shell/.gitlab-ci.yml
rename to base/terraform-shell/.gitlab-ci.yml
index 0c15735..98d5d9f 100644
--- a/terraform-shell/.gitlab-ci.yml
+++ b/base/terraform-shell/.gitlab-ci.yml
@@ -2,6 +2,6 @@ build_shell:
   stage: base
   script:
     - buildah info
-    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:terraform-shell -f terraform-shell/Dockerfile .
+    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:terraform-shell -f base/terraform-shell/Dockerfile .
     - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
     - buildah push ${FQ_IMAGE_NAME}:terraform-shell
\ No newline at end of file
diff --git a/terraform-shell/Dockerfile b/base/terraform-shell/Dockerfile
similarity index 100%
rename from terraform-shell/Dockerfile
rename to base/terraform-shell/Dockerfile