diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
index 36c396f..859552e 100644
--- a/.github/workflows/build-beta.yml
+++ b/.github/workflows/build-beta.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.CR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -61,7 +61,7 @@ jobs:
           context: "{{defaultContext}}:${{ matrix.folder }}"
           tags: >
             soupbowl/opensimulator:${{ matrix.tag }},
-            ghcr.io/soup-bowl/opensimulator-docker:${{ matrix.tag }},
+            ghcr.io/${{ github.repository }}:${{ matrix.tag }},
           platforms: ${{ matrix.platforms }}
           file: "${{ matrix.file }}"
           build-args: |
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index ffab9fb..624a1de 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -18,7 +18,7 @@ jobs:
           # - version: "0.9.2.0"
           #   tag: >
           #     soupbowl/opensimulator:0.9.2.0,
-          #     ghcr.io/soup-bowl/opensimulator-docker:0.9.2.0,
+          #     ghcr.io/${{ github.repository }}:0.9.2.0,
           #   folder: build/latest
           #   file: Dockerfile.mono
           #   platforms: linux/amd64,linux/arm64
@@ -26,7 +26,7 @@ jobs:
           # - version: "0.9.2.1"
           #   tag: >
           #     soupbowl/opensimulator:0.9.2.1,
-          #     ghcr.io/soup-bowl/opensimulator-docker:0.9.2.1,
+          #     ghcr.io/${{ github.repository }}:0.9.2.1,
           #   folder: build/latest
           #   file: Dockerfile.mono
           #   platforms: linux/amd64,linux/arm64
@@ -35,8 +35,8 @@ jobs:
           #   tag: >
           #     soupbowl/opensimulator:0.9.2,
           #     soupbowl/opensimulator:0.9.2.2,
-          #     ghcr.io/soup-bowl/opensimulator-docker:0.9.2,
-          #     ghcr.io/soup-bowl/opensimulator-docker:0.9.2.2,
+          #     ghcr.io/${{ github.repository }}:0.9.2,
+          #     ghcr.io/${{ github.repository }}:0.9.2.2,
           #   folder: build/latest
           #   file: Dockerfile.mono
           #   platforms: linux/amd64,linux/arm64
@@ -47,10 +47,10 @@ jobs:
               soupbowl/opensimulator:0.9,
               soupbowl/opensimulator:0.9.3,
               soupbowl/opensimulator:0.9.3.0,
-              ghcr.io/soup-bowl/opensimulator-docker:latest,
-              ghcr.io/soup-bowl/opensimulator-docker:0.9,
-              ghcr.io/soup-bowl/opensimulator-docker:0.9.3,
-              ghcr.io/soup-bowl/opensimulator-docker:0.9.3.0,
+              ghcr.io/${{ github.repository }}:latest,
+              ghcr.io/${{ github.repository }}:0.9,
+              ghcr.io/${{ github.repository }}:0.9.3,
+              ghcr.io/${{ github.repository }}:0.9.3.0,
             folder: build/latest
             file: Dockerfile
             platforms: linux/amd64,linux/arm64
@@ -59,8 +59,8 @@ jobs:
             tag: >
               soupbowl/opensimulator:0.9.3-noscreen,
               soupbowl/opensimulator:0.9.3.0-noscreen,
-              ghcr.io/soup-bowl/opensimulator-docker:0.9.3-noscreen,
-              ghcr.io/soup-bowl/opensimulator-docker:0.9.3.0-noscreen,
+              ghcr.io/${{ github.repository }}:0.9.3-noscreen,
+              ghcr.io/${{ github.repository }}:0.9.3.0-noscreen,
             folder: build/latest
             file: Dockerfile.noscreen
             platforms: linux/amd64,linux/arm64
@@ -75,7 +75,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.CR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3