diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container.d/Enabled.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Enabled.conf
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container.d/Enabled.conf
rename to buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Enabled.conf
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container
index 6b1b2fbd..f4f7a8da 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container
@@ -1,10 +1,10 @@
 [Unit]
 Description=OpenVoiceOS GUI Service
 After=local-fs.target
-After=network-online.target
-Wants=network-online.target
-Wants=pipewire.service
-After=pipewire.service
+After=network.target
+#Wants=network-online.target
+#Wants=pipewire.service
+#After=pipewire.service
 #Wants=ovos-messagebus.service
 #After=ovos-messagebus.service
 #Wants=ovos-phal.service