diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml
index 2ec5ff5..c4ffb89 100644
--- a/.github/workflows/apps.yml
+++ b/.github/workflows/apps.yml
@@ -39,5 +39,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/apps:${{ matrix.app }}
-            ghcr.io/parkervcp/apps:${{ matrix.app }}
+            ghcr.io/${{ github.repository_owner }}/apps:${{ matrix.app }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/apps:${{ matrix.app }}' || '' }}
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index e21c666..02889e9 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -37,5 +37,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:${{ matrix.oses }}
-            ghcr.io/parkervcp/yolks:${{ matrix.oses }}
+            ghcr.io/${{ github.repository_owner }}/yolks:${{ matrix.oses }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:${{ matrix.oses }}' || '' }}
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 7961719..6c3bd10 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -50,8 +50,8 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:bot_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:bot_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }}' || '' }}
       - name: Move cache
         run: |
           rm -rf /tmp/.buildx-cache
@@ -83,4 +83,4 @@ jobs:
   #         platforms: linux/amd64
   #         push: true
   #         tags: |
-  #           ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }}
+  #           ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/box64.yml b/.github/workflows/box64.yml
index 906614d..cbba58e 100644
--- a/.github/workflows/box64.yml
+++ b/.github/workflows/box64.yml
@@ -35,5 +35,5 @@ jobs:
           platforms: linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml
index 82b3db7..95a4917 100644
--- a/.github/workflows/bun.yml
+++ b/.github/workflows/bun.yml
@@ -36,5 +36,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:bun_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:bun_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:bun_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:bun_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/cassandra.yml b/.github/workflows/cassandra.yml
index 54b44ed..8593bbc 100644
--- a/.github/workflows/cassandra.yml
+++ b/.github/workflows/cassandra.yml
@@ -35,5 +35,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:cassandra_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:cassandra_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:cassandra_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:cassandra_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index cc12c34..469a029 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -40,5 +40,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:dart_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:dart_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:dart_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:dart_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index addc036..546af64 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -42,5 +42,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:dotnet_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:dotnet_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:dotnet_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:dotnet_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
index dd8e9a9..d72d1fe 100644
--- a/.github/workflows/elixir.yml
+++ b/.github/workflows/elixir.yml
@@ -39,5 +39,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:elixir_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:elixir_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:elixir_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:elixir_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index 227de6a..6a5d767 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -38,5 +38,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:erlang_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:erlang_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:erlang_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:erlang_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml
index d1e4e7d..9c9b1f3 100644
--- a/.github/workflows/games.yml
+++ b/.github/workflows/games.yml
@@ -43,8 +43,8 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/games:${{ matrix.game }}
-            ghcr.io/parkervcp/games:${{ matrix.game }}
+            ghcr.io/${{ github.repository_owner }}/games:${{ matrix.game }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/games:${{ matrix.game }}' || '' }}
   pushAll:
     name: "games_All:${{ matrix.game }}"
     runs-on: ubuntu-latest
@@ -75,5 +75,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/games:${{ matrix.game }}
-            ghcr.io/parkervcp/games:${{ matrix.game }}
+            ghcr.io/${{ github.repository_owner }}/games:${{ matrix.game }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/games:${{ matrix.game }}' || '' }}
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 9dc62cb..ca30c81 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -43,5 +43,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:go_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:go_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:go_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:go_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index 05b00c1..28499d7 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -37,5 +37,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/installers:${{ matrix.tag }}
-            ghcr.io/parkervcp/installers:${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/installers:${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/installers:${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index e6e2846..02dc035 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -44,5 +44,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:java_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:java_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:java_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:java_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
index 9937965..97663d3 100644
--- a/.github/workflows/mariadb.yml
+++ b/.github/workflows/mariadb.yml
@@ -45,5 +45,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:mariadb_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:mariadb_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:mariadb_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:mariadb_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/mongodb.yml b/.github/workflows/mongodb.yml
index 8d5fae7..37c503f 100644
--- a/.github/workflows/mongodb.yml
+++ b/.github/workflows/mongodb.yml
@@ -39,5 +39,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:mongodb_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:mongodb_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:mongodb_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:mongodb_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
index 57f7809..ef1e61b 100644
--- a/.github/workflows/mono.yml
+++ b/.github/workflows/mono.yml
@@ -34,5 +34,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:mono_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:mono_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:mono_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:mono_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 2417e1b..17d4543 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -45,5 +45,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:nodejs_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:nodejs_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 4a372a0..12ca4d5 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -42,5 +42,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:postgres_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:postgres_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:postgres_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:postgres_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index c9a663f..6b1994a 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -43,5 +43,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:python_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:python_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:python_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:python_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
index cca5459..289ccbe 100644
--- a/.github/workflows/redis.yml
+++ b/.github/workflows/redis.yml
@@ -38,5 +38,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:redis_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:redis_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:redis_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:redis_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3480bae..a389cfc 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -38,5 +38,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:rust_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:rust_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:rust_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:rust_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/steamcmd.yml b/.github/workflows/steamcmd.yml
index 0240a9c..58d1354 100644
--- a/.github/workflows/steamcmd.yml
+++ b/.github/workflows/steamcmd.yml
@@ -39,5 +39,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/steamcmd:${{ matrix.distro }}
-            ghcr.io/parkervcp/steamcmd:${{ matrix.distro }}
+            ghcr.io/${{ github.repository_owner }}/steamcmd:${{ matrix.distro }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/steamcmd:${{ matrix.distro }}' || '' }}
diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 115f64b..b2e3e91 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -34,8 +34,8 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:voice_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}' || '' }}
 
 
   pushx64_arm64:
@@ -66,5 +66,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:voice_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}' || '' }}
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
index ed7c732..f8d275b 100644
--- a/.github/workflows/wine.yml
+++ b/.github/workflows/wine.yml
@@ -40,5 +40,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pelican-eggs/yolks:wine_${{ matrix.tag }}
-            ghcr.io/parkervcp/yolks:wine_${{ matrix.tag }}
+            ghcr.io/${{ github.repository_owner }}/yolks:wine_${{ matrix.tag }}
+            ${{ github.repository_owner == 'pelican-eggs' && 'ghcr.io/parkervcp/yolks:wine_${{ matrix.tag }}' || '' }}