diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1e1b21d..3082ee6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
     docker-publish:
-        name: Publish to Docker Hub
+        name: Publish to Docker Hub and GitHub Container Registry
         if: "!contains(github.event.head_commit.message, '[ci skip]')"
         runs-on: ubuntu-20.04
         steps:
@@ -35,6 +35,12 @@ jobs:
               with:
                   username: ${{ secrets.DOCKER_USERNAME }}
                   password: ${{ secrets.DOCKER_PASSWORD }}
+            - name: Login to GitHub Container Registry
+              uses: docker/login-action@v1.14.1
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.repository_owner }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
             - name: Build and push
               uses: docker/build-push-action@v2.10.0
               with:
@@ -44,4 +50,6 @@ jobs:
                   tags: |
                       dchesterton/amcrest2mqtt:latest
                       dchesterton/amcrest2mqtt:${{ steps.version.outputs.version }}
+                      ghcr.io/dchesterton/amcrest2mqtt:latest
+                      ghcr.io/dchesterton/amcrest2mqtt:${{ steps.version.outputs.version }}
                   labels: "version=${{ steps.version.outputs.version }}"