diff --git a/.travis.yml b/.travis.yml
index 938235c1..6cebe644 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,8 +65,8 @@ matrix:
         - export VERSION=$(git tag --list --sort=-version:refname "v12*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
         - docker build -t frappe-worker:$VERSION -f build/frappe-worker/Dockerfile .
-        - docker tag frappe-worker:$VERSION frappe/frappe-worker:v12
-        - docker tag frappe-worker:$VERSION frappe/frappe-worker:$VERSION
+        - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:v12
+        - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:$VERSION
         - docker push frappe/frappe-worker:$VERSION
     - name: "Build Frappe nginx + static assets (v12)"
       script:
@@ -75,8 +75,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v12*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t frappe-assets:$VERSION -f build/frappe-assets/Dockerfile .
-        - docker tag frappe-assets:$VERSION frappe/frappe-assets:v12
+        - docker build -t frappe/frappe-assets:$VERSION -f build/frappe-assets/Dockerfile .
+        - docker tag frappe/frappe-assets:$VERSION frappe/frappe-assets:v12
         - docker push frappe/frappe-assets:$VERSION
     - name: "Build ERPNext python environment (v12)"
       script:
@@ -85,8 +85,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v12*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t erpnext-worker:$VERSION -f build/erpnext-worker/Dockerfile .
-        - docker tag erpnext-worker:$VERSION frappe/erpnext-worker:v12
+        - docker build -t frappe/erpnext-worker:$VERSION -f build/erpnext-worker/Dockerfile .
+        - docker tag frappe/erpnext-worker:$VERSION frappe/erpnext-worker:v12
         - docker push frappe/erpnext-worker:$VERSION
     - name: "Build ERPNext nginx + static assets (v12)"
       script:
@@ -95,8 +95,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v12*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t erpnext-assets:$VERSION -f build/erpnext-assets/Dockerfile .
-        - docker tag erpnext-assets:$VERSION frappe/erpnext-assets:v12
+        - docker build -t frappe/erpnext-assets:$VERSION -f build/erpnext-assets/Dockerfile .
+        - docker tag frappe/erpnext-assets:$VERSION frappe/erpnext-assets:v12
         - docker push frappe/erpnext-assets:$VERSION
     - name: "Build Frappe socketio service (v12)"
       script:
@@ -105,8 +105,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v12*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t frappe-socketio:$VERSION -f build/frappe-socketio/Dockerfile .
-        - docker tag frappe-socketio:$VERSION frappe/frappe-socketio:v12
+        - docker build -t frappe/frappe-socketio:$VERSION -f build/frappe-socketio/Dockerfile .
+        - docker tag frappe/frappe-socketio:$VERSION frappe/frappe-socketio:v12
         - docker push frappe/frappe-socketio:$VERSION
     - name: "Build Frappe python environment (v11)"
       script:
@@ -115,8 +115,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v11*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t frappe-worker:$VERSION -f build/frappe-worker/Dockerfile .
-        - docker tag frappe-worker:$VERSION frappe/frappe-worker:v11
+        - docker build -t frappe/frappe-worker:$VERSION -f build/frappe-worker/Dockerfile .
+        - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:v11
         - docker push frappe/frappe-worker:$VERSION
     - name: "Build Frappe nginx + static assets (v11)"
       script:
@@ -125,8 +125,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v11*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t frappe-assets:$VERSION -f build/frappe-assets/Dockerfile .
-        - docker tag frappe-assets:$VERSION frappe/frappe-assets:v11
+        - docker build -t frappe/frappe-assets:$VERSION -f build/frappe-assets/Dockerfile .
+        - docker tag frappe/frappe-assets:$VERSION frappe/frappe-assets:v11
         - docker push frappe/frappe-assets:$VERSION
     - name: "Build ERPNext python environment (v11)"
       script:
@@ -135,8 +135,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v11*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t erpnext-worker:$VERSION -f build/erpnext-worker/Dockerfile .
-        - docker tag erpnext-worker:$VERSION frappe/erpnext-worker:v11
+        - docker build -t frappe/erpnext-worker:$VERSION -f build/erpnext-worker/Dockerfile .
+        - docker tag frappe/erpnext-worker:$VERSION frappe/erpnext-worker:v11
         - docker push frappe/erpnext-worker:$VERSION
     - name: "Build ERPNext nginx + static assets (v11)"
       script:
@@ -145,8 +145,8 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v11*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t erpnext-assets:$VERSION -f build/erpnext-assets/Dockerfile .
-        - docker tag erpnext-assets:$VERSION frappe/erpnext-assets:v11
+        - docker build -t frappe/erpnext-assets:$VERSION -f build/erpnext-assets/Dockerfile .
+        - docker tag frappe/erpnext-assets:$VERSION frappe/erpnext-assets:v11
         - docker push frappe/erpnext-assets:$VERSION
     - name: "Build Frappe socketio service (v11)"
       script:
@@ -155,6 +155,6 @@ matrix:
         - git fetch --tags
         - export VERSION=$(git tag --list --sort=-version:refname "v11*" | sed -n 1p | sed -e 's#.*@\(\)#\1#')
         - cd ..
-        - docker build -t frappe-socketio:$VERSION -f build/frappe-socketio/Dockerfile .
-        - docker tag frappe-socketio:$VERSION frappe/frappe-socketio:v11
+        - docker build -t frappe/frappe-socketio:$VERSION -f build/frappe-socketio/Dockerfile .
+        - docker tag frappe/frappe-socketio:$VERSION frappe/frappe-socketio:v11
         - docker push frappe/frappe-socketio:$VERSION