diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index f42b7a4a6..86ef532b8 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -7,9 +7,12 @@ on:
   pull_request:
 jobs:
   test:
+    name: Run JS/Python/Cypress tests
     if: ${{ github.event.pusher.email != 'action@github.com' }}
     runs-on: ubuntu-18.04
     steps:
+      - name: "[Debug] Print pusher email"
+        run: echo "${{ github.event.pusher.email }}"
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -58,6 +61,7 @@ jobs:
         uses: codecov/codecov-action@v1
 
   test-aimmo-game:
+    name: Test aimmo-game
     if: ${{ github.event.pusher.email != 'action@github.com' }}
     runs-on: ubuntu-18.04
     steps:
@@ -80,6 +84,7 @@ jobs:
         uses: codecov/codecov-action@v1
 
   test-aimmo-game-creator:
+    name: Test aimmo-game-creator
     if: ${{ github.event.pusher.email != 'action@github.com' }}
     runs-on: ubuntu-18.04
     steps:
@@ -102,6 +107,7 @@ jobs:
         uses: codecov/codecov-action@v1
 
   test-aimmo-game-worker:
+    name: Test aimmo-game-worker
     if: ${{ github.event.pusher.email != 'action@github.com' }}
     runs-on: ubuntu-18.04
     steps:
@@ -122,10 +128,11 @@ jobs:
           docker cp -a $CONTAINERID:coverage.xml $(pwd)/coverage.xml
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
-  
+
   publish-python:
     name: Publish aimmo PyPi package
-    needs: [test, test-aimmo-game, test-aimmo-game-creator, test-aimmo-game-worker]
+    needs:
+      [test, test-aimmo-game, test-aimmo-game-creator, test-aimmo-game-worker]
     if: github.event_name == 'push' && github.event.pusher.email != 'action@github.com'
     runs-on: ubuntu-18.04
     env:
@@ -170,8 +177,7 @@ jobs:
 
   publish-docker-images:
     name: Publish aimmo Docker images
-    needs: [test, test-aimmo-game, test-aimmo-game-creator, test-aimmo-game-worker]
-    if: github.event_name == 'push' && github.event.pusher.email != 'action@github.com'
+    if: github.event_name == 'push' && github.event.pusher.email == 'action@github.com' && startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout