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: