diff --git a/Dockerfile b/Dockerfile
index 2890358..05aee06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,19 +31,30 @@ RUN /usr/bin/ssh-keygen -A
 # Start Open-ssh server
 RUN service ssh start
 
+# Install NPM dependencies
+RUN npm install -g yo gulp-cli generator-angular-fullstack
+
 # Change user to app_user
 USER app_user
 
 RUN mkdir -p /data/web-app
-COPY * /data/web-app/
 
+COPY ./package.json /data/web-app
+RUN npm install
+
+# Assign permissions to app_user
 USER root
 RUN chown -R app_user /data/web-app
 
+# Change user to app_user
 USER app_user
-WORKDIR /data/web-app
 
-RUN npm install -g yo gulp-cli generator-angular-fullstack
-RUN npm install
+# Copy all application files
+WORKDIR /data/web-app
+COPY ./ /data/web-app
+
+# Assign permissions to app_user
+USER root
+RUN chown -R app_user /data/web-app
 
 ENTRYPOINT gulp serve