diff --git a/.travis.yml b/.travis.yml
index 50075c160..8b55ab4f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,34 +43,40 @@ jobs:
         branch: develop  
     after_deploy:
       - |
-        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*" &&
+          "iofog-controller stop; rm -R /iofogcontroller*" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller stop; rm -R /iofogcontroller*" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller stop; rm -R /iofogcontroller*"
+
+      - |
+        export FILENAME=`ls iofogcontroller-*.tgz` &&
         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*" &&
+          "iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller connector add -n connector -d localhost -i 127.0.0.1 -H" &&
         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}" &&
+          "iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller connector add -n connector -d localhost -i 127.0.0.1 -H" &&
         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
+        docker push iofog/controller-develop:$COMMIT || travis_terminate 1
   - stage: pre_release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -86,8 +92,8 @@ 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"
       - |
-        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` &&
@@ -95,7 +101,7 @@ jobs:
         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
+        docker push iofog/controller:rc-$VERSION || travis_terminate 1
   - stage: release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -111,8 +117,8 @@ jobs:
       on:
         branch: master
     after_deploy:
+      - 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 "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` &&
@@ -120,4 +126,4 @@ jobs:
         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
+        docker push iofog/controller:$VERSION || travis_terminate 1