diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 87e80c5aad2424fad26ca10aacc08073449c71ca..c219e8c4ed2e998f8c61f5b1f517b06800f416a0 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -7,14 +7,10 @@ USER $USER
 
 WORKDIR /home/$USER/
 
-COPY package*.json ./
+COPY --chown=$USER package*.json ./
 RUN npm install
 
-COPY --chown=$USER . .
-RUN ls -lah
-
-ENV PORT 8430
-EXPOSE 8430
+COPY --chown=$USER . ./
 
 ENV PORT 8430
 EXPOSE 8430
diff --git a/server/Dockerfile b/server/Dockerfile
index 5da2d099c6f5650a714d22deb8b8954e32690f54..6def6a8d16c6ce00f964949d547a78471c1483a8 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,13 +1,14 @@
 FROM python:3.9.1-alpine3.12
 
 ARG USER=default
-
 RUN adduser -D $USER
-
 USER $USER
 WORKDIR /home/$USER
 
-ADD . /
+COPY --chown=$USER:$USER . ./
+
 RUN pip3 install --user -r ./requirements.txt
 
+EXPOSE 8432
+
 CMD ["./server.py"]