diff --git a/.github/workflows/raspbian-ovos.yaml b/.github/workflows/raspbian-ovos.yaml
index e82a9fc..125a2cd 100644
--- a/.github/workflows/raspbian-ovos.yaml
+++ b/.github/workflows/raspbian-ovos.yaml
@@ -20,7 +20,7 @@ jobs:
           # images in stage2 (lite), stage4 and stage5. You probably want to hook in custom
           # stages before one of the exported stages. Otherwise, the action will make sure
           # any custom stage will include an image export directive.
-          stage-list: stage0 stage1 stage2 ./stage-prep ./stage-core ./stage-phal ./stage-audio ./stage-skills ./stage-shareport-spotify ./stage-finalize
+          stage-list: stage0 stage1 stage2 ./stage-prep ./stage-core ./stage-phal ./stage-audio ./stage-skills ./stage-shareport-spotify ./stage-hivemind ./stage-finalize
 
           # Host name of the image.
           hostname: raspOvos
@@ -132,4 +132,4 @@ jobs:
           source: "${{ steps.build.outputs.image-path }}"
           target: "raspbian/development"
           strip_components: 4
-          
+
diff --git a/stage-hivemind/01-hive-core/01-run.sh b/stage-hivemind/01-hive-core/01-run.sh
new file mode 100644
index 0000000..b1a53d8
--- /dev/null
+++ b/stage-hivemind/01-hive-core/01-run.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+install -v -d -m 0755 "${ROOTFS_DIR}/home/ovos/.local/share/hivemind"
+install -v -m 0644 files/hivemind-listener.service "${ROOTFS_DIR}/etc/systemd/user/hivemind-listener.service"
+
+echo "disable hivemind-listener.service" >> "${ROOTFS_DIR}/etc/systemd/user-preset/10-ovos-user.preset"
diff --git a/stage-hivemind/01-hive-core/files/hivemind-listener.service b/stage-hivemind/01-hive-core/files/hivemind-listener.service
new file mode 100644
index 0000000..87c833b
--- /dev/null
+++ b/stage-hivemind/01-hive-core/files/hivemind-listener.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Hivemind Listener
+After=pulseaudio.service
+
+[Service]
+Type=simple
+ExecStart=hivemind-core listen
+TimeoutStartSec=10m
+TimeoutStopSec=1m
+Restart=on-failure
+StartLimitInterval=5min
+StartLimitBurst=4