diff --git a/Dockerfile b/Dockerfile
index c5130c6..895c7af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,13 @@
 FROM node:lts
 
-WORKDIR /app
+RUN npm i -g nodemon typescript
 
-RUN chown node:node /app
+USER node
 
-COPY . .
+WORKDIR /app
 
-RUN npm install -g nodemon
-RUN npm install typescript -g
-RUN npm install -g
+COPY --chown=node . .
 
-USER node
+RUN npm i
 
-EXPOSE 8100
-RUN npm run dev
\ No newline at end of file
+CMD npm run migrate && npm run dev
diff --git a/docker-compose.yml b/docker-compose.yml
index e11bf72..00001ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,17 +9,12 @@ services:
       - "5432:5432"
   web:
     build: .
-    command:  bash -c "echo 'first npm install can be a bit long'; npm install; npm run migrate; npm run dev"
     depends_on:
       - db
-      - maildev
-    env_file: 
-      - .env
     environment:
       DATABASE_URL: postgres://bbbanalytics:bbbanalytics@db:5432/bbbanalytics
-      SECURE: "false"
       HOSTNAME: localhost
-      JWT_SECURITY_SALT: "SecretThatShouldChangedInProduction"
+      JWT_SECURITY_SALT: SecretThatShouldChangedInProduction
     ports:
       - "8100:8100"
       - "9229:9229"