diff --git a/.travis.yml b/.travis.yml
index b6c851687e..a235b44877 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,10 @@
 language: node_js
 node_js:
   - "4"
-#  - "8"
 script: npm run $COMMAND
 env:
-  - COMMAND=lint
   - COMMAND=test
   - COMMAND=test:karma-travis
-  #- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION=0.13
   #- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION=latest
   - COMMAND=integration MONTAGE_VERSION=. MOP_VERSION="#master"
 before_install:
@@ -15,6 +12,24 @@ before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+jobs:
+    include:
+      - stage: lint
+        env:
+        script: npm run lint
+      - stage: deploy
+        script: skip
+        env:
+        deploy:
+            provider: npm
+            email: "${NPM_EMAIL}"
+            api_key: "${NPM_API_KEY}"
+            on:
+                tags: true
+stages:
+  - lint
+  - test
+  - deploy
 notifications:
   irc:
     channels: