diff --git a/commit-boost-pbs.yml b/commit-boost-pbs.yml
index 73c7cd93..5b7546a6 100644
--- a/commit-boost-pbs.yml
+++ b/commit-boost-pbs.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 services:
   cb-pbs:
     restart: "unless-stopped"
-    image: ${CB_PBS_DOCKER_REPO:-ghcr.io/commit-boost/pbs}:${CB_PBS_DOCKER_TAG:-latest}
+    image: ${CB_DOCKER_REPO:-ghcr.io/commit-boost/commit-boost}:${CB_DOCKER_TAG:-latest}
     environment:
       CB_CONFIG: /cb-config.toml
     volumes:
@@ -19,6 +19,9 @@ services:
         aliases:
           # This allows multiple Eth Docker stacks all connected to the same bridge network
           - ${MEV_ALIAS:-default-mev}
+    entrypoint:
+      - commit-boost
+      - pbs
     labels:
       - metrics.scrape=true
       - metrics.path=/metrics
diff --git a/default.env b/default.env
index 2984f2f6..65abfd73 100644
--- a/default.env
+++ b/default.env
@@ -362,8 +362,8 @@ CONTRIBUTOOR_DOCKER_TAG=latest
 CONTRIBUTOOR_DOCKER_REPO=ethpandaops/contributoor
 
 # Commit-Boost
-CB_PBS_DOCKER_TAG=latest
-CB_PBS_DOCKER_REPO=ghcr.io/commit-boost/pbs
+CB_DOCKER_TAG=latest
+CB_DOCKER_REPO=ghcr.io/commit-boost/commit-boost
 # MEV-Boost
 # SRC build target can be a tag, a branch, or a pr as "pr-ID"
 MEV_SRC_BUILD_TARGET=stable
@@ -582,4 +582,4 @@ DOCKER_SOCK=/var/run/docker.sock
 ALLOY_PROJECT_NAME=
 
 # Used by ethd update - please do not adjust
-ENV_VERSION=66
+ENV_VERSION=67
diff --git a/ethd b/ethd
index c245c186..6fb2ecd0 100755
--- a/ethd
+++ b/ethd
@@ -2064,8 +2064,8 @@ __update_value_in_env() {
 
 
 __migrate_env() {
-  local old_vars=( DDNS_PROXY DDNS_SUBDOMAIN ERA_URL RPC_URL )
-  local new_vars=( CF_PROXY DDNS_HOST ERE_URL RPC_URLS )
+  local old_vars=( DDNS_PROXY DDNS_SUBDOMAIN ERA_URL RPC_URL CB_PBS_DOCKER_TAG CB_PBS_DOCKER_REPO )
+  local new_vars=( CF_PROXY DDNS_HOST ERE_URL RPC_URLS CB_DOCKER_TAG CB_DOCKER_REPO )
   local error
   local line
   local index
@@ -2122,7 +2122,12 @@ __migrate_env() {
     echo "Refreshing build targets in ${__env_file}"
   fi
   if [[ "${__target_ver}" -gt "${__source_ver}" ]]; then
-    echo "Migrating ${__env_file} to version ${__target_ver}"
+    # Remove with version 68
+    if [[ "${__target_ver}" -eq "67" ]]; then
+      echo "Migrating ${__env_file} to version ⁶🤷⁷"
+    else
+      echo "Migrating ${__env_file} to version ${__target_ver}"
+    fi
     echo "Note this is not an ${__project_name} version, it is an internal config file version"
   fi
 
@@ -2241,6 +2246,10 @@ __migrate_env() {
   for index in "${!old_vars[@]}"; do
     var=${old_vars[index]}
     __get_value_from_env "${var}" "${__env_file}.source" "__value"
+    # Remove after Glamsterdam
+    if [[ "${__source_ver}" -lt "67" && "${var}" = "CB_PBS_DOCKER_REPO" && ${__value} = "ghcr.io/commit-boost/pbs" ]]; then
+      __value="ghcr.io/commit-boost/commit-boost"
+    fi
     if [[ "${__found}" -eq 1 ]]; then
       __update_value_in_env "${new_vars[index]}" "${__value}" "${__env_file}"
     fi