diff --git a/.github/workflows/master-latest.yaml b/.github/workflows/master-latest.yaml
index 2eafc63..6784b45 100644
--- a/.github/workflows/master-latest.yaml
+++ b/.github/workflows/master-latest.yaml
@@ -43,7 +43,7 @@ jobs:
       # due to the way manifests work, the gap between this and the complete push below
       #  could result in pull failures or inconsistencies for arm64, such is life.
       # further duplicated by building both release and debug builds
-      - name: Build and push amd64 Release Docker Image to DockerHub
+      - name: Build and push amd64 Release Docker Image to DockerHub/GitHub CR
         uses: docker/build-push-action@v2
         with:
           build-args: |
@@ -58,7 +58,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache/release
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache/release
 
-      - name: Build and push amd64 Debug Docker Image to DockerHub
+      - name: Build and push amd64 Debug Docker Image to DockerHub/GitHub CR
         uses: docker/build-push-action@v2
         with:
           build-args: |
diff --git a/.github/workflows/tags.yaml b/.github/workflows/tags.yaml
index 85a471c..7976c31 100644
--- a/.github/workflows/tags.yaml
+++ b/.github/workflows/tags.yaml
@@ -39,17 +39,24 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildxarch-
 
-      - name: Login to DockerHub
+      - name: Docker Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
+      - name: Docker Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKER_GITHUB_USERNAME }}
+          password: ${{ secrets.DOCKER_GITHUB_PAT }}
+
       # the arm64 is of course much slower due to qemu, so build and push amd64 **first**
       # due to the way manifests work, the gap between this and the complete push below
       #  could result in pull failures or inconsistencies for arm64, such is life.
       # further duplicated by building both release and debug builds
-      - name: Build and push amd64 Release Docker Image to DockerHub
+      - name: Build and push amd64 Release Docker Image to DockerHub/GitHub CR
         uses: docker/build-push-action@v2
         with:
           build-args: |
@@ -59,12 +66,12 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64
-          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}
+          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }},ghcr.io/rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache/release
           # first run does not export the cache
 
-      - name: Build and push amd64 Debug Docker Image to DockerHub
+      - name: Build and push amd64 Debug Docker Image to DockerHub/GitHub CR
         uses: docker/build-push-action@v2
         with:
           build-args: |
@@ -74,14 +81,14 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64
-          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}-debug
+          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}-debug,ghcr.io/rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}-debug
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache/debug
           # first run does not export the cache
 
       # Do it all again with both archs. the amd64 will be a huge cache hit
       # this will update the manifest have both arches
-      - name: Build and push multiarch Release Docker Image to DockerHub
+      - name: Build and push multiarch Release Docker Image to DockerHub/GitHub CR
         uses: docker/build-push-action@v2
         with:
           build-args: |
@@ -91,12 +98,12 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/arm64,linux/amd64
-          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}
+          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }},ghcr.io/rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache/release
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache/release
 
-      - name: Build and push multiarch Debug Docker Image to DockerHub
+      - name: Build and push multiarch Debug Docker Image to DockerHub/GitHub CR
         uses: docker/build-push-action@v2
         with:
           build-args: |
@@ -106,7 +113,7 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/arm64,linux/amd64
-          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}-debug
+          tags: rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}-debug,ghcr.io/rpardini/docker-registry-proxy:${{ steps.get_version.outputs.version }}-debug
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache/debug
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache/debug