diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 865b28f..211bf84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,6 +101,7 @@ alpine-aws test: *test_build
 alpine-helm test: *test_build
 ruby-alpine-aws test: *test_build
 gitlab-charts-build-base test: *test_build
+gitlab-charts-build-base-helm-3 test: *test_build
 gitlab-helm3-kubectl1.14 test: *test_build
 gitlab-qa-ruby-2.6 test: *test_build
 gitlab-qa-ruby-2.7 test: *test_build
@@ -181,6 +182,7 @@ alpine-aws: *build_and_deploy
 alpine-helm: *build_and_deploy
 ruby-alpine-aws: *build_and_deploy
 gitlab-charts-build-base: *build_and_deploy
+gitlab-charts-build-base-helm-3: *build_and_deploy
 gitlab-helm3-kubectl1.14: *build_and_deploy
 gitlab-qa-ruby-2.6: *build_and_deploy
 gitlab-qa-ruby-2.7: *build_and_deploy
diff --git a/Dockerfile.gitlab-charts-build-base-helm-3 b/Dockerfile.gitlab-charts-build-base-helm-3
new file mode 100644
index 0000000..d747a55
--- /dev/null
+++ b/Dockerfile.gitlab-charts-build-base-helm-3
@@ -0,0 +1,29 @@
+FROM ruby:2.6.5-alpine
+MAINTAINER GitLab Distribution Team
+
+ENV HELM_VERSION=3.4.0
+ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
+ENV HELM_HOME=/root/.helm
+
+# kubectl (possibly in gcloud?)
+ENV KUBECTL_VERSION=1.16.4
+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 -p /opt
+
+# Install kubectl
+RUN curl -L -o /usr/local/bin/kubectl ${KUBECTL_URL} \
+  && chmod +x /usr/local/bin/kubectl \
+  && kubectl version --client
+
+# Install Helm
+RUN wget -q -O - ${HELM_URL} | tar zxf - \
+    && mv linux-amd64/helm /usr/bin/ \
+    && chmod +x /usr/bin/helm \
+    && helm version --client
+
+#Install kubeval
+RUN mkdir -p $HELM_HOME/plugins && \
+    helm plugin install https://github.com/instrumenta/helm-kubeval