diff --git a/.dockerignore b/.dockerignore
index fc48a91c..c501bf88 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,3 +8,4 @@ npm-debug.log
 payload.txt
 coverage/
 tutorials/
+*.tgz
diff --git a/Dockerfile b/Dockerfile
index 72e0248e..61ceb185 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,28 @@
-FROM  mhart/alpine-node:7
+# -- NODE 8
+FROM  mhart/alpine-node:8 AS base
 ENV storage__path /var/data/skyring
-ENV NODE_ENV=development
-COPY . /opt/skyring
+ENV NODE_ENV=production
+
+# -- BUILD
+FROM base AS build
+
+COPY package*.json /opt/skyring/
 WORKDIR /opt/skyring
+
 RUN apk update && \
     apk upgrade && \
     mkdir -p /var/data/skyring && \
     apk add python make g++ git && \
     npm install
 
+RUN mv node_modules prod_node_modules
+
+FROM base AS skyring
+RUN mkdir -p /var/data/skyring
+WORKDIR /opt/skyring
 VOLUME /etc
 VOLUME /var/data/skyring
+
+COPY --from=build /opt/skyring/prod_node_modules ./node_modules
+COPY . .
 CMD ["node", "index.js"]
diff --git a/Dockerfile.build b/Dockerfile.build
deleted file mode 100644
index 267fcd2f..00000000
--- a/Dockerfile.build
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM  mhart/alpine-node:7
-COPY . /opt/skyring
-WORKDIR /opt/skyring
-RUN apk update && \ 
-    apk upgrade && \
-    apk add python make g++
-
-ENV NODE_ENV=development
-RUN npm --python=python2 --registry=http://registry.npmjs.org install
-WORKDIR /opt
-RUN tar --exclude="*.tar.gz" --exclude="*.tgz" -zcf skyring.tgz -C /opt skyring
-WORKDIR /opt/skyring
diff --git a/Dockerfile.dist b/Dockerfile.dist
deleted file mode 100644
index b65c2b5e..00000000
--- a/Dockerfile.dist
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM  mhart/alpine-node:7
-ADD skyring.tgz /opt
-WORKDIR /opt/skyring
-ENV storage__path /var/data/skyring
-ENV NODE_ENV=production
-RUN mkdir -p /var/data/skyring
-VOLUME /var/data/skyring
-CMD ["node", "index.js"]
diff --git a/lib/server/api/post_timer.js b/lib/server/api/post_timer.js
index 13f1ae2f..afb391b8 100644
--- a/lib/server/api/post_timer.js
+++ b/lib/server/api/post_timer.js
@@ -46,7 +46,7 @@ module.exports = {
  *    "method": "put",
  *    "uri": "http://mydomain.name/timer/callback",
  *    "tranport":"http"
- *  } 
+ *  }
  * @apiExample {curl} curl:
  *  curl -XPOST -H "Content-Type: application/json" http://localhost:3000/timer  -d '{
  *  "timeout": 3000,
@@ -113,8 +113,8 @@ module.exports = {
  *
  * uri = URI.parse('http://localhost:3003/timer')
  * payload = {
- *  timeout: 3000, 
- *  data: "hello world", 
+ *  timeout: 3000,
+ *  data: "hello world",
  *  callback: {
  *    method: 'post',
  *    transport: 'http',
diff --git a/lib/server/api/put_timer.js b/lib/server/api/put_timer.js
index 32aebe52..b7ac2e81 100644
--- a/lib/server/api/put_timer.js
+++ b/lib/server/api/put_timer.js
@@ -108,8 +108,8 @@ module.exports = {
  *
  * uri = URI.parse('http://localhost:3003/timer/8c66a779-9c74-4e30-b5e8-f32d60909d45')
  * payload = {
- *  timeout: 3000, 
- *  data: "hello world", 
+ *  timeout: 3000,
+ *  data: "hello world",
  *  callback: {
  *    method: 'post',
  *    transport: 'http',
diff --git a/lib/timer.js b/lib/timer.js
index 5010a8f2..3f95f410 100644
--- a/lib/timer.js
+++ b/lib/timer.js
@@ -113,7 +113,7 @@ const options = {
 , data: "this is a payload"
 , callback: {
     transport: 'http'
-  , method: 'put
+  , method: 'put'
   , uri: 'http://api.domain.com/callback'
   }
 }