refactor: split ai/ into hermes/ and ollama/ directories

- Rename ai/ to hermes/ (Hermes agent service) - Move ai/ollama/ to ollama/ (top-level, Ollama ROCm/gfx906 service) - Add ollama/compose.yml for standalone ollama deployment - Update hermes/compose.yml: remove ollama service (now in ollama/) - Update Makefile SERVICES list: ai -> hermes, add ollama - Bump ollama version from v0.13.5 to v0.23.2
2026-05-09 21:44:46 -04:00
20 changed files with 351 additions and 941 deletions
--- a/.gitea/workflows/build-hermes.yml
+++ b/.gitea/workflows/build-hermes.yml
@@ -1,31 +0,0 @@
-name: Build Hermes agent
-on:
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'ai/hermes/**'
-      - 'ai/compose.yml'
-  push:
-    branches: [ master ]
-    paths:
-      - 'ai/hermes/**'
-      - 'ai/compose.yml'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        run: |
-          git clone -b "${{ github.head_ref || github.ref_name }}" \
-            https://gitea:${{ secrets.GITHUB_TOKEN }}@code.lazyworkhorse.net/gortium/compose.git .
-          git log --oneline -3
-
-      - name: Build hermes image
-        run: |
-          cd ai
-          docker compose build hermes 2>&1
-
-      - name: Verify image
-        run: |
-          docker run --rm ai-hermes /opt/hermes/.venv/bin/python --version 2>&1
--- a/.gitea/workflows/build-ollama.yml
+++ b/.gitea/workflows/build-ollama.yml
@@ -1,31 +0,0 @@
-name: Build ollama (gfx906)
-on:
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'ai/ollama/**'
-      - 'ai/compose.yml'
-  push:
-    branches: [ master ]
-    paths:
-      - 'ai/ollama/**'
-      - 'ai/compose.yml'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        run: |
-          git clone -b "${{ github.head_ref || github.ref_name }}" \
-            https://gitea:${{ secrets.GITHUB_TOKEN }}@code.lazyworkhorse.net/gortium/compose.git .
-          git log --oneline -3
-
-      - name: Build ollama image
-        run: |
-          cd ai
-          docker compose build ollama --no-cache 2>&1
-
-      - name: Verify version
-        run: |
-          docker run --rm ollama/ollama:rocm-gfx906 ollama --version 2>&1
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +0,0 @@
-# Temp/scratch files — never commit these
-*.bak
-*.swp
-*.tmp
-*~
-scratch/
-.env
-.env.local
-tmp/
-temp/
-replace_compose.py
-entrypoint-*.sh
-copy_*.txt
--- a/2
+++ b/2
@@ -2,7 +2,7 @@
 COMPOSE_PATH=~/Projects/AltNet/docker-compose

 # List of services (folder names)
-SERVICES=monitoring ai cloudstorage crm_tp crm_cf mediacenter homeautomation network backup homepage passwordmanager
+SERVICES=monitoring hermes ollama cloudstorage crm_tp crm_cf mediacenter homeautomation network backup homepage passwordmanager

 # Bring up all services
 all_up:
--- a/ai/compose.yml
+++ b/ai/compose.yml
@@ -1,370 +0,0 @@
-version: "3.8"
-services:
-
-  # webui:
-  #   image: ghcr.io/open-webui/open-webui:main
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
-  #   restart: always
-  #   environment:
-  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
-  #   networks:
-  #     - ai_net
-  #     - ai_backend
-  #   labels:
-  #     - "traefik.enable=true"
-
-  #     # Router for HTTP + redirection to HTTPS
-  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-http.entrypoints=web"
-  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
-
-  #     # Router for HTTPS with TLS
-  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
-  #     - "traefik.http.routers.webui-https.tls=true"
-  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
-
-  hermes:
-    build:
-      context: ./hermes
-      ssh:
-        - default
-    container_name: hermes
-    entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
-      "hermes-entrypoint"]
-    restart: always
-    # Gateway run enables the internal API server on port 8642
-    command: gateway run
-    environment:
-      - OLLAMA_HOST=http://ollama:11434
-      - HERMES_DASHBOARD=1
-      # Multi-profile: comma-separated list of profiles to run as gateways.
-      # The entrypoint reads this and starts one gateway per profile.
-      # Add profiles here when they exist on disk (e.g. default,researcher,writer)
-      - HERMES_PROFILES=ashley,claire,finn,matt,paul
-      - API_SERVER_ENABLED=true
-      - API_SERVER_PORT=8642
-      - API_SERVER_HOST=0.0.0.0
-      - API_SERVER_KEY=hermes_local_key
-      - GATEWAY_ALLOW_ALL_USERS=true
-      - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
-      # ROCm for GPU-accelerated faster-whisper STT
-      - HSA_OVERRIDE_GFX_VERSION=9.0.6
-      - HCC_AMDGPU_TARGET=gfx906
-      - HIP_VISIBLE_DEVICES=0,1
-      - ROCR_VISIBLE_DEVICES=0,1
-      - HSA_ENABLE_SDMA=0
-      - TZ=America/Montreal
-    volumes:
-      - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
-      # Syncthing-shared org files — read-only view of user's agenda
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
-      # Syncthing-shared inbox — write tasks here, they sync to user's laptop
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
-    devices:
-      - /dev/kfd:/dev/kfd
-      - /dev/dri:/dev/dri
-    group_add:
-      - "303"
-      - "26"
-    networks:
-      - ai_backend
-      - ai_net
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=ai_net"
-
-      # Router for HTTP + redirection to HTTPS
-      - "traefik.http.routers.hermes-web-http.rule=Host(`hermes.lazyworkhorse.net`)"
-      - "traefik.http.routers.hermes-web-http.entrypoints=web"
-      - "traefik.http.routers.hermes-web-http.middlewares=redirect-to-https"
-
-      # Router for HTTPS with TLS — protected by Authelia
-      - "traefik.http.routers.hermes-web-https.rule=Host(`hermes.lazyworkhorse.net`)"
-      - "traefik.http.routers.hermes-web-https.entrypoints=websecure"
-      - "traefik.http.routers.hermes-web-https.tls=true"
-      - "traefik.http.routers.hermes-web-https.tls.certresolver=njalla"
-      - "traefik.http.routers.hermes-web-https.middlewares=hermes-auth"
-
-      # Authelia forwardAuth
-      - "traefik.http.middlewares.hermes-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
-      - "traefik.http.middlewares.hermes-auth.forwardauth.trustforwardheader=true"
-      - "traefik.http.middlewares.hermes-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
-
-      # Service Loadbalancer (dashboard port 9119)
-      - "traefik.http.services.hermes-web.loadbalancer.server.port=9119"
-
-  syncthing:
-    image: syncthing/syncthing:latest
-    container_name: syncthing
-    hostname: syncthing
-    restart: always
-    ports:
-      - "8384:8384"
-      - "22000:22000"
-      - "21027:21027/udp"
-    environment:
-      - TZ=America/Montreal
-    volumes:
-      - /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
-    networks:
-      - ai_backend
-      - ai_net
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
-      - "traefik.http.routers.syncthing-http.entrypoints=web"
-      - "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
-      - "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
-      - "traefik.http.routers.syncthing-https.entrypoints=websecure"
-      - "traefik.http.routers.syncthing-https.tls=true"
-      - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
-      - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
-
-  ollama:
-    build:
-      context: ./ollama
-      dockerfile: Dockerfile
-    image: ollama/ollama:rocm-gfx906
-    container_name: ollama
-    tty: true
-    restart: always 
-    ports:
-      - "127.0.0.1:11434:11434"
-    networks:
-      - ai_backend
-    volumes:
-      - /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
-    environment:
-      - OLLAMA_VULKAN=0
-      - HSA_OVERRIDE_GFX_VERSION=9.0.6
-      - HCC_AMDGPU_TARGET=gfx906
-      - HIP_VISIBLE_DEVICES=0,1
-      - ROCR_VISIBLE_DEVICES=0,1
-      - HSA_ENABLE_SDMA=0 
-      - OLLAMA_HOST=0.0.0.0
-      - OLLAMA_DEBUG=1
-      - OLLAMA_FLASH_ATTENTION=1
-      - OLLAMA_NUM_PARALLEL=2
-    devices:
-      # Map the render nodes and KFD for ROCm to work inside the container
-      - /dev/kfd:/dev/kfd
-      - /dev/dri:/dev/dri
-    group_add:
-      - "303"
-      - "26"
-
-networks:
-  ai_net:
-    external: true
-    name: ai_net
-  ai_backend:
-    driver: bridge
-    name: ai_backend
-    
-  # llama_cpp_devstral:
-  #   image: ghcr.io/ggml-org/llama.cpp:server-rocm
-  #   container_name: llama_cpp_devstral
-  #   restart: unless-stopped
-  #   networks:
-  #     - ai_backend
-  #   ports:
-  #     - "8300:8080"
-  #   ipc: host
-  #   devices:
-  #     - "/dev/kfd:/dev/kfd"
-  #     - "/dev/dri:/dev/dri"
-  #   group_add:
-  #     - "303" # video
-  #     - "26"  # render
-  #   environment:
-  #     HSA_OVERRIDE_GFX_VERSION: 9.0.6
-  #     HIP_VISIBLE_DEVICES: 0,1
-  #     LLAMA_CACHE: /models
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
-  #     - /mnt/HoardingCow_docker_data/Llama_cpp/devstral-agent.jinja:/template.jinja
-  #   command: >
-  #     -hf unsloth/Devstral-Small-2-24B-Instruct-2512-GGUF:Devstral-Small-2-24B-Instruct-2512-Q8_0.gguf
-  #     -a devstral-2-small-llama_cpp
-  #     --chat-template-file /template.jinja
-  #     --host 0.0.0.0
-  #     --port 8080
-  #     --n-gpu-layers 99
-  #     --ctx-size 163840
-  #     --batch-size 4096
-  #     --ubatch-size 4096
-  #     --cache-type-k f16
-  #     --cache-type-v f16
-  #     --cache-reuse 256
-  #     --flash-attn on
-  #     --context-shift
-  #     --split-mode layer
-  #     --no-mmap
-  #     --n-predict -1
-  #     --parallel 2
-
-  # vllm:
-  #   image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
-  #   container_name: vllm
-  #   # Required for multi-GPU communication (NCCL)
-  #   ipc: host 
-  #   init: true
-  #   shm_size: '2g' 
-  #   networks:
-  #     - ai_backend
-  #   ports:
-  #     - "8300:8000"
-  #   devices:
-  #     - "/dev/kfd:/dev/kfd"
-  #     - "/dev/dri:/dev/dri"
-  #   group_add:
-  #     - "303"
-  #     - "26"
-  #   environment:
-  #     HSA_OVERRIDE_GFX_VERSION: 9.0.6
-  #     HSA_ENABLE_SDMA: 0
-  #     HIP_VISIBLE_DEVICES: 0,1
-  #     NCCL_P2P_DISABLE: 1
-  #     VLLM_WORKER_MULTIPROC_METHOD: spawn
-  #     VLLM_USE_TRITON_FLASH_ATTN: 0
-  #     VLLM_USE_ROCM_CUSTOM_PAGED_ATTN: 0
-  #     VLLM_ATTENTION_BACKEND: ROPE_NAIVE
-  #     VLLM_SKIP_WARMUP: 1
-  #     VLLM_USE_V1: 0
-  #     HF_TOKEN: ${HF_TOKEN}
-  #   command: >
-  #     vllm serve "mistralai/Devstral-Small-2-24B-Instruct-2512" 
-  #     --tensor-parallel-size 2
-  #     --max-model-len 8192
-  #     --gpu-memory-utilization 0.90
-  #     --tokenizer_mode mistral
-  #     --config_format auto
-  #     --load-format auto
-  #     --enforce-eager
-  #     --disable-custom-all-reduce
-  #     --trust-remote-code
-  #     --task generate
-  #     --block-size 16
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/vllm/models:/root/.cache/huggingface
-  #   restart: unless-stopped
-
-  # n8n:
-  #   image: n8nio/n8n:latest
-  #   container_name: n8n
-  #   restart: unless-stopped
-  #   networks:
-  #     - ai_net
-  #   environment:
-  #     - N8N_HOST=n8n.lazyworkhorse.net
-  #     - N8N_PORT=5678
-  #     - N8N_PROTOCOL=https
-  #     - NODE_ENV=production
-  #     - N8N_ENCRYPTION_KEY=${N8N_ENCRYPTION_KEY}
-  #     - WEBHOOK_URL=https://n8n.lazyworkhorse.net/
-  #     - GENERIC_TIMEZONE=America/New_York # Adjust to your timezone
-  #     - N8N_BLOCK_EXTERNAL_STORAGE_ACCESS=false
-  #     - N8N_NODES_PYTHON_CAN_IMPORT_MODULES=true 
-  #     - N8N_NATIVE_PYTHON_RUNNER=true
-  #     - N8N_PYTHON_ALLOW_STDLIB=uuid,re,os,json
-  #     - N8N_PYTHON_ALLOW_EXTERNAL=requests,pandas
-  #     - NODE_FUNCTION_ALLOW_EXTERNAL=uuid,requests
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/n8n:/home/node/.n8n
-  #   labels:
-  #     - "traefik.enable=true"
-
-  #     # Router for HTTP + redirection to HTTPS
-  #     - "traefik.http.routers.n8n-http.rule=Host(`n8n.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.n8n-http.entrypoints=web"
-  #     - "traefik.http.routers.n8n-http.middlewares=redirect-to-https"
-
-  #     # Router for HTTPS with TLS
-  #     - "traefik.http.routers.n8n-https.rule=Host(`n8n.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.n8n-https.entrypoints=websecure"
-  #     - "traefik.http.routers.n8n-https.tls=true"
-  #     - "traefik.http.routers.n8n-https.tls.certresolver=njalla"
-
-  #     # Service Loadbalancer (n8n default port)
-  #     - "traefik.http.services.n8n.loadbalancer.server.port=5678"
-
-  # openclaw:
-  #   image: coollabsio/openclaw:latest
-  #   container_name: openclaw
-  #   restart: unless-stopped
-  #   expose:
-  #     - "8080"  # WebUI
-  #     - "18789" # Gateway/WebSocket
-  #     - "8788"  # Nextcloud Webhook
-  #   networks:
-  #     - ai_net
-  #     - ai_backend
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/openclaw/data:/data
-  #     - /home/gortium/infra:/data/workspace/infra
-  #   environment:
-  #     - TZ=America/Toronto
-  #     - OPENCLAW_GATEWAY_TOKEN=${OPENCLAW_GATEWAY_TOKEN}
-  #     - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
-  #     # Point to the sidecar browser
-  #     - BROWSER_CDP_URL=http://openclaw-browser:9222
-  #     - BROWSER_EVALUATE_ENABLED=true
-  #     - OPENCLAW_GATEWAY_HOST=0.0.0.0
-  #     - OPENCLAW_ALLOWED_ORIGINS=https://claw.lazyworkhorse.net
-  #   labels:
-  #     - "traefik.enable=true"
-
-  #     - "traefik.http.routers.openclaw-http.rule=Host(`claw.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.openclaw-http.entrypoints=web"
-  #     - "traefik.http.routers.openclaw-http.middlewares=redirect-to-https"
-
-  #     - "traefik.http.routers.openclaw-https.rule=Host(`claw.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.openclaw-https.priority=50"
-  #     - "traefik.http.routers.openclaw-https.entrypoints=websecure"
-  #     - "traefik.http.routers.openclaw-https.tls=true"
-  #     - "traefik.http.routers.openclaw-https.tls.certresolver=njalla"
-  #     - "traefik.http.services.openclaw.loadbalancer.server.port=8080"
-  #   depends_on:
-  #     - openclaw-browser
-
-  # openclaw-browser:
-  #   image: ghcr.io/browserless/chromium:latest
-  #   restart: always
-  #   expose:
-  #     - "3000"
-  #   environment:
-  #     - MAX_CONCURRENT_SESSIONS=10
-  #     - CONNECTION_TIMEOUT=300000
-  #     - PREBOOT_CHROME=true
-  #     - DEMO_MODE=false
-  #   networks:
-  #     ai_backend:
-  #       aliases:
-  #         - browser
-
-  # openclaw-ssh:
-  #   image: linuxserver/openssh-server:latest
-  #   container_name: openclaw-ssh
-  #   environment:
-  #     - PUID=1000
-  #     - PGID=1000
-  #     - PUBLIC_KEY_FILE=/config/ssh/authorized_keys
-  #     - SUDO_ACCESS=false
-  #     - PASSWORD_ACCESS=false
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/openclaw/ssh-config:/config
-  #     - /home/gortium/infra:/data/workspace/infra:ro
-  #   restart: unless-stopped
-  #   networks:
-  #     - ai_backend
-  #   labels:
-  #     - "traefik.enable=true"
-  #     - "traefik.tcp.routers.openclaw-ssh.rule=HostSNI(*)"
-  #     - "traefik.tcp.routers.openclaw-ssh.entrypoints=sshnode"
-  #     - "traefik.tcp.routers.openclaw-ssh.tls.passthrough=false"
-  #     - "traefik.tcp.services.openclaw-ssh.loadbalancer.server.port=2222"
--- a/ai/hermes/Dockerfile
+++ b/ai/hermes/Dockerfile
@@ -1,95 +0,0 @@
-# syntax=docker/dockerfile:1
-# Hermes Agent -- custom fork build
-# Builds on top of official image + overlays our forked source from Gitea.
-# Requires Docker BuildKit. Pass SSH agent for git clone:
-#   docker compose build hermes
-# Or manually:
-#   DOCKER_BUILDKIT=1 docker build --ssh default -t hermes-agent:custom .
-
-# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
-FROM nousresearch/hermes-agent:latest
-
-# ---------- Overlay our forked source ----------
-# Uses SSH agent forwarding from the build host (no key baked into image).
-# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
-# Only the Python source, web UI source, and config change.
-RUN --mount=type=ssh \
-    mkdir -p /root/.ssh && \
-    ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
-    cd /tmp && \
-    GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
-    git clone --depth 1 --branch main \
-    git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
-    rm -rf fork/node_modules fork/.venv fork/.git && \
-    cp -a fork/. /opt/hermes/ && \
-    rm -rf /tmp/fork /root/.ssh/
-
-# ---------- Reinstall Python package (editable) ----------
-# Picks up source changes from our fork.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir --no-deps -e /opt/hermes
-
-# ---------- Extra system deps ----------
-USER root
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        libportaudio2 ca-certificates poppler-utils imagemagick \
-        libolm-dev \
-        texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
-        texlive-xetex texlive-science \
-        qemu-user-static binfmt-support emacs-nox && \
-    rm -rf /var/lib/apt/lists/*
-
-# ---------- UV ----------
-COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
-
-# ---------- Matrix bridge + extra pip deps ----------
-# Previously installed inline at container startup and persisted via volume mount.
-# Now baked into the image so the fragile venv volume mount can be removed.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir 'mautrix[encryption]' openai
-
-# ---------- Piper TTS ----------
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir piper-tts sounddevice numpy && \
-    mkdir -p /opt/hermes/.venv/share/piper/voices
-
-RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
-import urllib.request
-base = '/opt/hermes/.venv/share/piper/voices'
-url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
-urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
-urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
-PYEOF
-
-# ---------- Install Himalaya email CLI ----------
-RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
-import urllib.request, tarfile, os, shutil
-url = 'https://github.com/pimalaya/himalaya/releases/download/v1.2.0/himalaya.x86_64-linux.tgz'
-tgz = '/tmp/himalaya.tgz'
-urllib.request.urlretrieve(url, tgz)
-with tarfile.open(tgz) as t:
-    t.extractall('/tmp')
-shutil.move('/tmp/himalaya', '/usr/local/bin/himalaya')
-os.chmod('/usr/local/bin/himalaya', 0o755)
-os.remove(tgz)
-print('himalaya v1.2.0 installed')
-PYEOF
-
-# ---------- Install multi-gateway launcher ----------
-# Launches one gateway process per profile (HERMES_PROFILES env var)
-COPY --chmod=0755 run-multi-gateways.sh /usr/local/bin/run-multi-gateways.sh
-
-# ---------- Runtime ----------
-USER hermes
-ENV HERMES_HOME=/opt/data
-ENV PATH="/opt/data/.local/bin:${PATH}"
-# Point browser tool to Playwright's Chromium (already in base image)
-ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
-
-# Ensure tools directory and toolsets.py are writable by the hermes runtime user
-# so custom tools can be injected from the persistent volume at startup.
-USER root
-RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
-
-VOLUME [ "/opt/data" ]
--- a/ai/hermes/run-multi-gateways.sh
+++ b/ai/hermes/run-multi-gateways.sh
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Multi-gateway launcher for HERMES_PROFILES env var.
-# Reads comma-separated profile names, spawns one gateway per profile.
-# Designed to run before the main entrypoint — gateways run in background.
-set -e
-
-if [ -z "${HERMES_PROFILES}" ]; then
-  echo "HERMES_PROFILES not set — skipping multi-gateway launch"
-  exit 0
-fi
-
-# Source venv to make 'hermes' available (entrypoint.sh sources it later,
-# but we need it NOW for the background gateways)
-HERMES_BIN="/opt/hermes/.venv/bin/hermes"
-if [ ! -x "$HERMES_BIN" ]; then
-  echo "ERROR: hermes binary not found at $HERMES_BIN"
-  exit 1
-fi
-
-mkdir -p /opt/data/logs
-
-IFS=',' read -ra PROFILES <<< "${HERMES_PROFILES}"
-for profile in "${PROFILES[@]}"; do
-  profile="$(echo "${profile}" | xargs)"  # trim whitespace
-  [ -z "${profile}" ] && continue
-
-  echo "Starting gateway for profile: ${profile}"
-  nohup env API_SERVER_ENABLED=false API_SERVER_KEY= gosu hermes "$HERMES_BIN" --profile "${profile}" gateway run \
-      >> "/opt/data/logs/gateway-${profile}.log" 2>&1 &
-done
-
-echo "All gateways launched: ${HERMES_PROFILES}"
--- a/ai/ollama/Dockerfile
+++ b/ai/ollama/Dockerfile
@@ -1,106 +0,0 @@
-# ollama-gfx906/Dockerfile
-#
-# Custom ollama image with ROCm 6.1 + gfx906 (MI50) support.
-# The official ollama/rocm image ships ROCm 7.2 which dropped gfx906.
-# This uses v0.23.2's native CMake build system with AMDGPU_TARGETS including gfx906.
-#
-# Build: docker build -t ollama/ollama:rocm-gfx906 ai/ollama
-
-FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
-
-# Build dependencies (CMake, Ninja, Go)
-ARG CMAKEVERSION=3.31.2
-ARG NINJAVERSION=1.12.1
-ARG GOLANG_VERSION=1.22.0
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    curl git ccache build-essential pkg-config unzip \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install CMake from official binaries
-RUN curl -fsSL https://github.com/Kitware/CMake/releases/download/v${CMAKEVERSION}/cmake-${CMAKEVERSION}-linux-x86_64.tar.gz \
-    | tar xz -C /usr/local --strip-components 1
-
-# Install Ninja
-RUN curl -fsSL -o /tmp/ninja.zip \
-    https://github.com/ninja-build/ninja/releases/download/v${NINJAVERSION}/ninja-linux.zip \
-    && unzip /tmp/ninja.zip -d /usr/local/bin && rm /tmp/ninja.zip
-
-# Install Go
-RUN curl -fsSL https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz \
-    | tar xz -C /usr/local
-ENV PATH=/usr/local/go/bin:$PATH
-
-ARG OLLAMA_VERSION=v0.23.2
-RUN git clone --depth 1 --branch ${OLLAMA_VERSION} https://github.com/ollama/ollama.git /build
-WORKDIR /build
-
-# ROCm paths
-ENV HIP_PATH=/opt/rocm
-ENV ROCM_PATH=/opt/rocm
-ENV CMAKE_GENERATOR=Ninja
-ENV LDFLAGS=-s
-
-# Step 1: Build CPU backends with GCC (no ROCm preset)
-# Pre-set CMAKE_HIP_COMPILER="" to prevent check_language(HIP) from
-# finding a HIP compiler (it searches /opt/rocm even without PATH).
-# Remove /opt/rocm from PATH to prevent find_program from finding hipcc.
-RUN mkdir -p build-cpu && \
-    PATH=/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-    cmake -B build-cpu -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_HIP_COMPILER="" \
-      -DCMAKE_INSTALL_PREFIX=/build/dist && \
-    cmake --build build-cpu --target ggml-cpu -- -l $(nproc) && \
-    cmake --install build-cpu --component CPU --strip && \
-    echo "=== CPU install ===" && \
-    (find /build/dist/lib/ollama -type f -o -type l 2>&1 | head -20 || echo "empty")
-
-# Step 2: Build HIP backend with ROCm preset + gfx906 target only
-# The ROCm 6 preset enables HIP language detection (enable_language(HIP))
-# which ensures GPU kernels are properly compiled for gfx906.
-# OLLAMA_RUNNER_DIR=rocm from the preset, so HIP goes to lib/ollama/rocm/
-# Need CMAKE_PREFIX_PATH so find_package(hip) finds hip-config.cmake
-# at /opt/rocm/lib/cmake/hip/hip-config.cmake.
-RUN mkdir -p build-hip && \
-    cmake -B build-hip \
-      --preset 'ROCm 6' \
-      -DAMDGPU_TARGETS="gfx906:xnack-" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_PREFIX_PATH="/opt/rocm" && \
-    cmake --build build-hip --target ggml-hip -- -l $(nproc) && \
-    cmake --install build-hip --component HIP --strip && \
-    echo "=== HIP install ===" && \
-    find /build/dist/lib/ollama -type f -o -type l | head -20
-
-# Step 3: Build Go binary (GCC for CGo linking)
-ENV CGO_ENABLED=1
-RUN go build -trimpath -ldflags="-X=github.com/ollama/ollama/version.Version=${OLLAMA_VERSION}" -o /build/dist/ollama .
-
-# ---------- Runtime image ----------
-FROM ubuntu:24.04
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    ca-certificates curl libstdc++6 libgomp1 libvulkan1 libopenblas0 \
-    && rm -rf /var/lib/apt/lists/*
-
-# Copy ROCm 6.1 runtime libraries
-# These are needed at runtime by ggml-hip via LD_LIBRARY_PATH
-COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
-COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
-
-# Copy ollama binary + all backends (CPU + HIP)
-# CPU install:  /build/dist/lib/ollama/libggml-*.so
-# HIP install:  /build/dist/lib/ollama/rocm/libggml-hip.so
-COPY --from=builder /build/dist/ollama /usr/bin/ollama
-COPY --from=builder /build/dist/lib/ollama/ /usr/lib/ollama/
-
-RUN ldconfig
-
-ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/lib/ollama/rocm:/usr/lib/ollama
-ENV HSA_OVERRIDE_GFX_VERSION=9.0.6
-ENV HCC_AMDGPU_TARGET=gfx906
-ENV HSA_ENABLE_SDMA=0
-
-EXPOSE 11434
-ENTRYPOINT ["/bin/ollama"]
-CMD ["serve"]
--- a/hermes/Dockerfile
+++ b/hermes/Dockerfile
@@ -0,0 +1,73 @@
+# 1. On récupère la version la plus récente d'UV
+FROM ghcr.io/astral-sh/uv:latest AS uv_source
+
+# 2. Image officielle Hermes Agent de NousResearch
+# Contient déjà: Python, Node.js, npm, Playwright/Chromium, venv, tts_tool.py, etc.
+FROM nousresearch/hermes-agent:latest
+
+# ---------- System dependencies ----------
+# The official hermes-agent image already has: git, curl, ffmpeg, python3,
+# gcc, build-essential, openssh-client, procps, tini, ripgrep, docker-cli,
+# libportaudio2, ca-certificates, etc.
+#
+# These extras we need to add back:
+#   - poppler-utils, imagemagick  (PDF/image processing)
+#   - texlive-*                   (LaTeX typesetting for reports)
+#   - qemu-user-static, binfmt-support (QEMU cross-compilation)
+#   - emacs-nox                   (text editing in container)
+USER root
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        libportaudio2 \
+        ca-certificates \
+        poppler-utils \
+        imagemagick \
+        texlive-latex-base \
+        texlive-latex-extra \
+        texlive-fonts-recommended \
+        texlive-xetex \
+        texlive-science \
+        qemu-user-static \
+        binfmt-support \
+        emacs-nox && \
+    rm -rf /var/lib/apt/lists/*
+
+# ---------- UV (hyperfast pip alternative) ----------
+COPY --chmod=0755 --from=uv_source /uv /usr/local/bin/
+
+WORKDIR /opt/hermes
+
+# ---------- Piper TTS dans le venv existant ----------
+# Le venv de l'image de base est root-owned, on doit installer en root aussi
+RUN . /opt/hermes/.venv/bin/activate && \
+    uv pip install --no-cache-dir piper-tts sounddevice numpy
+
+# ---------- Télécharger la voix Piper Ryan (high quality) ----------
+RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
+    /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
+import urllib.request
+base = '/opt/hermes/.venv/share/piper/voices'
+url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
+urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
+urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
+PYEOF
+
+# ---------- Patch tts_tool.py: remplacer Edge TTS par Piper ----------
+# Edge TTS appelle les serveurs Microsoft — on ne veut jamais ça.
+# Piper roule localement sur CPU, aucun cloud, aucune donnée qui sort.
+COPY patch_tts_tool.py /tmp/patch_tts_tool.py
+RUN /opt/hermes/.venv/bin/python3 /tmp/patch_tts_tool.py && rm /tmp/patch_tts_tool.py
+
+# ---------- Runtime ----------
+# Retour à l'utilisateur non-root pour la sécurité
+USER hermes
+
+ENV HERMES_HOME=/opt/data
+ENV PATH="/opt/data/.local/bin:${PATH}"
+
+VOLUME [ "/opt/data" ]
+
+# Script de réparation des permissions + patch TTS au démarrage
+COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
+
+ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]
--- a/hermes/compose.yml
+++ b/hermes/compose.yml
@@ -0,0 +1,38 @@
+version: "3.8"
+services:
+
+  hermes:
+    build: ./
+    container_name: hermes
+    restart: always
+    # Gateway run enables the internal API server on port 8642
+    command: gateway run
+    environment:
+      - OLLAMA_HOST=http://ollama:11434
+      - API_SERVER_ENABLED=true
+      - API_SERVER_PORT=8642
+      - API_SERVER_HOST=0.0.0.0
+      - API_SERVER_KEY=hermes_local_key
+      - GATEWAY_ALLOW_ALL_USERS=true
+      - OPENROUTER_API_KEY=${OPEN...KEY}
+      # ROCm for GPU-accelerated faster-whisper STT
+      - HSA_OVERRIDE_GFX_VERSION=9.0.6
+      - HCC_AMDGPU_TARGET=gfx906
+      - HIP_VISIBLE_DEVICES=0,1
+      - ROCR_VISIBLE_DEVICES=0,1
+      - HSA_ENABLE_SDMA=0
+    volumes:
+      - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
+    devices:
+      - /dev/kfd:/dev/kfd
+      - /dev/dri:/dev/dri
+    group_add:
+      - "303"
+      - "26"
+    networks:
+      - ai_backend
+
+networks:
+  ai_backend:
+    external: true
+    name: ai_backend
--- a/hermes/fix-permissions.sh
+++ b/hermes/fix-permissions.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Startup permission fix + TTS patch.
+# Runs as root before the entrypoint drops to the hermes user.
+set -e
+
+HERMES_HOME="${HERMES_HOME:-/opt/data}"
+
+# Fix ownership on critical writable directories
+chown -R hermes:hermes \
+  "$HERMES_HOME/sessions" \
+  "$HERMES_HOME/checkpoints" \
+  "$HERMES_HOME/skills" \
+  "$HERMES_HOME/memories" \
+  "$HERMES_HOME/workspace" \
+  "$HERMES_HOME/pastes" \
+  "$HERMES_HOME/logs" \
+  "$HERMES_HOME/cron" \
+  "$HERMES_HOME/plans" \
+  "$HERMES_HOME/hooks" \
+  "$HERMES_HOME/cache" \
+  2>/dev/null || true
+
+# Fix data volume root ownership
+if [ "$(stat -c %u "$HERMES_HOME" 2>/dev/null)" != "$(id -u hermes)" ]; then
+  chown hermes:hermes "$HERMES_HOME" 2>/dev/null || true
+fi
+
+# ---------- Patch tts_tool.py: replace Edge TTS with Piper ----------
+# Fallback runtime patch in case the volume's site-packages differ from the image.
+# Idempotent: if already patched, the script does nothing.
+PATCH_SCRIPT="/opt/hermes/patch_tts_tool.py"
+if [ -f "$PATCH_SCRIPT" ]; then
+  echo "Applying TTS patch (Piper only, no Edge fallback)..."
+  /opt/hermes/.venv/bin/python3 "$PATCH_SCRIPT" 2>&1 || true
+fi
+
+# Chain to the official Hermes entrypoint
+exec /opt/hermes/docker/entrypoint.sh "$@"
--- a/ai/hermes/patch_tts_tool.py
+++ b/ai/hermes/patch_tts_tool.py
--- a/int/.env.example
+++ b/int/.env.example
@@ -1,53 +0,0 @@
-# =============================================================================
-# WorldMonitor — Environment Variables
-# =============================================================================
-# Copy this file to .env (gitignored) and fill in your keys.
-# All keys are optional — the dashboard works without them,
-# but the corresponding features will be disabled.
-#
-# Usage:
-#   cp .env.example .env.local   (docker-compose auto-loads .env from CWD)
-#
-# For production secrets, add these to the shared containers.env
-# agenix secret at: secrets/containers.env.age
-# =============================================================================
-
-# ── REQUIRED: These containers refuse to start without them ──
-# Generate with: openssl rand -hex 32
-REDIS_PASSWORD=
-REDIS_TOKEN=
-RELAY_SHARED_SECRET=
-
-# ── LLM / AI (for intelligence assessments) ──
-# Pick one or both
-GROQ_API_KEY=               # https://console.groq.com (free: 14,400 req/day)
-OPENROUTER_API_KEY=         # https://openrouter.ai (free: 50 req/day)
-
-# ── Markets & Economics (optional) ──
-FINNHUB_API_KEY=            # https://finnhub.io (free tier)
-FRED_API_KEY=               # https://fred.stlouisfed.org (free)
-EIA_API_KEY=                # https://www.eia.gov/opendata/ (free)
-
-# ── Aviation (optional) ──
-AVIATIONSTACK_API=          # https://aviationstack.com (free tier)
-WINGBITS_API_KEY=           # https://wingbits.com (contact them)
-
-# ── Maritime (optional) ──
-AISSTREAM_API_KEY=          # https://aisstream.io (free tier)
-
-# ── Conflict & Unrest (optional) ──
-ACLED_ACCESS_TOKEN=         # https://acleddata.com (free for researchers)
-
-# ── Earth Observation (optional) ──
-NASA_FIRMS_API_KEY=         # https://firms.modaps.eosdis.nasa.gov (free)
-
-# ── Infrastructure / Internet (optional) ──
-CLOUDFLARE_API_TOKEN=       # https://developers.cloudflare.com/fundamentals/api/
-
-# ── Port (optional, defaults to 3000) ──
-WM_PORT=3000
-
-# ── Convex (for cloud sync / auth — optional for self-host) ──
-CONVEX_URL=
-CLERK_SECRET_KEY=
-VITE_CLERK_PUBLISHABLE_KEY=
--- a/int/compose.yml
+++ b/int/compose.yml
@@ -1,177 +0,0 @@
-# =============================================================================
-# Integrations stack
-# =============================================================================
-# Currently running: WorldMonitor
-# Planned: TAK server (commented out — needs fixing)
-# =============================================================================
-
-# ── TAK Server (FreeTAKServer) ──
-# Disabled: needs debugging. Was having connectivity/auth issues.
-# See: https://github.com/FreeTAKTeam/FreeTAKServer
-#
-# services:
-#   freetakserver:
-#     image: ghcr.io/freetakteam/freetakserver:master
-#     container_name: freetakserver
-#     hostname: freetakserver
-#     restart: always
-#     networks:
-#       - int_backend
-#     volumes:
-#       - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
-#     ports:
-#       - 8087:8087
-#       - 8089:8089
-#       - 8443:8443
-#       - 9000:9000
-#       - 19023:19023
-#     environment:
-#       FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
-#       FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
-#       FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
-#       FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
-#       FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
-#       FTS_COT_PORT: 8087
-#       FTS_SSLCOT_PORT: 8089
-#       FTS_API_PORT: 19023
-#       FTS_FED_PORT: 9000
-#       FTS_DP_ADDRESS: 'freetakserver'
-#       FTS_USER_ADDRESS: 'freetakserver'
-#       FTS_API_ADDRESS: 'freetakserver'
-#       FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
-#       FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
-#       FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
-#       FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
-#       FTS_ROUTING_PROXY_SERVER_PORT: 19031
-#       FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
-#       FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
-#       FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
-#       FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
-#       FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
-#       FTS_OPTIMIZE_API: "True"
-#       FTS_DATA_RECEPTION_BUFFER: 1024
-#       FTS_MAX_RECEPTION_TIME: 4
-#       FTS_NUM_ROUTING_WORKERS: 3
-#       FTS_COT_TO_DB: "True"
-#       FTS_MAINLOOP_DELAY: 100
-#       FTS_EMERGENCY_RADIUS: 0
-#       FTS_LOG_LEVEL: "info"
-#
-#   freetakserver-ui:
-#     image: ghcr.io/freetakteam/ui:latest
-#     container_name: freetakserver-ui
-#     hostname: freetakserver-ui
-#     restart: always
-#     networks:
-#       - int_net
-#     ports:
-#       - 5000:5000
-#     volumes:
-#       - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
-#     environment:
-#       FTS_IP: "freetakserver" 
-#       FTS_API_PORT: 19023
-#       FTS_API_PROTO: 'http'
-#       FTS_UI_EXPOSED_IP: 'freetakserver-ui'
-#       FTS_MAP_EXPOSED_IP: '127.0.0.1'
-#       FTS_MAP_PORT: 8000
-#       FTS_MAP_PROTO: 'http'
-#       FTS_UI_PORT: 5000
-#       FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
-#       FTS_API_KEY: 'Bearer token'
-#       FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
-#     labels:
-#       - "traefik.enable=true"
-#       - "traefik.docker.network=traefik-net"
-#       - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
-#       - "traefik.http.routers.fts-ui-http.entrypoints=web"
-#       - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
-#       - "traefik.http.routers.fts-ui-https.rule=Host(`tak.lazyworkhorse.net`)"
-#       - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
-#       - "traefik.http.routers.fts-ui-https.tls=true"
-#       - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
-#       - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
-#       - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
-
-# ── WorldMonitor ──
-# Real-time global intelligence dashboard
-# Repo: https://github.com/koala73/worldmonitor
-# Self-hosted, map-first OSINT with MCP support (39 tools)
-services:
-
-  worldmonitor:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: Dockerfile
-    image: worldmonitor:latest
-    container_name: worldmonitor
-    ports:
-      - "${WM_PORT:-3000}:8080"
-    environment:
-      UPSTASH_REDIS_REST_URL: "http://redis-rest:80"
-      UPSTASH_REDIS_REST_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
-      LOCAL_API_PORT: "46123"
-      LOCAL_API_MODE: "docker"
-      LOCAL_API_CLOUD_FALLBACK: "false"
-      WS_RELAY_URL: "http://ais-relay:3004"
-      # LLM providers (optional — features degrade gracefully)
-      LLM_API_URL: "${LLM_API_URL:-}"
-      LLM_API_KEY: "${LLM_API_KEY:-}"
-      LLM_MODEL: "${LLM_MODEL:-}"
-      GROQ_API_KEY: "${GROQ_API_KEY:-}"
-      # Data source API keys (optional — features degrade gracefully)
-      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
-      FINNHUB_API_KEY: "${FINNHUB_API_KEY:-}"
-      EIA_API_KEY: "${EIA_API_KEY:-}"
-      FRED_API_KEY: "${FRED_API_KEY:-}"
-      ACLED_ACCESS_TOKEN: "${ACLED_ACCESS_TOKEN:-}"
-      NASA_FIRMS_API_KEY: "${NASA_FIRMS_API_KEY:-}"
-      CLOUDFLARE_API_TOKEN: "${CLOUDFLARE_API_TOKEN:-}"
-      AVIATIONSTACK_API: "${AVIATIONSTACK_API:-}"
-    depends_on:
-      redis-rest:
-        condition: service_started
-      ais-relay:
-        condition: service_started
-    restart: unless-stopped
-
-  ais-relay:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: Dockerfile.relay
-    image: worldmonitor-ais-relay:latest
-    container_name: worldmonitor-ais-relay
-    environment:
-      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
-      PORT: "3004"
-    restart: unless-stopped
-
-  redis:
-    image: docker.io/redis:7-alpine
-    container_name: worldmonitor-redis
-    command: >
-      redis-server
-      --requirepass "${REDIS_PASSWORD:?REDIS_PASSWORD required}"
-      --maxmemory 256mb
-      --maxmemory-policy allkeys-lru
-    volumes:
-      - wm-redis-data:/data
-    restart: unless-stopped
-
-  redis-rest:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: docker/Dockerfile.redis-rest
-    image: worldmonitor-redis-rest:latest
-    container_name: worldmonitor-redis-rest
-    ports:
-      - "127.0.0.1:8079:80"
-    environment:
-      SRH_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
-      SRH_CONNECTION_STRING: "redis://:${REDIS_PASSWORD:?REDIS_PASSWORD required}@redis:6379"
-    depends_on:
-      - redis
-    restart: unless-stopped
-
-volumes:
-  wm-redis-data:
--- a/ollama/Dockerfile
+++ b/ollama/Dockerfile
@@ -0,0 +1,61 @@
+# ollama/Dockerfile
+#
+# Custom ollama image with ROCm + gfx906 (MI50) support.
+# The default ollama/rocm image ships ROCm 7.2 which drops gfx906 support.
+# This builds ollama and its llama.cpp runner from source, targeting gfx906.
+#
+# Build:
+#   docker build -t ollama/ollama:rocm-gfx906 ./ollama
+
+FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    git golang-go cmake build-essential pkg-config \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG OLLAMA_VERSION=v0.23.2
+RUN git clone --depth 1 --branch ${OLLAMA_VERSION} https://github.com/ollama/ollama.git /build
+WORKDIR /build
+
+ENV HIP_PATH=/opt/rocm
+ENV ROCM_PATH=/opt/rocm
+ENV PATH=/opt/rocm/bin:/opt/rocm/hip/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+RUN cd llama.cpp && \
+    mkdir -p build && cd build && \
+    cmake .. \
+      -DLLAMA_HIPBLAS=ON \
+      -DCMAKE_C_COMPILER=clang \
+      -DCMAKE_CXX_COMPILER=clang++ \
+      -DAMDGPU_TARGETS=gfx906 \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DLLAMA_NATIVE=OFF \
+      -DLLAMA_BUILD_TESTS=OFF \
+      -DLLAMA_BUILD_EXAMPLES=OFF \
+      -DLLAMA_BUILD_SERVER=OFF && \
+    cmake --build . --config Release -j$(nproc) && \
+    cmake --install . --prefix /build/dist
+
+ENV CGO_ENABLED=0
+RUN go build -trimpath -o dist/ollama .
+
+FROM ubuntu:22.04
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    ca-certificates curl libstdc++6 libgomp1 \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
+COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
+COPY --from=builder /build/dist/ollama /usr/bin/ollama
+COPY --from=builder /build/dist/lib/ /usr/lib/ollama/
+
+RUN ldconfig
+
+ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/lib/ollama
+ENV HSA_OVERRIDE_GFX_VERSION=9.0.6
+ENV HCC_AMDGPU_TARGET=gfx906
+ENV HSA_ENABLE_SDMA=0
+
+EXPOSE 11434
+ENTRYPOINT ["/bin/ollama"]
+CMD ["serve"]
--- a/ollama/compose.yml
+++ b/ollama/compose.yml
@@ -0,0 +1,41 @@
+version: "3.8"
+
+services:
+  ollama:
+    build:
+      context: ./
+      dockerfile: Dockerfile
+    image: ollama/ollama:rocm-gfx906
+    container_name: ollama
+    privileged: true
+    tty: true
+    restart: always
+    ports:
+      - "127.0.0.1:11434:11434"
+    networks:
+      - ai_backend
+    volumes:
+      - /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
+    environment:
+      - OLLAMA_VULKAN=0
+      - OLLAMA_HOST=0.0.0.0
+      - OLLAMA_DEBUG=1
+      - OLLAMA_FLASH_ATTENTION=0
+      - OLLAMA_NUM_PARALLEL=2
+      # ROCm / gfx906 configuration
+      - HSA_OVERRIDE_GFX_VERSION=9.0.6
+      - HCC_AMDGPU_TARGET=gfx906
+      - HIP_VISIBLE_DEVICES=0,1
+      - ROCR_VISIBLE_DEVICES=0,1
+      - HSA_ENABLE_SDMA=0
+    devices:
+      - /dev/kfd:/dev/kfd
+      - /dev/dri:/dev/dri
+    group_add:
+      - "303"
+      - "26"
+
+networks:
+  ai_backend:
+    external: true
+    name: ai_backend
--- a/tak/compose.yml
+++ b/tak/compose.yml
@@ -0,0 +1,98 @@
+services:
+  freetakserver:
+    image: ghcr.io/freetakteam/freetakserver:master
+    container_name: freetakserver
+    hostname: freetakserver
+    restart: always
+    networks:
+      - tak_backend
+    volumes:
+      - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
+    ports:
+      - 8087:8087
+      - 8089:8089
+      - 8443:8443
+      - 9000:9000
+      - 19023:19023
+    environment:
+      FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
+      FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
+      FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
+      FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
+      FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
+      FTS_COT_PORT: 8087
+      FTS_SSLCOT_PORT: 8089
+      FTS_API_PORT: 19023
+      FTS_FED_PORT: 9000
+      FTS_DP_ADDRESS: 'freetakserver'
+      FTS_USER_ADDRESS: 'freetakserver'
+      FTS_API_ADDRESS: 'freetakserver'
+      FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
+      FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
+      FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
+      FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
+      FTS_ROUTING_PROXY_SERVER_PORT: 19031
+      FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
+      FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
+      FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
+      FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
+      FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
+      FTS_OPTIMIZE_API: "True"
+      FTS_DATA_RECEPTION_BUFFER: 1024
+      FTS_MAX_RECEPTION_TIME: 4
+      FTS_NUM_ROUTING_WORKERS: 3
+      FTS_COT_TO_DB: "True"
+      FTS_MAINLOOP_DELAY: 100
+      FTS_EMERGENCY_RADIUS: 0
+      FTS_LOG_LEVEL: "info"
+
+  freetakserver-ui:
+    image: ghcr.io/freetakteam/ui:latest
+    container_name: freetakserver-ui
+    hostname: freetakserver-ui
+    restart: always
+    networks:
+      - tak_net
+    ports:
+      - 5000:5000
+    volumes:
+      - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
+    environment:
+      FTS_IP: "freetakserver" 
+      FTS_API_PORT: 19023
+      FTS_API_PROTO: 'http'
+      FTS_UI_EXPOSED_IP: 'freetakserver-ui'
+      FTS_MAP_EXPOSED_IP: '127.0.0.1'
+      FTS_MAP_PORT: 8000
+      FTS_MAP_PROTO: 'http'
+      FTS_UI_PORT: 5000
+      FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
+      FTS_API_KEY: 'Bearer token'
+      FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=traefik-net"
+
+      # HTTP -> HTTPS Redirect
+      - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
+      - "traefik.http.routers.fts-ui-http.entrypoints=web"
+      - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
+
+      # HTTPS Router
+      - "traefik.http.routers.fts-ui-https.rule=Host(`tak.lazyworkhorse.net`)"
+      - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
+      - "traefik.http.routers.fts-ui-https.tls=true"
+      - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
+      
+      # Service & Port
+      - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
+
+      # Reuse your existing redirect middleware
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+
+networks:
+  tak_net:
+    external: true
+  tak_backend:
+    driver: bridge
+    name: tak_backend
--- a/versioncontrol/compose.yml
+++ b/versioncontrol/compose.yml
@@ -7,11 +7,8 @@ services:
      - USER_UID=1000
      - USER_GID=1000
      - GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
-      - GITEA__actions__ENABLED=true
      - SSH_PORT=2222
      - SSH_LISTEN_PORT=2222
-      # Enable Gitea Actions (act_runner required on host)
-      - GITEA__actions__ENABLED=true
    volumes:
      - /mnt/HoardingCow_docker_data/Gitea:/data
    networks:
@@ -43,22 +40,6 @@ services:
      # Internal Routing
      - "traefik.http.services.gitea.loadbalancer.server.port=3000"

-  act_runner:
-    image: gitea/act_runner:latest
-    container_name: act_runner
-    environment:
-      - GITEA_INSTANCE_URL=https://code.lazyworkhorse.net
-      - GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
-      - GITEA_RUNNER_NAME=ai-host-runner
-      - GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - vc_net
-    restart: always
-    depends_on:
-      - gitea
-
 networks:
  vc_net:
    external: true
--- a/vpn/Dockerfile
+++ b/vpn/Dockerfile
@@ -1,9 +0,0 @@
-# Custom wg-easy with iptables-nft (nftables-backed iptables)
-# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
-FROM ghcr.io/wg-easy/wg-easy:latest
-
-# The upstream image registers only iptables-legacy with update-alternatives.
-# iptables-nft binary exists but isn't registered as an alternative key.
-# Override the alternatives-managed symlinks directly.
-RUN ln -sf /usr/sbin/iptables-nft /usr/sbin/iptables && \
-    ln -sf /usr/sbin/ip6tables-nft /usr/sbin/ip6tables
--- a/vpn/compose.yml
+++ b/vpn/compose.yml
@@ -2,10 +2,7 @@ version: "3.8"

 services:
  wireguard:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: wg-easy-iptables-nft:latest
+    image: weejewel/wg-easy:latest
    container_name: wireguard
    cap_add:
      - NET_ADMIN