diff --git a/Dockerfile b/Dockerfile
index 4310219..02e36d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,6 @@ COPY assets ./assets
 COPY config ./config
 RUN npm run build
 
-# Create API Doc
-RUN apidoc -i scripts/ -o public/apidoc/
-
 #####################
 # Final image
 #####################
@@ -37,4 +34,4 @@ COPY scripts ./scripts
 COPY --from=base /opt/app/dist ./dist
 
 EXPOSE 8080
-ENTRYPOINT ["node", "scripts/server.js", "--mode=production"]
+ENTRYPOINT ["npm", "run", "start"]
\ No newline at end of file
diff --git a/package.json b/package.json
index d78099d..8011e88 100644
--- a/package.json
+++ b/package.json
@@ -6,9 +6,9 @@
   "directories": {},
   "scripts": {
     "build": "webpack --config config/webpack.build.js",
-    "start:dev": "apidoc -i scripts/ -o public/apidoc/ && node scripts/server.js --mode=development",
-    "start:prod": "apidoc -i scripts/ -o public/apidoc/ && npm run build && npm run start",
-    "start": "apidoc -i scripts/ -o public/apidoc/ && node scripts/server.js --mode=production",
+    "start:dev": "apidoc -i scripts/ -o ./public/apidoc/ && node scripts/server.js --mode=development",
+    "start:prod": "npm run build && npm run start",
+    "start": "apidoc -i scripts/ -o ./dist/apidoc/ && node scripts/server.js --mode=production",
     "test": "jest",
     "pretty-quick": "pretty-quick",
     "format": "prettier --write .",