diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index e49e0096..ad5ffe9f 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -1,4 +1,4 @@
-name: Test, build and push to Docker Hub (master/latest)
+name: Build and push containers
 
 on:
   workflow_run:
@@ -37,7 +37,14 @@ jobs:
           image: tonistiigi/binfmt:latest
           platforms: all
 
-      - name: Login to Docker Hub
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to Docker Hub Container Registry
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -76,7 +83,7 @@ jobs:
           push: true
           tags: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/changedetection.io:${{ steps.tagName.outputs.tag }}
-            ghcr.io/dgtlmoon/changedetection.io:${{ steps.tagName.outputs.tag }}
+            ghcr.io/dgtlmoon/changedetection.io
           platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache