diff --git a/.dockerignore b/.dockerignore
index dac3f57..385e5c3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,10 @@
 .env
 node_modules
 */prisma
+!common/prisma
 */node_modules
-*/proto
+*/protos
+!common/protos
 */Dockerfile
 */.dockerignore
 webapp/frontend/node_modules
diff --git a/cli/Dockerfile b/cli/Dockerfile
index a5392c8..d7cce6a 100644
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -2,7 +2,7 @@ FROM node:lts-alpine3.17
 
 # add project files to /app
 ADD ./cli /app
-ADD ./prisma /app/prisma
+ADD ./common /app
 ADD ./mqtt/utils /app/utils
 WORKDIR /app
 
diff --git a/mqtt/Dockerfile b/mqtt/Dockerfile
index 34b7f8c..23a6893 100644
--- a/mqtt/Dockerfile
+++ b/mqtt/Dockerfile
@@ -2,11 +2,10 @@ FROM node:lts-alpine3.17
 
 # add project files to /app
 ADD ./mqtt /app
-ADD ./prisma /app/prisma
-ADD ./protos /app/protos
+ADD ./common /app
 WORKDIR /app
 
 # install node dependencies
 RUN npm install && npx prisma generate
 
-ENTRYPOINT ["node", "index.js"]
+ENTRYPOINT ["/app/entrypoint.sh"]
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index d2e93b3..0adfa38 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -2,8 +2,7 @@ FROM node:lts-alpine3.17
 
 # add project files to /app
 ADD ./webapp /app
-ADD ./prisma /app/prisma
-ADD ./protos /app/protos
+ADD ./common /app
 WORKDIR /app
 
 # build frontend
@@ -14,4 +13,4 @@ RUN npm install && npx prisma generate
 
 EXPOSE 8080
 
-ENTRYPOINT ["node", "index.js"]
+ENTRYPOINT ["/app/entrypoint.sh"]