diff --git a/docker-compose.yml b/docker-compose.yml
index 78932a99b..6116be85e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -173,9 +173,9 @@ services:
   #   networks:
   #     - hypixel_network
 
-  pico-limbo:
-    image: ghcr.io/ariksquad/picolimbo:latest
-    container_name: picolimbo
+  pico_limbo:
+    image: ghcr.io/ariksquad/picolimbo:master
+    container_name: pico_limbo
     restart: unless-stopped
     environment:
       <<: *forwarding_env
diff --git a/setup/lib/docker.sh b/setup/lib/docker.sh
index 57713da8b..b6c8f3e0b 100644
--- a/setup/lib/docker.sh
+++ b/setup/lib/docker.sh
@@ -11,7 +11,7 @@ do_launch() {
 
     set_step "Cleaning up stale containers"
     log_info "Removing stale containers..."
-    for c in $(docker ps -a --format '{{.Names}}' 2>/dev/null | grep -E '^(hypixel_|hypixelcore_|service_|pico-limbo|game_server_builder)'); do
+    for c in $(docker ps -a --format '{{.Names}}' 2>/dev/null | grep -E '^(hypixel_|hypixelcore_|service_|pico_limbo|game_server_builder)'); do
         docker rm -f "$c" &>/dev/null || true
     done
     docker volume rm mongo-data &>/dev/null || true
@@ -50,7 +50,7 @@ do_launch() {
 
     set_step "Starting PicoLimbo"
     log_info "Starting PicoLimbo + image builder..."
-    run_step "Starting PicoLimbo + builder" docker compose up -d game_server_builder pico-limbo
+    run_step "Starting PicoLimbo + builder" docker compose up -d game_server_builder pico_limbo
     sleep 3
     log_ok "PicoLimbo started"
 
@@ -254,7 +254,7 @@ start_all() {
     docker compose up -d proxy 2>&1 || true
     wait_healthy "hypixel_proxy" 60 || log_warn "Proxy may not be healthy"
 
-    docker compose up -d game_server_builder pico-limbo 2>&1 || true
+    docker compose up -d game_server_builder pico_limbo 2>&1 || true
     sleep 2
 
     docker compose up -d 2>&1 || true
diff --git a/setup/lib/setup.sh b/setup/lib/setup.sh
index 8362d914a..6b590fa41 100644
--- a/setup/lib/setup.sh
+++ b/setup/lib/setup.sh
@@ -255,9 +255,9 @@ ${redis_ports}
     networks:
       - hypixel_network
 
-  pico-limbo:
-    image: ghcr.io/ariksquad/picolimbo:latest
-    container_name: picolimbo
+  pico_limbo:
+    image: ghcr.io/ariksquad/picolimbo:master
+    container_name: pico_limbo
     restart: unless-stopped
     environment:
       <<: *forwarding_env