diff --git a/dockerfile-captain.edge b/dockerfile-captain.edge
index 720da3c..b8d10e2 100644
--- a/dockerfile-captain.edge
+++ b/dockerfile-captain.edge
@@ -17,12 +17,13 @@ RUN mv ./edge-override.json ./config-override.json
  # This quick hack invalidates the cache
 ADD https://www.google.com /time.now
 
-RUN git clone https://github.com/githubsaturn/caprover-frontend.git && \
+RUN mkdir -p /usr/src/app-frontend && cd /usr/src/app-frontend && \
+    git clone https://github.com/githubsaturn/caprover-frontend.git && \
     cd caprover-frontend && \
     git log --max-count=1 && \
     npm install && npm cache clean --force && \
     npm run build && \
-    mv ./build ../dist-frontend
+    mv ./build ../../app/dist-frontend
 
 
 ENV NODE_ENV production
diff --git a/dockerfile-captain.release b/dockerfile-captain.release
index 7f84065..0d1d7a3 100644
--- a/dockerfile-captain.release
+++ b/dockerfile-captain.release
@@ -16,12 +16,13 @@ RUN npm run build
 
 ENV FRONTEND_COMMIT_HASH 8c0b603b29bde8ed76ece12f7ece06f8d00bcfda
 
-RUN git clone https://github.com/githubsaturn/caprover-frontend.git && \
+RUN mkdir -p /usr/src/app-frontend && cd /usr/src/app-frontend && \
+    git clone https://github.com/githubsaturn/caprover-frontend.git && \
     cd caprover-frontend && \
     git reset --hard ${FRONTEND_COMMIT_HASH} && \
     npm install && npm cache clean --force && \
     npm run build && \
-    mv ./build ../dist-frontend
+    mv ./build ../../app/dist-frontend
 
 
 ENV NODE_ENV production