diff --git a/.goreleaser.yml b/.goreleaser.yml
index 74bf537..df96252 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -44,8 +44,8 @@ dockers:
     binaries:
       - capd-manager
     image_templates:
-      - "gcr.io/kubernetes1-226021/capd-manager:{{.Version}}"
-      - "gcr.io/kubernetes1-226021/capd-manager:{{.Major}}.{{.Minor}}"
+      - "gcr.io/kubernetes1-226021/capd-manager:{{.Tag}}"
+      - "gcr.io/kubernetes1-226021/capd-manager:v{{.Major}}.{{.Minor}}"
       - "gcr.io/kubernetes1-226021/capd-manager:latest"
 changelog:
   filters:
diff --git a/Dockerfile b/Dockerfile
index 674fc7c..3f585eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,6 @@ WORKDIR /tmp
 RUN curl -L https://dl.k8s.io/v1.14.4/kubernetes-client-linux-amd64.tar.gz | tar xvz
 RUN mv /tmp/kubernetes/client/bin/kubectl /usr/local/bin
 RUN curl https://get.docker.com | sh
-COPY dist/capd-manager_linux_amd64/capd-manager /usr/local/bin
+COPY capd-manager /usr/local/bin
 
 ENTRYPOINT ["capd-manager"]