diff --git a/maxkey-web-frontend/maxkey-web-app/Dockerfile b/maxkey-web-frontend/maxkey-web-app/Dockerfile
index 3be6abf45..fe45373a6 100644
--- a/maxkey-web-frontend/maxkey-web-app/Dockerfile
+++ b/maxkey-web-frontend/maxkey-web-app/Dockerfile
@@ -1,6 +1,6 @@
 #MaxKey Frontend Docker Build
 
-FROM node:16.14.2
+FROM node:16.14.2 as builder
 
 LABEL authors="MaxKey <support@maxsso.net>"
 
@@ -22,7 +22,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 
 #RUN rm -rf /usr/share/nginx/html/*
 
-COPY  dist /usr/share/nginx/html/maxkey
+COPY  --from=builder /usr/src/app/dist /usr/share/nginx/html/maxkey
 
 #CMD ["nginx", "-g", "daemon off;"]
 
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/Dockerfile b/maxkey-web-frontend/maxkey-web-mgt-app/Dockerfile
index 9c0edf2d2..e64da69ca 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/Dockerfile
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/Dockerfile
@@ -1,6 +1,6 @@
 #MaxKey Mgt Frontend Docker Build
 
-FROM node:16.14.2
+FROM node:16.14.2 as builder
 
 LABEL authors="MaxKey <support@maxsso.net>"
 
@@ -22,7 +22,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 
 #RUN rm -rf /usr/share/nginx/html/*
 
-COPY  dist /usr/share/nginx/html/maxkey-mgt
+COPY  --from=builder /usr/src/app/dist /usr/share/nginx/html/maxkey-mgt
 
 #CMD ["nginx", "-g", "daemon off;"]