diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container
rename to buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_cli.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_cli.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_cli.container
rename to buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_cli.container
diff --git a/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container
new file mode 100644
index 00000000..3414f5a3
--- /dev/null
+++ b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container
@@ -0,0 +1,36 @@
+[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
+After=ovos_messagebus.service
+Wants=ovos_phal.service
+After=ovos_phal.service
+
+[Container]
+ContainerName=ovos_core
+Image=docker.io/smartgic/ovos-core:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_core
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+EnvironmentFile=%h/.config/containers/env
+AddDevice=/dev/snd
+# AddDevice=/dev/gpiomem # RaspberryPi only
+Volume=%h/ovos/config:/home/ovos/.config/mycroft
+Volume=/dev/shm:/tmp
+Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
+Volume=ovos_nltk:/home/ovos/nltk_data
+Volume=%h/ovos/share:/home/ovos/.local/share/mycroft
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui.container
new file mode 100644
index 00000000..f860998c
--- /dev/null
+++ b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui.container
@@ -0,0 +1,42 @@
+[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
+After=ovos_messagebus.service
+Wants=ovos_phal.service
+After=ovos_phal.service
+Wants=ovos_gui_websocket.service
+After=ovos_gui_websocker.service
+
+[Container]
+ContainerName=ovos_gui
+Image=docker.io/smartgic/ovos-gui-shell:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_gui
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+EnvironmentFile=%h/.config/containers/env
+AddDevice=/dev/snd
+AddDevice=/dev/dri
+# AddDevice=/dev/vchiq # Raspberry Pi only
+AddDevice=/dev/input
+Volume=%h/ovos/config:/home/ovos/.config/mycroft
+Volume=/dev/shm:/tmp
+Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
+Volume=%t/bus:/run/user/1000/bus:ro
+Volume=%h/ovos/share:/home/ovos/.local/share/mycroft
+Volume=ovos_gui_files:/home/ovos/.cache/gui_files
+Volume=/run/udev/data:/run/udev/data:ro
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[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/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui_websocket.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui_websocket.container
rename to buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui_websocket.container
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container
rename to buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container
rename to buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container
diff --git a/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container
new file mode 100644
index 00000000..2adae013
--- /dev/null
+++ b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container
@@ -0,0 +1,32 @@
+[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
+After=ovos_messagebus.service
+
+[Container]
+ContainerName=ovos_phal
+Image=docker.io/smartgic/ovos-phal:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_phal
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+EnvironmentFile=%h/.config/containers/env
+AddDevice=/dev/snd
+# AddDevice=/dev/gpiomem # Raspberry Pi only
+Volume=%h/ovos/config:/home/ovos/.config/mycroft
+Volume=/dev/shm:/tmp
+Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container
new file mode 100644
index 00000000..08910686
--- /dev/null
+++ b/buildroot-external/board/ovos/ova/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container
@@ -0,0 +1,29 @@
+[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
+
+[Container]
+ContainerName=ovos_phal_admin
+Image=docker.io/smartgic/ovos-phal-admin:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_phal_admin
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+# AddDevice=/dev/gpiomem # Raspberry Pi only
+Volume=%h/ovos/config:/home/ovos/.config/mycroft
+Volume=/dev/shm:/tmp
+Volume=/sys:/sys:ro
+Volume=/dev:/dev:ro
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container
new file mode 100644
index 00000000..b68f7397
--- /dev/null
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container
@@ -0,0 +1,35 @@
+[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
+After=ovos_messagebus.service
+Wants=ovos_phal.service
+After=ovos_phal.service
+
+[Container]
+ContainerName=ovos_audio
+Image=docker.io/smartgic/ovos-audio:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_audio
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+EnvironmentFile=%h/.config/containers/env
+AddDevice=/dev/snd
+Volume=%h/ovos/config:/home/ovos/.config/mycroft
+Volume=/dev/shm:/tmp
+Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
+Volume=%t/bus:/run/user/1000/bus:ro
+Volume=ovos_tts_cache:/home/ovos/.cache/mycroft
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_cli.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_cli.container
new file mode 100644
index 00000000..00767d7e
--- /dev/null
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_cli.container
@@ -0,0 +1,25 @@
+[Unit]
+Description=OpenVoiceOS CLI
+After=local-fs.target
+After=network-online.target
+Wants=network-online.target
+
+[Container]
+ContainerName=ovos_cli
+Image=docker.io/smartgic/ovos-cli:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_cli
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+Volume=%h/ovos/config:/home/ovos/.config/mycroft
+Volume=/dev/shm:/tmp
+Volume=/var/log/ovos:/var/log/mycroft
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container
rename to buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui.container
rename to buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui.container
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui_websocket.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui_websocket.container
new file mode 100644
index 00000000..97c77bb7
--- /dev/null
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_gui_websocket.container
@@ -0,0 +1,27 @@
+[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
+
+[Container]
+ContainerName=ovos_gui_websocket
+Image=docker.io/smartgic/ovos-gui-websocket:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_gui_websocket
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
+Volume=/dev/shm:/tmp
+Volume=ovos_gui_files:/home/ovos/.cache/ovos_gui_file_server
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container
new file mode 100644
index 00000000..a7c5a7e7
--- /dev/null
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container
@@ -0,0 +1,36 @@
+[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
+After=ovos_messagebus.service
+Wants=ovos_phal.service
+After=ovos_phal.service
+
+[Container]
+ContainerName=ovos_listener
+Image=docker.io/smartgic/ovos-listener-dinkum:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_listener
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+EnvironmentFile=%h/.config/containers/env
+AddDevice=/dev/snd
+Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
+Volume=/dev/shm:/tmp
+Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
+Volume=ovos_listener_records:/home/ovos/.local/share/mycroft/listener
+Volume=ovos_models:/home/ovos/.local/share/precise-lite
+Volume=ovos_vosk:/home/ovos/.local/share/vosk
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container
new file mode 100644
index 00000000..265133b2
--- /dev/null
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container
@@ -0,0 +1,24 @@
+[Unit]
+Description=OpenVoiceOS Messagebus Service
+After=local-fs.target
+After=network-online.target
+Wants=network-online.target
+
+[Container]
+ContainerName=ovos_messagebus
+Image=docker.io/smartgic/ovos-messagebus:alpha
+AutoUpdate=registry
+LogDriver=journald
+HostName=ovos_messagebus
+Network=host
+Timezone=local
+UserNS=keep-id:uid=%U,gid=%G
+Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
+Volume=/dev/shm:/tmp
+
+[Service]
+TimeoutStartSec=900
+Restart=always
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container
rename to buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container
rename to buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/env b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/env
index 23809481..a9d29539 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/env
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/env
@@ -1,5 +1,7 @@
 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
 XDG_RUNTIME_DIR=/run/user/1000
+PULSE_SERVER=unix:/run/user/1000/pulse/native
+PULSE_COOKIE=/home/ovos/.config/pulse/cookie
 QT_QPA_PLATFORM=eglfs
 QT_QPA_EGLFS_HIDECURSOR=1
 QT_QPA_EGLFS_KMS_ATOMIC=1