diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca24ba4..d2a8200 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,7 @@ jobs:
           name: Install tools
           command: |
             apk add bash build-base ca-certificates curl docker git openssh
-            curl -SLO https://github.com/goreleaser/goreleaser/releases/download/v0.93.0/goreleaser_Linux_x86_64.tar.gz
+            curl -SLO https://github.com/goreleaser/goreleaser/releases/download/v0.95.2/goreleaser_Linux_x86_64.tar.gz
             mkdir -p /usr/local/goreleaser
             tar -xzf goreleaser_Linux_x86_64.tar.gz -C /usr/local/goreleaser
             ln -s /usr/local/goreleaser/goreleaser /usr/local/bin/goreleaser
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 37a7593..ee8392a 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -41,7 +41,6 @@ dockers:
       - quay.io/helmpack/chart-testing:{{ .Tag }}
       - quay.io/helmpack/chart-testing:latest
     build_flag_templates:
-      - --build-arg=dist_dir=
       - --label=org.label-schema.schema-version=1.0
       - --label=org.label-schema.version={{ .Version }}
       - --label=org.label-schema.name={{ .ProjectName }}
diff --git a/Dockerfile b/Dockerfile
index 6e42db0..d632dc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,10 +32,6 @@ RUN curl -LO "https://kubernetes-helm.storage.googleapis.com/helm-$HELM_VERSION-
     ln -s "/usr/local/helm-$HELM_VERSION/linux-amd64/helm" /usr/local/bin/helm && \
     rm -f "helm-$HELM_VERSION-linux-amd64.tar.gz"
 
-# Goreleaser needs to override this because it builds the
-# Dockerfile from a tmp dir with all files to be copied in the root
-ARG dist_dir=dist/linux_amd64
-
-COPY "$dist_dir/chart_schema.yaml" /etc/ct/chart_schema.yaml
-COPY "$dist_dir/lintconf.yaml" /etc/ct/lintconf.yaml
-COPY "$dist_dir/ct" /usr/local/bin/ct
+COPY ./etc/chart_schema.yaml /etc/ct/chart_schema.yaml
+COPY ./etc/lintconf.yaml /etc/ct/lintconf.yaml
+COPY ct /usr/local/bin/ct