diff --git a/.travis.yml b/.travis.yml
index 2811011f9c6..c21489911ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
   global:
     # for this to work you also need to comment out build condition
     # as travis' conditions are currently broken
-    - FORCE_REBUILD=false
+    - FORCE_REBUILD=true
 
 cache:
   directories:
@@ -19,6 +19,15 @@ cache:
     - $HOME/virtualenv/python2.7.14/lib
     - $HOME/virtualenv/python2.7/bin
 
+stages:
+  - name: build
+    if: branch = master AND type = push
+  - name: test
+    if: branch = DOESNOTEXIST
+  - name: publish
+    # if: branch = master AND type = push
+  - name: data
+
 install:
   - pip install -qr requirements/host.txt
 
@@ -26,7 +35,6 @@ jobs:
   include:
     - stage: build
       env: POOTLE_ENV=build
-      if: branch = master AND type = push
       script:
       - export DOCKER_USERNAME=${DOCKER_USERNAME:-translatetravis2}
       - makey build-travis-images
@@ -61,6 +69,20 @@ jobs:
       - docker-compose pull --parallel --include-deps dev-travis-mariadb
       - makey makey-mariadb-travis travis-test
 
+    - stage: publish
+      env: POOTLE_ENV=publish-demo
+      script:
+      - export LOCAL_USER_ID=$UID
+      - export DOCKER_USERNAME=${DOCKER_USERNAME:-translatetravis2}
+      - export DOCKER_PUBLISH_NAME=${DOCKER_PUBLISH_NAME:-translate}
+      - makey publish-demo-images
+    - stage: data
+      env: POOTLE_ENV=publish-demo-db
+      script:
+      - export LOCAL_USER_ID=$UID
+      - export DOCKER_USERNAME=${DOCKER_USERNAME:-translatetravis2}
+      - makey publish-demo-db
+
 notifications:
   email:
     on_failure: always