diff --git a/.travis.yml b/.travis.yml
index 5d1d8f3053..12558d3e50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,13 @@ git:
 
 env:
   global:
-    - MOZ_HEADLESS=1
-    - SAUCE_USERNAME_PR=valorkinpr
-    - SAUCE_ACCESS_KEY_PR=e0a97bd3-4b74-4408-89bf-cce1b44a8bf1
-    - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
-    - LOGS_DIR=/tmp/logs
-    - CYPRESS_RECORD_KEY=4aa7a1c0-3a4f-444e-b324-6fc305a543a8
-    - NPM_AUTH_TOKEN_CI_PR=810c9089-b5e8-4348-8c89-61a1c2461d68
+  - MOZ_HEADLESS=1
+  - SAUCE_USERNAME_PR=valorkinpr
+  - SAUCE_ACCESS_KEY_PR=e0a97bd3-4b74-4408-89bf-cce1b44a8bf1
+  - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
+  - LOGS_DIR=/tmp/logs
+  - CYPRESS_RECORD_KEY=4aa7a1c0-3a4f-444e-b324-6fc305a543a8
+  - NPM_AUTH_TOKEN_CI_PR=810c9089-b5e8-4348-8c89-61a1c2461d68
 
 #     test cypress smoke
 testSmokeCy: &testSmokeCy
@@ -25,7 +25,7 @@ testSmokeCy: &testSmokeCy
   - ng serve --prod &
   - $(npm bin)/wait-on http-get://localhost:4200/#
   - npm run cy:run:smoke -- --record --parallel --group smoke-tests
-    # after all tests finish running we need
+  # after all tests finish running we need
   # to kill all background jobs (like "npm start &")
   - kill $(jobs -p) || true
 
@@ -38,7 +38,6 @@ stages:
 - name: Testing
   if: ( branch = development AND type = push ) OR type = pull_request OR tag =~ ^v\d+
 - name: deploy
-  if: branch = development AND type = push OR tag =~ ^v\d+
 - name: publish
   if: tag =~ ^v\d+
 - name: "Post deploy testing"
@@ -137,24 +136,27 @@ jobs:
     stage: deploy
     script: npm run demo.build
     deploy:
-    provider: surge
-    project: ./gh-pages/
-    domain: ngx-bootstrap.surge.sh
-    on: development
+      provider: surge
+      project: ./gh-pages/
+      domain: ngx-bootstrap.surge.sh
+      on:
+        all_branches: true
   - <<: *surge
     env: NGV=latest
     deploy:
-    provider: surge
-    project: ./gh-pages/
-    domain: ngx-bootstrap-latest.surge.sh
-    on: development
+      provider: surge
+      project: ./gh-pages/
+      domain: ngx-bootstrap-latest.surge.sh
+      on:
+        all_branches: true
   - <<: *surge
     env: NGV=next
     deploy:
-    provider: surge
-    project: ./gh-pages/
-    domain: ngx-bootstrap-next.surge.sh
-    on: development
+      provider: surge
+      project: ./gh-pages/
+      domain: ngx-bootstrap-next.surge.sh
+      on:
+        all_branches: true
   # deploy to ngx-universal.herokuapp.com/
   - stage: deploy
     script: npm run build:ssr
@@ -165,7 +167,8 @@ jobs:
       api_key: $HEROKU_API_KEY
       skip_cleanup: true
       app: ngx-universal
-      on: development
+      on:
+        all_branches: true
 
   # publish to gh pages and npm
   - stage: publish