diff --git a/.deploy_dev-frontend.sh b/.deploy_dev-frontend.sh
deleted file mode 100644
index 995f511..0000000
--- a/.deploy_dev-frontend.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-echo "Deploying to development."
-set -e
-set -x
-
-pushd deployment-frontend
-
-docker-compose -f docker-compose-frontend.yml down
-docker pull "$1"
-docker-compose -f docker-compose-frontend.yml up -d
-
-popd
-
-set +x
-set +e
\ No newline at end of file
diff --git a/.deploy_dev.sh b/.deploy_dev.sh
new file mode 100644
index 0000000..90ab9b3
--- /dev/null
+++ b/.deploy_dev.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+echo "Deploying to development."
+set -e
+set -x
+
+#pushd deployment-frontend
+
+docker-compose down
+docker pull "$1"
+docker-compose up -d
+
+#popd
+
+set +x
+set +e
diff --git a/.dockerignore b/.dockerignore
index 3c3629e..04c01ba 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
-node_modules
+node_modules/
+dist/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f71f3f9..b82d713 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,9 +70,9 @@ deploy_dev:
         - chmod 600 ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     script:
-        - scp docker-compose-frontend.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/docker-compose-frontend.yml
-        - scp .deploy_dev-frontend.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/deploy_dev-frontend.sh
-        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev-frontend.sh \"$IMAGE_NAME\""
+        - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/docker-compose.yml
+        - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/deploy_dev.sh
+        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev.sh \"$IMAGE_NAME\""
 
 # deploy_production:
 #     stage: deploy
diff --git a/Dockerfile b/Dockerfile
index f434428..e2df8c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,17 @@
-FROM node:8
-COPY package*.json ./
+FROM node:10
 ENV IS_DOCKER 1
 RUN env
-RUN npm install
-COPY . .
-EXPOSE 8080
+
+RUN apt-get update
+RUN apt-get install nasm
+RUN npm install webpack -g
+WORKDIR /tmp
+COPY package.json /tmp/
+RUN npm config set registry http://registry.npmjs.org/ && npm install
+
+WORKDIR /code
+COPY . /code/
+RUN cp -a /tmp/node_modules /code/
+RUN webpack
+
+EXPOSE 3000
diff --git a/docker-compose-frontend.yml b/docker-compose-frontend.yml
deleted file mode 100644
index 8fc06bf..0000000
--- a/docker-compose-frontend.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '3'
-
-services:
-  web-frontend:
-    build: .
-    image: git.sahkoinsinoorikilta.fi:4567/vtmk/web2.0-frontend
-    command: ["bash", "-c", "npm run start-prod"]
-    ports:
-      - "3000:8080"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..5bef79a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  web-frontend:
+    build: .
+    image: git.sahkoinsinoorikilta.fi:4567/vtmk/web2.0-frontend
+    # Before you run this file for the first time, make sure 
+    # you remove node_modules/ folders in your host machine
+    command: ["bash", "-c", "if test -d node_modules; then echo node_modules_exists; else cp -a /tmp/node_modules /code; fi && cd /code && npm install && npm run start-prod"]
+    ports:
+      - "8080:3000"