diff --git a/dev.yml b/dev.yml
index befc4b2434848aca07b1c594f221889a3b227d3d..971e38b62ecbea864abc7d21db25547b06ba3084 100644
--- a/dev.yml
+++ b/dev.yml
@@ -3,9 +3,7 @@ version: '2'
 services:
 
   front:
-    build:
-      dockerfile: docker/Dockerfile.dev
-      context: ./front
+    build: front
     env_file: .env.dev
     environment:
       - "HOST=0.0.0.0"
diff --git a/front/Dockerfile b/front/Dockerfile
index ad05f72eb8ab839f04b841c20663db00426caeb3..b22359b467f2f3d5ccbec4ad21098bb2179ac57c 100644
--- a/front/Dockerfile
+++ b/front/Dockerfile
@@ -1,13 +1,11 @@
-FROM node:6-alpine
+FROM node:6
 
 EXPOSE 8080
-
-RUN mkdir /app
-WORKDIR /app
+WORKDIR /app/
 ADD package.json .
+RUN npm install --only=production
+RUN npm install --only=dev
+VOLUME ["/app/node_modules"]
+COPY . .
 
-RUN npm install
-
-ADD . .
-
-RUN npm run build
+CMD ["npm", "run", "dev"]
diff --git a/front/docker/Dockerfile.dev b/front/docker/Dockerfile.dev
deleted file mode 100644
index 1a0c90c9e0fd8bc8a578a25e797fc04a3e30f6ea..0000000000000000000000000000000000000000
--- a/front/docker/Dockerfile.dev
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM node:6-alpine
-
-EXPOSE 8080
-
-RUN mkdir /app
-WORKDIR /app
-ADD package.json .
-
-RUN npm install
-
-VOLUME ["/app/node_modules"]
-
-CMD ["npm", "run", "dev"]
diff --git a/front/test/unit/karma.conf.js b/front/test/unit/karma.conf.js
index 8e4951c9e4ecc597be347be1fd8e163cdbab13e2..3fcc5f02ac8f054bf8384927220513ebd9b89ac4 100644
--- a/front/test/unit/karma.conf.js
+++ b/front/test/unit/karma.conf.js
@@ -18,6 +18,8 @@ module.exports = function (config) {
     preprocessors: {
       './index.js': ['webpack', 'sourcemap']
     },
+    captureTimeout: 5000,
+    retryLimit: 1,
     webpack: webpackConfig,
     webpackMiddleware: {
       noInfo: true