diff --git a/Dockerfile b/Dockerfile
index 43d2e3d..c723cd9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:19.10
 
-RUN apt-get update -y && \
-  apt-get install -y software-properties-common && \
+RUN apt-get update -y
+RUN apt-get install -y software-properties-common && \
   add-apt-repository ppa:longsleep/golang-backports && \
   apt-get update -y
 
@@ -9,7 +9,8 @@ RUN apt-get install -y \
   curl \
   build-essential \
   git \
-  golang-go
+  golang-go \
+  unzip
 
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
 RUN curl -L https://raw.githubusercontent.com/warrensbox/terraform-switcher/release/install.sh | bash
@@ -18,5 +19,6 @@ RUN go get -u golang.org/x/lint/golint
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl \
   && chmod +x ./kubectl \
   && mv ./kubectl /usr/local/bin/kubectl
+RUN curl -LO https://releases.hashicorp.com/terraform/0.12.26/terraform_0.12.26_linux_amd64.zip && unzip terraform_0.12.26_linux_amd64.zip -d /usr/local/bin && chmod +x /usr/local/bin/terraform && rm terraform_0.12.26_linux_amd64.zip
 
 ENTRYPOINT [ "make" ]
diff --git a/Makefile b/Makefile
index cd24b0a..3f629aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .DEFAULT_GOAL := default
 
-IMAGE ?= docker.cloud.cluster.fun/private/REPO_NAME_LOWER:latest
+IMAGE ?= docker.cluster.fun/private/ci-builder:latest
 
 .PHONY: test # Run all tests, linting and format checks
 test: lint check-format run-tests