diff --git a/.github/workflows/build+test.yml b/.github/workflows/build+test.yml
index 0434d58..308fac0 100644
--- a/.github/workflows/build+test.yml
+++ b/.github/workflows/build+test.yml
@@ -39,9 +39,9 @@ jobs:
       - name: Login to GitHub Packages Docker Registry
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.CR_PAT }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -63,7 +63,7 @@ jobs:
           push: true
           tags: |
             dirtbags/moth:${{ steps.vars.outputs.tag }}
-            docker.pkg.github.com/dirtbags/moth/moth:${{ steps.vars.outputs.tag }}
+            ghcr.io/dirtbags/moth/moth:${{ steps.vars.outputs.tag }}
 
       - name: Build and push moth-devel image
         uses: docker/build-push-action@v2
@@ -74,4 +74,4 @@ jobs:
           push: true
           tags: |
             dirtbags/moth-devel:${{ steps.vars.outputs.tag }}
-            docker.pkg.github.com/dirtbags/moth/moth-devel:${{ steps.vars.outputs.tag }}
+            ghcr.io/dirtbags/moth/moth-devel:${{ steps.vars.outputs.tag }}