diff --git a/buildroot-external/package/ovos-containers/ovos-containers.mk b/buildroot-external/package/ovos-containers/ovos-containers.mk
index 0ab381d6..cc042af0 100644
--- a/buildroot-external/package/ovos-containers/ovos-containers.mk
+++ b/buildroot-external/package/ovos-containers/ovos-containers.mk
@@ -10,9 +10,7 @@ OVOS_CONTAINERS_LICENSE_FILES = $(BR2_EXTERNAL_OPENVOICEOS_PATH)/../LICENSE
 OVOS_CONTAINERS_SITE = $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers
 OVOS_CONTAINERS_SITE_METHOD = local
 
-OVOS_CONTAINERS_IMAGES = ovos-messagebus \
-			 ovos-phal \
-			 ovos-phal-admin \
+OVOS_CONTAINERS_IMAGES = ovos-phal \
 			 ovos-listener-dinkum \
 			 ovos-audio \
 			 ovos-core \
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container
index c50d3327..eb1b7f99 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container
@@ -5,8 +5,10 @@ After=network-online.target
 Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
-Wants=ovos-messagebus.service
-After=ovos-messagebus.service
+Wants=ovos-bus-server.service
+After=ovos-bus-server.service
+#Wants=ovos-messagebus.service
+#After=ovos-messagebus.service
 Wants=ovos-phal.service
 After=ovos-phal.service
 
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container
index 45aaf4b0..b719d529 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container
@@ -5,8 +5,10 @@ After=network-online.target
 Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
-Wants=ovos-messagebus.service
-After=ovos-messagebus.service
+Wants=ovos-bus-server.service
+After=ovos-bus-server.service
+#Wants=ovos-messagebus.service
+#After=ovos-messagebus.service
 Wants=ovos-phal.service
 After=ovos-phal.service
 
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Enabled.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Enabled.conf
deleted file mode 100644
index 979447d0..00000000
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Enabled.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Install]
-WantedBy=multi-user.target default.target
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container
index 2535995f..2f9493c8 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container
@@ -3,8 +3,10 @@ Description=OpenVoiceOS GUI Websocket Service
 After=local-fs.target
 After=network-online.target
 Wants=network-online.target
-Wants=ovos-messagebus.service
-After=ovos-messagebus.service
+Wants=ovos-bus-server.service
+After=ovos-bus-server.service
+#Wants=ovos-messagebus.service
+#After=ovos-messagebus.service
 
 [Container]
 ContainerName=ovos-gui-websocket
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container
index d2032aa6..d56cab61 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container
@@ -5,8 +5,10 @@ After=network-online.target
 Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
-Wants=ovos-messagebus.service
-After=ovos-messagebus.service
+Wants=ovos-bus-server.service
+After=ovos-bus-server.service
+#Wants=ovos-messagebus.service
+#After=ovos-messagebus.service
 Wants=ovos-phal.service
 After=ovos-phal.service
 
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container
index a38dde8f..b3a2d5aa 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container
@@ -5,8 +5,10 @@ After=network-online.target
 Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
-Wants=ovos-messagebus.service
-After=ovos-messagebus.service
+Wants=ovos-bus-server.service
+After=ovos-bus-server.service
+#Wants=ovos-messagebus.service
+#After=ovos-messagebus.service
 
 [Container]
 ContainerName=ovos-phal
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset
index e25bb439..0555d8fd 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset
@@ -8,9 +8,9 @@ enable ovos-splash-start.service
 enable ovos-splash-systemd.service
 enable mglru.service
 enable connectivity-check.service
+enable ovos-bus-server.service
 
 disable ovos-splash-quit.service
-disable ovos-bus-server.service
 disable pipewire.service
 disable pipewire-pulse.service
 disable wireplumber.service