diff --git a/.travis.yml b/.travis.yml
index a36d334e..8410199c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,93 +20,93 @@ after_success:
 
 jobs:
   include:
-    - name: "Build Frappe bench development environment (latest)"
+    - stage: "Build Frappe bench development environment (latest)"
       if: branch = develop AND type != pull_request
       script:
         - docker build -t frappe/bench:latest -f build/bench/Dockerfile .
         - docker push frappe/bench:latest
-    - name: "Build Frappe python environment (edge)"
+    - stage: "Frappe (edge)"
       if: branch = develop AND type != pull_request
       script:
         - ./travis.py frappe --nginx --tag edge
         - ./travis.py frappe --nginx --tag develop--tag-only
-    - name: "Build Frappe nginx + static assets (edge)"
+    - stage: "Frappe (edge)"
       if: branch = develop AND type != pull_request
       script:
         - ./travis.py frappe --nginx --tag edge
         - ./travis.py frappe --nginx --tag develop--tag-only
-    - stage: "Build ERPNext python environment (edge)"
-      if: branch = develop AND type != pull_request
-      script:
-        - ./travis.py erpnext --worker --tag edge
-        - ./travis.py erpnext --worker --tag develop --tag-only
-    - stage: "Build ERPNext nginx + static assets (edge)"
-      if: branch = develop AND type != pull_request
-      script:
-        - ./travis.py erpnext --nginx --tag edge
-        - ./travis.py erpnext --nginx --tag develop --tag-only
-    - stage: "Build Frappe socketio service (edge)"
+    - stage: "Frappe (edge)"
       if: branch = develop AND type != pull_request
       script:
         - ./travis.py frappe --socketio --tag edge
         - ./travis.py frappe --socketio --tag develop --tag-only
-    - stage: "Build Frappe python environment (v12)"
+    - stage: "ERPNext (edge)"
+      if: branch = develop AND type != pull_request
+      script:
+        - ./travis.py erpnext --worker --tag edge
+        - ./travis.py erpnext --worker --tag develop --tag-only
+    - stage: "ERPNext (edge)"
+      if: branch = develop AND type != pull_request
+      script:
+        - ./travis.py erpnext --nginx --tag edge
+        - ./travis.py erpnext --nginx --tag develop --tag-only
+    - stage: "Frappe (v12)"
       if: branch = master AND type != pull_request
       script:
         - ./travis.py frappe --worker --git-branch 12
         - ./travis.py frappe --worker --tag v12 --tag-only
         - ./travis.py frappe --worker --tag version-12 --tag-only
-    - stage: "Build Frappe nginx + static assets (v12)"
+    - stage: "Frappe (v12)"
       if: branch = master AND type != pull_request
       script:
         - ./travis.py frappe --nginx --git-branch 12
         - ./travis.py frappe --nginx --tag v12 --tag-only
         - ./travis.py frappe --nginx --tag version-12 --tag-only
-    - stage: "Build ERPNext python environment (v12)"
+    - stage: "Frappe (v12)"
+      if: branch = master AND type != pull_request
+      script:
+        - ./travis.py frappe --socketio --git-branch 12
+        - ./travis.py frappe --socketio --tag v12 --tag-only
+        - ./travis.py frappe --socketio --tag version-12 --tag-only
+    - stage: "ERPNext (v12)"
       if: branch = master AND type != pull_request
       script:
         - ./travis.py erpnext --worker --git-branch 12
         - ./travis.py erpnext --worker --tag v12 --tag-only
         - ./travis.py erpnext --worker --tag version-12 --tag-only
-    - stage: "Build ERPNext nginx + static assets (v12)"
+    - stage: "ERPNext (v12)"
       if: branch = master AND type != pull_request
       script:
         - ./travis.py erpnext --nginx --git-branch 12
         - ./travis.py erpnext --nginx --tag v12 --tag-only
         - ./travis.py erpnext --nginx --tag version-12 --tag-only
-    - stage: "Build Frappe socketio service (v11)"
-      if: branch = master AND type != pull_request
-      script:
-        - ./travis.py frappe --socketio --git-branch 11
-        - ./travis.py frappe --socketio --tag v11 --tag-only
-        - ./travis.py frappe --socketio --tag version-11 --tag-only
-    - stage: "Build Frappe python environment (v11)"
+    - stage: "Frappe (v11)"
       if: branch = master AND type != pull_request
       script:
         - ./travis.py frappe --worker --git-branch 11
         - ./travis.py frappe --worker --tag v11 --tag-only
         - ./travis.py frappe  --worker --tag version-11 --tag-only
-    - stage: "Build Frappe nginx + static assets (v11)"
+    - stage: "Frappe (v11)"
       if: branch = master AND type != pull_request
       script:
         - ./travis.py erpnext frappe --nginx --git-branch 11
         - ./travis.py erpnext frappe --nginx --tag v11 --tag-only
         - ./travis.py erpnext frappe --nginx --tag version-11 --tag-only
-    - stage: "Build ERPNext python environment (v11)"
-      if: branch = master AND type != pull_request
-      script:
-        - ./travis.py erpnext --worker --git-branch 11
-        - ./travis.py erpnext --worker --tag v11 --tag-only
-        - ./travis.py erpnext --worker --tag version-11 --tag-only
-    - stage: "Build ERPNext nginx + static assets (v11)"
-      if: branch = master AND type != pull_request
-      script:
-        - ./travis.py erpnext --nginx --git-branch 11
-        - ./travis.py erpnext --nginx --tag v11 --tag-only
-        - ./travis.py erpnext --nginx --tag version-11 --tag-only
-    - stage: "Build Frappe socketio service (v11)"
+    - stage: "Frappe (v11)"
       if: branch = master AND type != pull_request
       script:
         - ./travis.py frappe --socketio --git-branch 11
         - ./travis.py frappe --socketio --tag v11 --tag-only
         - ./travis.py frappe --socketio --tag version-11 --tag-only
+    - stage: "ERPNext (v11)"
+      if: branch = master AND type != pull_request
+      script:
+        - ./travis.py erpnext --worker --git-branch 11
+        - ./travis.py erpnext --worker --tag v11 --tag-only
+        - ./travis.py erpnext --worker --tag version-11 --tag-only
+    - stage: "ERPNext (v11)"
+      if: branch = master AND type != pull_request
+      script:
+        - ./travis.py erpnext --nginx --git-branch 11
+        - ./travis.py erpnext --nginx --tag v11 --tag-only
+        - ./travis.py erpnext --nginx --tag version-11 --tag-only
\ No newline at end of file