diff --git a/Dockerfile b/Dockerfile
index bed2144cbf08871c11557acd6e46799481a6c88d..2784eafce57c3c6e9bdd738d8254d3cf4d4a9f19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,11 +7,10 @@ COPY . /iv
 WORKDIR /iv
 
 ENV VERSION=devNext
-ENV NODE_ENV=production
 ENV DOCKER_BUILD=true
 
 RUN npm i
-RUN npm run docker-build-aot
+RUN npm run build-aot
 
 
 # prod container
@@ -19,6 +18,7 @@ FROM node:8-alpine
 
 ARG PORT
 ENV PORT=$PORT
+ENV NODE_ENV=production
 
 RUN apk --no-cache add ca-certificates
 RUN mkdir /iv-app
diff --git a/package.json b/package.json
index 3e191d678cb61f93a2c285d425b08587e718f3ce..de42925f1316dc751433170342d6ad34e95096c6 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "plugin-server": "node ./src/plugin_examples/server.js",
     "dev-server": "webpack-dev-server --config webpack.dev.js --mode development",
     "dev-server-aot": "PRODUCTION=true GIT_HASH=`git log --pretty=format:'%h' --invert-grep --grep=^.ignore -1` webpack-dev-server --config webpack.aot.js",
-    "docker-build-aot": "PRODUCTION=true ./node_modules/.bin/webpack --config webpack.aot.js",
     "dev-server-all-interfaces": "webpack-dev-server --config webpack.dev.js --mode development --hot --host 0.0.0.0",
     "serve-plugins": "node src/plugin_examples/server.js",
     "test": "karma start spec/karma.conf.js",