diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml
index 1f09988..07089c2 100644
--- a/.gitea/workflows/pr-docker-deploy.yml
+++ b/.gitea/workflows/pr-docker-deploy.yml
@@ -162,6 +162,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        with:
+          submodules: true
 
       - name: Login to Docker Hub
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -206,6 +208,7 @@ jobs:
             -a ! -name "*macos*" \
             -a ! -name "*hivemind*" \
             -a ! -name "*server*" \
+            -a ! -name "*raspberrypi*" \
             | sed -e ':a;N;$!ba;s/[\r\n]/ /g')
 
           echo "compose_list=$compose_list" >> "$GITHUB_OUTPUT"
@@ -227,7 +230,7 @@ jobs:
           file: ${{ steps.compose_file_list.outputs.compose_list }}
           name: "ultima"
           host: 192.168.1.248
-          user: ovos
+          user: charish
           ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
           args: --remove-orphans --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }}
           env_file: ".env"
@@ -297,6 +300,7 @@ jobs:
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
         with:
           ref: main
+          submodules: true
 
       - name: Login to Docker Hub
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -348,7 +352,7 @@ jobs:
           file: ${{ needs.docker-compose-dry-run.outputs.compose_file_list }}
           name: "ultima"
           host: 192.168.1.248
-          user: ovos
+          user: charish
           ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
           args: --remove-orphans ${{ needs.generate-service-list.outputs.svc_deploy_list }}
           env_file: ".env"
diff --git a/docker-compose.yml b/docker-compose.yml
index 382e3a2..9cca8e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,6 +50,45 @@ services:
     restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+  hivemind_cli:
+    container_name: hivemind_cli
+    hostname: hivemind_cli
+    restart: unless-stopped
+    image: docker.io/smartgic/hivemind-cli:alpha
+    pull_policy: always
+    tty: true
+    environment:
+      TZ: ${TZ}
+    network_mode: host
+    volumes:
+      - ${ULTIMA_DOCKER_DIR}/hivemind/config:/home/${HIVEMIND_USER}/.config/hivemind:z
+      - ${ULTIMA_DOCKER_DIR}/hivemind/share:/home/${HIVEMIND_USER}/.local/share/hivemind:z
+    depends_on:
+      - hivemind_listener
+  hivemind_listener:
+    container_name: hivemind_listener
+    hostname: hivemind_listener
+    restart: unless-stopped
+    image: docker.io/smartgic/hivemind-listener:alpha
+    pull_policy: ${PULL_POLICY:-always}
+    tty: true
+    environment:
+      TZ: ${TZ}
+    ports:
+      - 5678:5678
+    network_mode: host
+    volumes:
+      - ${HIVEMIND_CONFIG_FOLDER}:/home/${HIVEMIND_USER}/.config/hivemind:z
+      - ${HIVEMIND_SHARE_FOLDER}:/home/${HIVEMIND_USER}/.local/share/hivemind:z
+    depends_on:
+      ovos_core:
+        condition: service_started
+    healthcheck:
+      test: ["CMD", "pgrep", "-f", "hivemind-listener"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
   meilisearch:
     container_name: meilisearch
     environment: