diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 803857077fc7177da3cebc5f29099e08dff84f24..0a290283635bca5a6a15bf2226bd070aa3c7f955 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,8 @@
 image: docker:latest
 
+variables:
+  VERSION: v2.11.0-rc.3
+
 services:
   - docker:dind
 
@@ -11,6 +14,7 @@ build-master:
   script:
     - |
       docker build \
+        --build-arg REF_NAME=$VERSION \
         --build-arg VCS_REF=$CI_COMMIT_REF_SLUG \
         --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
         -t $CI_REGISTRY_IMAGE .
@@ -23,6 +27,7 @@ build:
   script:
     - |
       docker build \
+        --build-arg REF_NAME=$CI_COMMIT_REF_NAME \
         --build-arg VCS_REF=$CI_COMMIT_REF_SLUG \
         --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
         -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .
diff --git a/Dockerfile b/Dockerfile
index 098b3b369dfa5e2aa3d5dc1f751b46404f82edfc..fcbde61bca4127ef04f5b4007c0c0621664421e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,8 @@
 FROM alpine:3.8 as builder
 
-ENV HELM_VERSION="v2.11.0-rc.3"
+ARG REF_NAME
+
+ENV HELM_VERSION=$REF_NAME
 
 WORKDIR /root/
 
@@ -9,20 +11,17 @@ RUN apk add --update ca-certificates \
  && wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
  && tar -xvf helm-${HELM_VERSION}-linux-amd64.tar.gz
 
-FROM alpine:3.8
+FROM mdeterman/k8-kubectl:v1.11.3
 
 LABEL maintainer="Mark Determan<mark@determan.io>"
 
-ARG VCS_REF
+ARG REF_SLUG
 ARG BUILD_DATE
 
 # Metadata
-LABEL org.label-schema.vcs-ref=$VCS_REF \
+LABEL org.label-schema.vcs-ref=$REF_SLUG \
       org.label-schema.vcs-url="https://github.com/mdeterman/docker/k8s-helm" \
       org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.docker.dockerfile="/Dockerfile"
 
-COPY --from=builder /root/linux-amd64/helm /usr/local/bin
-
-ENTRYPOINT ["helm"]
-CMD ["help"]
\ No newline at end of file
+COPY --from=builder /root/linux-amd64/helm /usr/local/bin
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..42a162cdcda844eaf0ec24c396019c62170df520
--- /dev/null
+++ b/README.md
@@ -0,0 +1,8 @@
+# Kubernetes Helm
+
+[![](https://images.microbadger.com/badges/image/mdeterman/k8-helm:v2.11.0-rc.3.svg)](https://microbadger.com/images/mdeterman/k8-helm:v2.11.0-rc.3 "Get your own image badge on microbadger.com")
+[![](https://images.microbadger.com/badges/version/mdeterman/k8-helm:v2.11.0-rc.3.svg)](https://microbadger.com/images/mdeterman/k8-helm:v2.11.0-rc.3 "Get your own version badge on microbadger.com")
+
+## Overview
+This container provides the Helm client for use with Kubernetes
+