diff --git a/.travis.yml b/.travis.yml
index 735114fb8..50075c160 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,36 +42,35 @@ jobs:
       on:
         branch: develop  
     after_deploy:
-      - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller/*"
-      - sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
-        $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/iofogcontroller 
-      - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
-
-      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller/*"
-      - sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
-        $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/iofogcontroller 
-      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
-      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}"
-
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller/*"
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
-        $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/iofogcontroller 
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}"
-
-      - docker build -t iofog/controller-develop:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
-      - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push iofog/controller-develop:latest
-      - docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT
-      - docker push iofog/controller-develop:$COMMIT
+      - |
+        export FILENAME=`ls iofogcontroller-*.tgz` &&
+        sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
+          "iofog-controller stop; rm -f /iofogcontroller*" &&
+        sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
+          $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/$FILENAME &&
+        sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
+          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller stop; rm -f /iofogcontroller*" &&
+        sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
+          $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/$FILENAME &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller stop; rm -f /iofogcontroller*" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
+          $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/$FILENAME && 
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" &&
+        docker build -t iofog/controller-develop:latest --build-arg FILENAME=$FILENAME . -f Dockerfile.dev && 
+        echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
+        docker push iofog/controller-develop:latest &&
+        docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT &&
+        docker push iofog/controller-develop:$COMMIT
   - stage: pre_release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -87,14 +86,16 @@ jobs:
       on:
         all_branches: true
     after_deploy:
-      - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
-        "iofog-controller stop; npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start"
-      - export VERSION=`npm view iofogcontroller version`
-      - docker build -t iofog/controller:rc --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel
-      - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push iofog/controller:rc
-      - docker tag iofog/controller:rc iofog/controller:rc-$VERSION
-      - docker push iofog/controller:rc-$VERSION
+      - |
+        sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP "iofog-controller stop" &&
+        sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP \
+          "npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" &&
+        export VERSION=`npm view iofogcontroller version` &&
+        docker build -t iofog/controller:rc --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel &&
+        echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
+        docker push iofog/controller:rc &&
+        docker tag iofog/controller:rc iofog/controller:rc-$VERSION &&
+        docker push iofog/controller:rc-$VERSION
   - stage: release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -110,11 +111,13 @@ jobs:
       on:
         branch: master
     after_deploy:
-      - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP
-        "iofog-controller stop; npm update --unsafe-perm -g iofogcontroller; iofog-controller start"
-      - export VERSION=`npm view iofogcontroller version`
-      - docker build -t iofog/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel
-      - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push iofog/controller:latest
-      - docker tag iofog/controller:latest iofog/controller:$VERSION
-      - docker push iofog/controller:$VERSION
+      - |
+        sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP "iofog-controller stop" &&
+        sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP \
+          "npm update --unsafe-perm -g iofogcontroller; iofog-controller start" &&
+        export VERSION=`npm view iofogcontroller version` &&
+        docker build -t iofog/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel &&
+        echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
+        docker push iofog/controller:latest &&
+        docker tag iofog/controller:latest iofog/controller:$VERSION &&
+        docker push iofog/controller:$VERSION
diff --git a/Dockerfile.dev b/Dockerfile.dev
index dde6db245..7ca90a17d 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:alpine
+FROM iofog/node:alpine
 
 ARG FILENAME
 ENV NODE_ENV=development
diff --git a/Dockerfile.rel b/Dockerfile.rel
index 9b99a1fd5..29a102d97 100644
--- a/Dockerfile.rel
+++ b/Dockerfile.rel
@@ -1,4 +1,4 @@
-FROM node:alpine
+FROM iofog/node:alpine
 
 ARG FILENAME