diff --git a/docker-compose.yml b/docker-compose.yml
index a6d6713..4bc0004 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,78 +17,6 @@ services:
       - beszel-agent-data:/var/lib/beszel-agent
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /dev/mmcblk0:/extra-filesystems/dev/mmcblk0:ro
-  docker-socket-proxy:
-    container_name: dockerproxy
-    environment:
-      AUTH: 1
-      BUILD: 1
-      COMMIT: 1
-      CONFIGS: 1
-      CONTAINERS: 1
-      DISTRIBUTION: 1
-      EVENTS: 1
-      EXEC: 1
-      GPRC: 1
-      IMAGES: 1
-      INFO: 1
-      NETWORKS: 1
-      NODES: 1
-      POST: 1
-      PLUGINS: 1
-      SERVICES: 1
-      SESSION: 1
-      SYSTEM: 1
-      TASKS: 1
-      VOLUMES: 1
-      LOG_LEVEL: debug
-    image: ghcr.io/tecnativa/docker-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e
-    ports:
-      - 2375:2375
-    privileged: true
-    restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-  hivemind_satellite:
-    container_name: hivemind_satellite
-    hostname: hivemind_satellite
-    restart: unless-stopped
-    image: smartgic/hivemind-satellite:alpha@sha256:3057968a493fab9dcca9e1274757bd7fe61d9b143ae2900939e1ec5bbc96664a
-    pull_policy: always
-    network_mode: host
-    devices:
-      - /dev/snd
-    environment:
-      TZ: ${TZ}
-      VOICE_SAT_HOST: 192.168.1.248
-      VOICE_SAT_PORT: ${VOICE_SAT_PORT:-5678}
-      VOICE_SAT_KEY: ${HV_VOICE_SAT_KEY}
-      VOICE_SAT_PASSWORD: ${HV_VOICE_SAT_PASSWORD}
-      XDG_RUNTIME_DIR: ${XDG_RUNTIME_DIR}
-      PULSE_SERVER: unix:${XDG_RUNTIME_DIR}/pulse/native
-    volumes:
-      - ~/.config/pulse/cookie:/home/${HIVEMIND_USER}/.config/pulse/cookie:ro
-      - ${BENEDIKTA_DOCKER_DIR}/hivemind:/home/${HIVEMIND_USER}/.config/hivemind
-      - ${BENEDIKTA_DOCKER_DIR}/mycroft:/home/${HIVEMIND_USER}/.config/mycroft
-      - hv_ovos_tts_cache:/home/${HIVEMIND_USER}/.cache/mycroft
-      - hv_ovos_listener_records:/home/${HIVEMIND_USER}/.local/share/mycroft/listener
-      - hv_ovos_models:/home/${HIVEMIND_USER}/.local/share/precise-lite
-      - ${XDG_RUNTIME_DIR}/pipewire-0:${XDG_RUNTIME_DIR}/pipewire-0:ro
-      - ${XDG_RUNTIME_DIR}/pulse:${XDG_RUNTIME_DIR}/pulse:ro
-  hivemind_cli:
-    container_name: hivemind_cli
-    hostname: hivemind_cli
-    restart: unless-stopped
-    image: docker.io/smartgic/hivemind-cli:alpha@sha256:896cb56b9c5b1a4eaeba0cb7c53ae173a4b0f777163cbd2573e2b183cbf41ceb
-    pull_policy: always
-    tty: true
-    network_mode: host
-    environment:
-      TZ: ${TZ}
-    volumes:
-      - ${BENEDIKTA_DOCKER_DIR}/hivemind/config:/home/${HIVEMIND_USER}/.config/hivemind:z
-      - ${BENEDIKTA_DOCKER_DIR}/hivemind/share:/home/${HIVEMIND_USER}/.local/share/hivemind:z
-    depends_on:
-      - hivemind_satellite
   portainer-agent:
     container_name: portainer_agent
     image: portainer/agent:latest@sha256:d2e5f753e8c668f7a7916621e64d6535f212b0f6ade5389a6fcc1f6830405ccf
@@ -109,6 +37,45 @@ services:
     restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+
+  wyoming-microphone:
+    command: ["--device", "sysdefault", "--debug"]
+    container_name: wyoming-microphone
+    devices:
+      - /dev/snd:/dev/snd
+    group_add:
+      - audio
+    image: rhasspy/wyoming-mic-external
+    ports:
+      - 10600:10600
+    restart: unless-stopped
+  wyoming-playback:
+    command: ["--device", "sysdefault", "--debug"]
+    container_name: wyoming-playback
+    devices:
+      - /dev/snd:/dev/snd
+    group_add:
+      - audio
+    image: rhasspy/wyoming-snd-external
+    ports:
+      - 10601:10601
+    restart: unless-stopped
+  wyoming-satellite:
+    command:
+      [
+        "--name",
+        "benedikta",
+        "--mic-uri",
+        "tcp://wyoming-microphone:10600",
+        "--snd-uri",
+        "tcp://wyoming-playback:10601",
+        "--debug",
+      ]
+    container_name: wyoming-satellite
+    image: rhasspy/wyoming-satellite
+    ports:
+      - 10700:10700
+    restart: unless-stopped
 volumes:
   beszel-agent-data:
     name: beszel-agent-data