diff --git a/Makefile b/Makefile
index 7aa28ef93..9c77fdbd9 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,9 @@ copyfiles:
 		PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn enable $$plugin ;\
 		PLUGIN_PATH=${PLUGINS_PATH} plugn enable $$plugin ;\
 	done
+ifndef SKIP_GO_CLEAN
 	$(MAKE) go-clean
+endif
 	chown dokku:dokku -R ${PLUGINS_PATH} ${CORE_PLUGINS_PATH} || true
 	$(MAKE) addman
 
diff --git a/contrib/build.Dockerfile b/contrib/build.Dockerfile
index a12b672ba..17ec3137d 100644
--- a/contrib/build.Dockerfile
+++ b/contrib/build.Dockerfile
@@ -32,6 +32,7 @@ RUN PATH=$PATH:/usr/local/go/bin GOPATH=/go \
     DOKKU_VERSION=${DOKKU_VERSION} \
     DOKKU_GIT_REV=${DOKKU_GIT_REV} \
     IS_RELEASE=${IS_RELEASE} \
+    SKIP_GO_CLEAN=true \
     make version copyfiles \
     && rm -rf plugins/common/*.go  plugins/common/glide*  plugins/common/vendor/ \
     && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil \