diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 683a22a5..cc2f1fe7 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,18 +1,20 @@
-name: docker-build-push
+name: Docker
 
 on:
   push:
     branches: [ master, release/* ]
+    tags: [ '**' ]
 
 env:
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
 jobs:
   build:
+    name: Build & Push
     runs-on: ubuntu-latest
     env:
-      REPOSITORY_URL: docker.pkg.github.com
-      IMAGE_NAME: ${{ github.repository }}/alerta-webui
+      REPOSITORY_URL: ghcr.io
+      IMAGE_NAME: ${{ github.repository_owner }}/alerta-webui
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -31,7 +33,8 @@ jobs:
           -t $REPOSITORY_URL/$IMAGE_NAME:$(cat VERSION)
           -t $REPOSITORY_URL/$IMAGE_NAME:${{ steps.vars.outputs.SHORT_COMMIT_ID }}
           -t $REPOSITORY_URL/$IMAGE_NAME:latest .
-      - uses: docker/login-action@v1
+      - name: Docker Login
+        uses: docker/login-action@v1
         with:
           registry: ${{ env.REPOSITORY_URL }}
           username: ${{ github.actor }}