diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container
index 9872de34..7aa3cbe5 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS Audio Service
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
 Wants=ovos_messagebus.service
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container
index b438c180..00767d7e 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS CLI
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 
 [Container]
 ContainerName=ovos_cli
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container
index 268c79d5..a837ae77 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS Core Service
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
 Wants=ovos_messagebus.service
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container
index 08493f65..e4c5179b 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS GUI Service
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
 Wants=ovos_messagebus.service
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container
index 8ebebab1..95235156 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container
@@ -1,8 +1,10 @@
 [Unit]
 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
-After=local-fs.target
 
 [Container]
 ContainerName=ovos_gui_websocket
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container
index ec75143d..19760962 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS Dinkum Listener Service
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
 Wants=ovos_messagebus.service
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container
index be2431de..265133b2 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS Messagebus Service
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 
 [Container]
 ContainerName=ovos_messagebus
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container
index dea32246..1523e38b 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS PHAL Service
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 Wants=pipewire.service
 After=pipewire.service
 Wants=ovos_messagebus.service
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container
index 990e5ca1..a1b2e153 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container
@@ -1,6 +1,8 @@
 [Unit]
 Description=OpenVoiceOS PHAL Admin Service
 After=local-fs.target
+After=network-online.target
+Wants=network-online.target
 Wants=ovos_messagebus.service
 After=ovos_messagebus.service
 
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 dbfad5c3..1ea340ca 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
@@ -9,10 +9,10 @@ enable ovos-splash-systemd.service
 enable smb.service
 enable nmb.service
 enable mglru.service
+enable connectivity-check.service
 
 disable pipewire.service
 disable wireplumber.service
-disable ovos-splash-quit.service
 disable mosquitto.service
 disable motion.service
 disable mpd.service
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/connectivity-check.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/connectivity-check.service
new file mode 100644
index 00000000..9bd81bfb
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/connectivity-check.service
@@ -0,0 +1,12 @@
+[Unit]
+DefaultDependencies=no
+After=nss-lookup.target
+Before=network-online.target
+Type=oneshot
+RemainAfterExit=yes
+
+[Service]
+ExecStart=sh -c 'while ! ping -c 1 docker.io; do sleep 1; done'
+
+[Install]
+WantedBy=network-online.target