diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37afda2..7e62db6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,5 +19,6 @@ build_base:
 
 include:
   - "coder-cli/.gitlab-ci.yml"
+  - "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/coder-cli/.gitlab-ci.yml
index 407a8b0..035e702 100644
--- a/coder-cli/.gitlab-ci.yml
+++ b/coder-cli/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 build_cli:
-  stage: build
+  stage: base
   script:
     - buildah info
     - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:coder-cli -f coder-cli/Dockerfile .
diff --git a/terraform-shell/.gitlab-ci.yml b/terraform-shell/.gitlab-ci.yml
new file mode 100644
index 0000000..ab90248
--- /dev/null
+++ b/terraform-shell/.gitlab-ci.yml
@@ -0,0 +1,7 @@
+build_shell:
+  stage: base
+  script:
+    - buildah info
+    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:terraform-shell -f terraform-shell/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/terraform-shell/Dockerfile b/terraform-shell/Dockerfile
new file mode 100644
index 0000000..f7bda21
--- /dev/null
+++ b/terraform-shell/Dockerfile
@@ -0,0 +1,2 @@
+FROM hashicorp/terraform:1.12.2
+ENTRYPOINT []
\ No newline at end of file