diff --git a/manager/Dockerfile b/manager/Dockerfile
index 1b1b27248..093a4de83 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -30,20 +30,7 @@ COPY version version
 
 WORKDIR "$GOPATH"
 
-RUN mkdir -p src/github.com/kubernetes/deployment-manager \
-  && chmod 777 src/github.com/kubernetes/deployment-manager
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/manager \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/manager
-COPY manager src/github.com/kubernetes/deployment-manager/manager
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/util \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/util
-COPY util src/github.com/kubernetes/deployment-manager/util
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/version \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/version
-COPY version src/github.com/kubernetes/deployment-manager/version
+RUN mkdir -p "$GOPATH/src/github.com" && chmod 777 "$GOPATH/src/github.com"
 
 RUN go-wrapper download github.com/kubernetes/deployment-manager/manager/...
 RUN go-wrapper install github.com/kubernetes/deployment-manager/manager/...
diff --git a/resourcifier/Dockerfile b/resourcifier/Dockerfile
index 2d262f3bf..d72f1a7d6 100644
--- a/resourcifier/Dockerfile
+++ b/resourcifier/Dockerfile
@@ -34,28 +34,7 @@ RUN apt-get purge -y --auto-remove wget
 
 WORKDIR "$GOPATH"
 
-RUN mkdir -p src/github.com/kubernetes/deployment-manager \
-  && chmod 777 src/github.com/kubernetes/deployment-manager
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/expandybird \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/expandybird
-COPY expandybird src/github.com/kubernetes/deployment-manager/expandybird
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/manager \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/manager
-COPY manager src/github.com/kubernetes/deployment-manager/manager
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/resourcifier \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/resourcifier
-COPY resourcifier src/github.com/kubernetes/deployment-manager/resourcifier
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/util \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/util
-COPY util src/github.com/kubernetes/deployment-manager/util
-
-RUN mkdir -p src/github.com/kubernetes/deployment-manager/version \
-  && chmod 777 src/github.com/kubernetes/deployment-manager/version
-COPY version src/github.com/kubernetes/deployment-manager/version
+RUN mkdir -p "$GOPATH/src/github.com" && chmod 777 "$GOPATH/src/github.com"
 
 RUN go-wrapper download github.com/kubernetes/deployment-manager/resourcifier/...
 RUN go-wrapper install github.com/kubernetes/deployment-manager/resourcifier/...