diff --git a/app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php b/app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php
index 8f865684b..c4de8ea6a 100644
--- a/app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php
+++ b/app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php
@@ -127,7 +127,7 @@ class CreateEgg extends CreateRecord
                                 ->keyLabel(trans('admin/egg.docker_name'))
                                 ->keyPlaceholder('Java 21')
                                 ->valueLabel(trans('admin/egg.docker_uri'))
-                                ->valuePlaceholder('ghcr.io/parkervcp/yolks:java_21')
+                                ->valuePlaceholder('ghcr.io/pelican-eggs/yolks:java_21')
                                 ->helperText(trans('admin/egg.docker_help')),
                         ]),
 
diff --git a/app/Models/WebhookConfiguration.php b/app/Models/WebhookConfiguration.php
index 60283f4d8..7633a5648 100644
--- a/app/Models/WebhookConfiguration.php
+++ b/app/Models/WebhookConfiguration.php
@@ -221,7 +221,7 @@ class WebhookConfiguration extends Model
             'created_at' => '2025-09-05T01:15:43.000000Z',
             'updated_at' => '2025-09-11T22:45:14.000000Z',
             'allocation_id' => 4,
-            'image' => 'ghcr.io/parkervcp/yolks:java_21',
+            'image' => 'ghcr.io/pelican-eggs/yolks:java_21',
             'description' => 'This is an example server description.',
             'skip_scripts' => false,
             'external_id' => null,
diff --git a/database/Seeders/eggs/minecraft/egg-bungeecord.yaml b/database/Seeders/eggs/minecraft/egg-bungeecord.yaml
index d35177a88..d6c2f35fe 100644
--- a/database/Seeders/eggs/minecraft/egg-bungeecord.yaml
+++ b/database/Seeders/eggs/minecraft/egg-bungeecord.yaml
@@ -21,11 +21,11 @@ features:
   - java_version
   - pid_limit
 docker_images:
-  'Java 21': 'ghcr.io/parkervcp/yolks:java_21'
-  'Java 17': 'ghcr.io/parkervcp/yolks:java_17'
-  'Java 16': 'ghcr.io/parkervcp/yolks:java_16'
-  'Java 11': 'ghcr.io/parkervcp/yolks:java_11'
-  'Java 8': 'ghcr.io/parkervcp/yolks:java_8'
+  'Java 21': 'ghcr.io/pelican-eggs/yolks:java_21'
+  'Java 17': 'ghcr.io/pelican-eggs/yolks:java_17'
+  'Java 16': 'ghcr.io/pelican-eggs/yolks:java_16'
+  'Java 11': 'ghcr.io/pelican-eggs/yolks:java_11'
+  'Java 8': 'ghcr.io/pelican-eggs/yolks:java_8'
 file_denylist: {  }
 startup_commands:
   Default: 'java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}'
diff --git a/database/Seeders/eggs/minecraft/egg-forge-minecraft.yaml b/database/Seeders/eggs/minecraft/egg-forge-minecraft.yaml
index 51971cad8..58934f26d 100644
--- a/database/Seeders/eggs/minecraft/egg-forge-minecraft.yaml
+++ b/database/Seeders/eggs/minecraft/egg-forge-minecraft.yaml
@@ -2,7 +2,7 @@ _comment: 'DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL'
 meta:
   version: PLCN_v3
   update_url: 'https://github.com/pelican-dev/panel/raw/main/database/Seeders/eggs/minecraft/egg-forge-minecraft.yaml'
-exported_at: '2025-10-31T12:24:57+00:00'
+exported_at: '2025-12-09T21:55:23+00:00'
 name: 'Forge Minecraft'
 author: panel@example.com
 uuid: ed072427-f209-4603-875c-f540c6dd5a65
@@ -17,11 +17,11 @@ features:
   - java_version
   - pid_limit
 docker_images:
-  'Java 21': 'ghcr.io/parkervcp/yolks:java_21'
-  'Java 17': 'ghcr.io/parkervcp/yolks:java_17'
-  'Java 16': 'ghcr.io/parkervcp/yolks:java_16'
-  'Java 11': 'ghcr.io/parkervcp/yolks:java_11'
-  'Java 8': 'ghcr.io/parkervcp/yolks:java_8'
+  'Java 21': 'ghcr.io/pelican-eggs/yolks:java_21'
+  'Java 17': 'ghcr.io/pelican-eggs/yolks:java_17'
+  'Java 16': 'ghcr.io/pelican-eggs/yolks:java_16'
+  'Java 11': 'ghcr.io/pelican-eggs/yolks:java_11'
+  'Java 8': 'ghcr.io/pelican-eggs/yolks:java_8'
 file_denylist: {  }
 startup_commands:
   Default: 'java -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true $( [[  ! -f unix_args.txt ]] && printf %s "-jar {{SERVER_JARFILE}}" || printf %s "@unix_args.txt" )'
@@ -168,7 +168,7 @@ scripts:
       "
       rm -rf installer.jar
       echo -e "Installation process is completed"
-    container: 'openjdk:8-jdk-slim'
+    container: 'ghcr.io/pelican-eggs/installers:java_8'
     entrypoint: bash
 variables:
   -
diff --git a/database/Seeders/eggs/minecraft/egg-paper.yaml b/database/Seeders/eggs/minecraft/egg-paper.yaml
index c93c133c8..41870fc8b 100644
--- a/database/Seeders/eggs/minecraft/egg-paper.yaml
+++ b/database/Seeders/eggs/minecraft/egg-paper.yaml
@@ -15,11 +15,11 @@ features:
   - java_version
   - pid_limit
 docker_images:
-  'Java 21': 'ghcr.io/parkervcp/yolks:java_21'
-  'Java 17': 'ghcr.io/parkervcp/yolks:java_17'
-  'Java 16': 'ghcr.io/parkervcp/yolks:java_16'
-  'Java 11': 'ghcr.io/parkervcp/yolks:java_11'
-  'Java 8': 'ghcr.io/parkervcp/yolks:java_8'
+  'Java 21': 'ghcr.io/pelican-eggs/yolks:java_21'
+  'Java 17': 'ghcr.io/pelican-eggs/yolks:java_17'
+  'Java 16': 'ghcr.io/pelican-eggs/yolks:java_16'
+  'Java 11': 'ghcr.io/pelican-eggs/yolks:java_11'
+  'Java 8': 'ghcr.io/pelican-eggs/yolks:java_8'
 file_denylist: {  }
 startup_commands:
   Default: 'java -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}'
@@ -91,7 +91,7 @@ scripts:
           echo -e "Downloading MC server.properties"
           curl -o server.properties https://raw.githubusercontent.com/parkervcp/eggs/master/minecraft/java/server.properties
       fi
-    container: 'ghcr.io/parkervcp/installers:alpine'
+    container: 'ghcr.io/pelican-eggs/installers:alpine'
     entrypoint: ash
 variables:
   -
diff --git a/database/Seeders/eggs/minecraft/egg-sponge.yaml b/database/Seeders/eggs/minecraft/egg-sponge.yaml
index 234d7e742..9fd4b8713 100644
--- a/database/Seeders/eggs/minecraft/egg-sponge.yaml
+++ b/database/Seeders/eggs/minecraft/egg-sponge.yaml
@@ -15,11 +15,11 @@ features:
   - java_version
   - pid_limit
 docker_images:
-  'Java 21': 'ghcr.io/parkervcp/yolks:java_21'
-  'Java 17': 'ghcr.io/parkervcp/yolks:java_17'
-  'Java 16': 'ghcr.io/parkervcp/yolks:java_16'
-  'Java 11': 'ghcr.io/parkervcp/yolks:java_11'
-  'Java 8': 'ghcr.io/parkervcp/yolks:java_8'
+  'Java 21': 'ghcr.io/pelican-eggs/yolks:java_21'
+  'Java 17': 'ghcr.io/pelican-eggs/yolks:java_17'
+  'Java 16': 'ghcr.io/pelican-eggs/yolks:java_16'
+  'Java 11': 'ghcr.io/pelican-eggs/yolks:java_11'
+  'Java 8': 'ghcr.io/pelican-eggs/yolks:java_8'
 file_denylist: {  }
 startup_commands:
   Default: 'java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}'
@@ -103,7 +103,7 @@ scripts:
       fi
 
       echo -e "Install Complete"
-    container: 'ghcr.io/parkervcp/installers:alpine'
+    container: 'ghcr.io/pelican-eggs/installers:alpine'
     entrypoint: ash
 variables:
   -
diff --git a/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.yaml b/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.yaml
index 122dfb0a4..b0f0a120b 100644
--- a/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.yaml
+++ b/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.yaml
@@ -19,11 +19,11 @@ features:
   - java_version
   - pid_limit
 docker_images:
-  'Java 21': 'ghcr.io/parkervcp/yolks:java_21'
-  'Java 17': 'ghcr.io/parkervcp/yolks:java_17'
-  'Java 16': 'ghcr.io/parkervcp/yolks:java_16'
-  'Java 11': 'ghcr.io/parkervcp/yolks:java_11'
-  'Java 8': 'ghcr.io/parkervcp/yolks:java_8'
+  'Java 21': 'ghcr.io/pelican-eggs/yolks:java_21'
+  'Java 17': 'ghcr.io/pelican-eggs/yolks:java_17'
+  'Java 16': 'ghcr.io/pelican-eggs/yolks:java_16'
+  'Java 11': 'ghcr.io/pelican-eggs/yolks:java_11'
+  'Java 8': 'ghcr.io/pelican-eggs/yolks:java_8'
 file_denylist: {  }
 startup_commands:
   Default: 'java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}'
@@ -69,7 +69,7 @@ scripts:
       curl -o ${SERVER_JARFILE} $DOWNLOAD_URL
 
       echo -e "Install Complete"
-    container: 'ghcr.io/parkervcp/installers:alpine'
+    container: 'ghcr.io/pelican-eggs/installers:alpine'
     entrypoint: ash
 variables:
   -
diff --git a/database/Seeders/eggs/rust/egg-rust.yaml b/database/Seeders/eggs/rust/egg-rust.yaml
index fba53dc7d..8916b6a5f 100644
--- a/database/Seeders/eggs/rust/egg-rust.yaml
+++ b/database/Seeders/eggs/rust/egg-rust.yaml
@@ -18,7 +18,7 @@ tags:
 features:
   - steam_disk_space
 docker_images:
-  Rust: 'ghcr.io/parkervcp/games:rust'
+  Rust: 'ghcr.io/pelican-eggs/games:rust'
 file_denylist: {  }
 startup_commands:
   Default: './RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.queryport {{QUERY_PORT}} +server.identity "rust" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \"{{SERVER_HOSTNAME}}\" +server.level \"{{LEVEL}}\" +server.description \"{{DESCRIPTION}}\" +server.url \"{{SERVER_URL}}\" +server.headerimage \"{{SERVER_IMG}}\" +server.logoimage \"{{SERVER_LOGO}}\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \"{{RCON_PASS}}\" +server.saveinterval {{SAVEINTERVAL}} +app.port {{APP_PORT}}  $( [ -z ${MAP_URL} ] && printf %s "+server.worldsize \"{{WORLD_SIZE}}\" +server.seed \"{{WORLD_SEED}}\"" || printf %s "+server.levelurl {{MAP_URL}}" ) {{ADDITIONAL_ARGS}}'
@@ -73,7 +73,7 @@ scripts:
       ## set up 64 bit libraries
       mkdir -p /mnt/server/.steam/sdk64
       cp -v linux64/steamclient.so ../.steam/sdk64/steamclient.so
-    container: 'ghcr.io/parkervcp/installers:debian'
+    container: 'ghcr.io/pelican-eggs/installers:debian'
     entrypoint: bash
 variables:
   -
diff --git a/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.yaml b/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.yaml
index d781f45b8..4c104ee3e 100644
--- a/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.yaml
+++ b/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.yaml
@@ -16,7 +16,7 @@ tags:
 features:
   - steam_disk_space
 docker_images:
-  Source: 'ghcr.io/parkervcp/games:source'
+  Source: 'ghcr.io/pelican-eggs/games:source'
 file_denylist: {  }
 startup_commands:
   Default: './srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart'
@@ -81,7 +81,7 @@ scripts:
       ## set up 64 bit libraries
       mkdir -p /mnt/server/.steam/sdk64
       cp -v linux64/steamclient.so ../.steam/sdk64/steamclient.so
-    container: 'ghcr.io/parkervcp/installers:debian'
+    container: 'ghcr.io/pelican-eggs/installers:debian'
     entrypoint: bash
 variables:
   -
diff --git a/database/Seeders/eggs/source-engine/egg-garrys-mod.yaml b/database/Seeders/eggs/source-engine/egg-garrys-mod.yaml
index 160b95af2..af9797409 100644
--- a/database/Seeders/eggs/source-engine/egg-garrys-mod.yaml
+++ b/database/Seeders/eggs/source-engine/egg-garrys-mod.yaml
@@ -17,7 +17,7 @@ features:
   - gsl_token
   - steam_disk_space
 docker_images:
-  Source: 'ghcr.io/parkervcp/games:source'
+  Source: 'ghcr.io/pelican-eggs/games:source'
 file_denylist: {  }
 startup_commands:
   Default: './srcds_run -game garrysmod -console -port {{SERVER_PORT}} +ip 0.0.0.0 +host_workshop_collection {{WORKSHOP_ID}} +map {{SRCDS_MAP}} +gamemode {{GAMEMODE}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}} +maxplayers {{MAX_PLAYERS}}  -tickrate {{TICKRATE}}  $( [ "$LUA_REFRESH" == "1" ] || printf %s ''-disableluarefresh'' )'
@@ -131,7 +131,7 @@ scripts:
 
       // Add custom lines under here
       ' > server.cfg
-    container: 'ghcr.io/parkervcp/installers:debian'
+    container: 'ghcr.io/pelican-eggs/installers:debian'
     entrypoint: bash
 variables:
   -
diff --git a/database/Seeders/eggs/source-engine/egg-insurgency.yaml b/database/Seeders/eggs/source-engine/egg-insurgency.yaml
index 685075253..3221eef7f 100644
--- a/database/Seeders/eggs/source-engine/egg-insurgency.yaml
+++ b/database/Seeders/eggs/source-engine/egg-insurgency.yaml
@@ -17,7 +17,7 @@ tags:
 features:
   - steam_disk_space
 docker_images:
-  Source: 'ghcr.io/parkervcp/games:source'
+  Source: 'ghcr.io/pelican-eggs/games:source'
 file_denylist: {  }
 startup_commands:
   Default: './srcds_run -game insurgency -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart'
@@ -57,7 +57,7 @@ scripts:
       ## set up 64 bit libraries
       mkdir -p /mnt/server/.steam/sdk64
       cp -v linux64/steamclient.so ../.steam/sdk64/steamclient.so
-    container: 'ghcr.io/parkervcp/installers:debian'
+    container: 'ghcr.io/pelican-eggs/installers:debian'
     entrypoint: bash
 variables:
   -
diff --git a/database/Seeders/eggs/source-engine/egg-team-fortress2.yaml b/database/Seeders/eggs/source-engine/egg-team-fortress2.yaml
index 1a066a0dc..a93a6af63 100644
--- a/database/Seeders/eggs/source-engine/egg-team-fortress2.yaml
+++ b/database/Seeders/eggs/source-engine/egg-team-fortress2.yaml
@@ -17,7 +17,7 @@ features:
   - gsl_token
   - steam_disk_space
 docker_images:
-  Source: 'ghcr.io/parkervcp/games:source'
+  Source: 'ghcr.io/pelican-eggs/games:source'
 file_denylist: {  }
 startup_commands:
   Default: './srcds_run -game tf -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}'
@@ -82,7 +82,7 @@ scripts:
       ## set up 64 bit libraries
       mkdir -p /mnt/server/.steam/sdk64
       cp -v linux64/steamclient.so ../.steam/sdk64/steamclient.so
-    container: 'ghcr.io/parkervcp/installers:debian'
+    container: 'ghcr.io/pelican-eggs/installers:debian'
     entrypoint: bash
 variables:
   -
diff --git a/database/Seeders/eggs/voice-servers/egg-mumble-server.yaml b/database/Seeders/eggs/voice-servers/egg-mumble-server.yaml
index fd522ee14..666f82400 100644
--- a/database/Seeders/eggs/voice-servers/egg-mumble-server.yaml
+++ b/database/Seeders/eggs/voice-servers/egg-mumble-server.yaml
@@ -14,7 +14,7 @@ tags:
   - voice
 features: {  }
 docker_images:
-  Mumble: 'ghcr.io/parkervcp/yolks:voice_mumble'
+  Mumble: 'ghcr.io/pelican-eggs/yolks:voice_mumble'
 file_denylist: {  }
 startup_commands:
   Default: 'mumble-server -fg -ini murmur.ini'
@@ -53,7 +53,7 @@ scripts:
           apk del murmur
       fi
       echo "done"
-    container: 'ghcr.io/parkervcp/installers:alpine'
+    container: 'ghcr.io/pelican-eggs/installers:alpine'
     entrypoint: ash
 variables:
   -
diff --git a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.yaml b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.yaml
index 1117de1b4..1907f7bb5 100644
--- a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.yaml
+++ b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.yaml
@@ -14,7 +14,7 @@ tags:
   - voice
 features: {  }
 docker_images:
-  Debian: 'ghcr.io/parkervcp/yolks:debian'
+  Debian: 'ghcr.io/pelican-eggs/yolks:debian'
 file_denylist: {  }
 startup_commands:
   Default: './ts3server default_voice_port={{SERVER_PORT}} query_port={{QUERY_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} query_http_port={{QUERY_HTTP}} query_ssh_port={{QUERY_SSH}} query_protocols={{QUERY_PROTOCOLS_VAR}} license_accepted=1'
@@ -41,7 +41,7 @@ scripts:
       echo -e "getting files from http://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2" 
       curl -L http://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar -xvj --strip-components=1
       cp ./redist/libmariadb.so.2 ./
-    container: 'ghcr.io/parkervcp/installers:alpine'
+    container: 'ghcr.io/pelican-eggs/installers:alpine'
     entrypoint: ash
 variables:
   -
diff --git a/tests/Feature/SettingsControllerTest.php b/tests/Feature/SettingsControllerTest.php
index 769ffa18f..9a192063f 100644
--- a/tests/Feature/SettingsControllerTest.php
+++ b/tests/Feature/SettingsControllerTest.php
@@ -93,10 +93,10 @@ test('unauthorized user cannot change docker image in use by server', function (
 test('cannot change docker image to image not allowed by egg', function () {
 
     [$user, $server] = generateTestAccount([Permission::ACTION_STARTUP_DOCKER_IMAGE]);
-    $server->image = 'ghcr.io/parkervcp/yolks:java_17';
+    $server->image = 'ghcr.io/pelican-eggs/yolks:java_17';
     $server->save();
 
-    $newImage = 'ghcr.io/parkervcp/fake:image';
+    $newImage = 'ghcr.io/pelican-eggs/fake:image';
 
     $server = $server->refresh();
 
@@ -113,11 +113,11 @@ test('cannot change docker image to image not allowed by egg', function () {
 
 test('can change docker image in use by server', function () {
     [$user, $server] = generateTestAccount([Permission::ACTION_STARTUP_DOCKER_IMAGE]);
-    $oldImage = 'ghcr.io/parkervcp/yolks:java_17';
+    $oldImage = 'ghcr.io/pelican-eggs/yolks:java_17';
     $server->image = $oldImage;
     $server->save();
 
-    $newImage = 'ghcr.io/parkervcp/yolks:java_21';
+    $newImage = 'ghcr.io/pelican-eggs/yolks:java_21';
 
     $this->actingAs($user)
         ->putJson("/api/client/servers/$server->uuid/settings/docker-image", [
@@ -136,11 +136,11 @@ test('can change docker image in use by server', function () {
 
 test('unable to change the docker image set by administrator', function () {
     [$user, $server] = generateTestAccount([Permission::ACTION_STARTUP_DOCKER_IMAGE]);
-    $oldImage = 'ghcr.io/parkervcp/yolks:java_custom';
+    $oldImage = 'ghcr.io/pelican-eggs/yolks:java_custom';
     $server->image = $oldImage;
     $server->save();
 
-    $newImage = 'ghcr.io/parkervcp/yolks:java_8';
+    $newImage = 'ghcr.io/pelican-eggs/yolks:java_8';
 
     $this->actingAs($user)
         ->putJson("/api/client/servers/$server->uuid/settings/docker-image", [