diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b635cb..89ca0a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,6 +95,7 @@ node-8.9-chrome-63.0-yarn-1.2 test: *test_custom
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
 
+gitlab-charts-build-base test: *test_build
 gitlab-qa test: *test_build
 omnibus-gitlab-bionic test: *test_build
 omnibus-gitlab-centos6 test: *test_build
@@ -156,6 +157,7 @@ golang-1.10-git-2.17: *build_and_deploy_custom
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
 
+gitlab-charts-build-base: *build_and_deploy
 gitlab-qa: *build_and_deploy
 omnibus-gitlab-bionic: *build_and_deploy
 omnibus-gitlab-centos6: *build_and_deploy
diff --git a/Dockerfile.gitlab-charts-build-base b/Dockerfile.gitlab-charts-build-base
new file mode 100644
index 0000000..6a6b4d4
--- /dev/null
+++ b/Dockerfile.gitlab-charts-build-base
@@ -0,0 +1,33 @@
+FROM ruby:2.4.4-alpine
+MAINTAINER GitLab Distribution Team
+
+ENV TF_VERSION=0.11.1
+ENV TF_URL=https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_linux_amd64.zip
+
+ENV HELM_VERSION=2.8.2
+ENV HELM_URL=https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz
+
+# kubectl (possibly in gcloud?)
+ENV KUBECTL_VERSION=1.8.8
+ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
+
+# Install dependencies
+RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2\
+  && mkdir /opt
+
+# Install kubectl
+RUN curl -L -o /usr/local/bin/kubectl ${KUBECTL_URL} \
+  && chmod +x /usr/local/bin/kubectl \
+  && kubectl version --client
+
+# Install Terraform
+RUN curl -LJO ${TF_URL} \
+    && unzip terraform*.zip -d /usr/bin  && chmod +x /usr/bin/terraform \
+    && rm terraform*.zip \
+    && terraform version
+
+# Install Helm
+RUN wget -q -O - ${HELM_URL} | tar zxf - \
+    && mv linux-amd64/helm /usr/bin/ \
+    && chmod +x /usr/bin/helm \
+    && helm version --client