diff --git a/Dockerfile b/Dockerfile
index 6da2a1891afc..4ce510734f1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -121,7 +121,8 @@ FROM scratch as workflow-controller
 
 USER 8737
 
-COPY --from=workflow-controller-build /usr/share/zoneinfo /usr/share/
+ADD --chown=8737 https://github.com/golang/go/raw/master/lib/time/zoneinfo.zip /zoneinfo.zip
+ENV ZONEINFO /zoneinfo.zip
 COPY --chown=8737 --from=workflow-controller-build /go/src/github.com/argoproj/argo-workflows/dist/workflow-controller /bin/
 
 ENTRYPOINT [ "workflow-controller" ]
diff --git a/Makefile b/Makefile
index b2102496d7c8..e8cb603826aa 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,7 @@ endif
 .PHONY: controller-image
 controller-image: dist/controller.image
 
-dist/controller.image: $(CONTROLLER_PKGS)
+dist/controller.image: $(CONTROLLER_PKGS) Dockerfile
 	$(call docker_build,workflow-controller)
 	touch dist/controller.image