diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml
index 02473ceb9..7568019ea 100644
--- a/.github/workflows/apps.yml
+++ b/.github/workflows/apps.yml
@@ -39,4 +39,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/apps:${{ matrix.app }}
             ghcr.io/parkervcp/apps:${{ matrix.app }}
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index c5b90c85c..23dd116d6 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -37,4 +37,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:${{ matrix.oses }}
             ghcr.io/parkervcp/yolks:${{ matrix.oses }}
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index ddd4f0ee9..8b89cbd40 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -50,6 +50,7 @@ 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 }}
       - name: Move cache
         run: |
diff --git a/.github/workflows/box64.yml b/.github/workflows/box64.yml
index eb8714503..971b30c95 100644
--- a/.github/workflows/box64.yml
+++ b/.github/workflows/box64.yml
@@ -35,4 +35,5 @@ jobs:
           platforms: linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:${{ matrix.tag }}
diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml
index 4f3bb061c..7aaf53a81 100644
--- a/.github/workflows/bun.yml
+++ b/.github/workflows/bun.yml
@@ -36,4 +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 }}
diff --git a/.github/workflows/cassandra.yml b/.github/workflows/cassandra.yml
index 83a2369bd..b2b81e69a 100644
--- a/.github/workflows/cassandra.yml
+++ b/.github/workflows/cassandra.yml
@@ -35,4 +35,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:cassandra_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:cassandra_${{ matrix.tag }}
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 3a26b8b5b..0738f978d 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -40,4 +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 }}
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 9d30d00cf..13c91cbae 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -41,4 +41,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 }}
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
index e1fa8cdd5..09d767906 100644
--- a/.github/workflows/elixir.yml
+++ b/.github/workflows/elixir.yml
@@ -39,4 +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 }}
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index b834b2ee8..0a4936612 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -38,4 +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 }}
diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml
index 61e222db9..cafebf7df 100644
--- a/.github/workflows/games.yml
+++ b/.github/workflows/games.yml
@@ -42,6 +42,7 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/games:${{ matrix.game }}
             ghcr.io/parkervcp/games:${{ matrix.game }}
   pushAll:
     name: "games_All:${{ matrix.game }}"
@@ -73,4 +74,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/games:${{ matrix.game }}
             ghcr.io/parkervcp/games:${{ matrix.game }}
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 517928226..89708019e 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -42,4 +42,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:go_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:go_${{ matrix.tag }}
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index 653b17575..86247c2f9 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -37,4 +37,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/installers:${{ matrix.tag }}
             ghcr.io/parkervcp/installers:${{ matrix.tag }}
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 8ff3dec24..ae681f686 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -43,4 +43,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 }}
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
index de957bdcd..8ad62598b 100644
--- a/.github/workflows/mariadb.yml
+++ b/.github/workflows/mariadb.yml
@@ -43,4 +43,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 }}
diff --git a/.github/workflows/mongodb.yml b/.github/workflows/mongodb.yml
index 040ef1ee9..cfe8bda64 100644
--- a/.github/workflows/mongodb.yml
+++ b/.github/workflows/mongodb.yml
@@ -39,4 +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 }}
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
index 952c3e00b..cdc8aa3a5 100644
--- a/.github/workflows/mono.yml
+++ b/.github/workflows/mono.yml
@@ -34,4 +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 }}
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index e31f98c22..39f359257 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -43,4 +43,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 }}
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 3f863ec52..b76595f6e 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -42,4 +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 }}
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 6627079c0..82d0d02ac 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -42,4 +42,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 }}
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
index 0fa901814..5ae84711d 100644
--- a/.github/workflows/redis.yml
+++ b/.github/workflows/redis.yml
@@ -38,4 +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 }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 6dbb902ba..03e30ba2b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -38,4 +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 }}
diff --git a/.github/workflows/steamcmd.yml b/.github/workflows/steamcmd.yml
index 443c9abdf..841d0a8db 100644
--- a/.github/workflows/steamcmd.yml
+++ b/.github/workflows/steamcmd.yml
@@ -39,4 +39,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/steamcmd:${{ matrix.distro }}
             ghcr.io/parkervcp/steamcmd:${{ matrix.distro }}
diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 6b3dea6a6..bc5f38822 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -34,7 +34,9 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-             ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+            ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
+            ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+
 
   pushx64_arm64:
     name: "yolks:voice_${{ matrix.tag }}"
@@ -64,4 +66,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-             ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+            ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
+            ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
index bdb17241d..bd3f580f0 100644
--- a/.github/workflows/wine.yml
+++ b/.github/workflows/wine.yml
@@ -36,4 +36,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:wine_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:wine_${{ matrix.tag }}