diff --git a/docker-compose.yml b/docker-compose.yml
index 15c4b8b..dd274b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,12 @@ services:
     volumes:
       - ${ULTIMA_DOCKER_DIR}/beszel-agent:/var/lib/beszel-agent
       - /var/run/docker.sock:/var/run/docker.sock:ro
+  context7-mcp:
+    container_name: context7-mcp
+    expose:
+      - 8000
+    image: mcp/context7:latest
+    restart: unless-stopped
   docker-socket-proxy:
     container_name: dockerproxy
     environment:
@@ -66,6 +72,12 @@ services:
     restart: unless-stopped
     volumes:
       - ${ULTIMA_DOCKER_DIR}/faster-whisper/:/config
+  gitea-mcp:
+    container_name: gitea-mcp
+    expose:
+      - 8000
+    image: gitea/gitea-mcp-server:0.5.0
+    restart: unless-stopped
   meilisearch:
     container_name: meilisearch
     environment:
@@ -117,23 +129,23 @@ services:
     ports:
       - 9001:9001
   searxng-mcp:
-    container_name: mcp-searxng
+    container_name: searxng-mcp
     environment:
       SEARXNG_URL: http://192.168.1.254:8095
     image: isokoliuk/mcp-searxng:latest@sha256:3d4b4c537a847ff681b1b48ef2ed1d3b83f0bd10a6bfdbd913bb07ea7978f0ae
     restart: unless-stopped
     stdin_open: true
-  signoz-mcp-server:
+  signoz-mcp:
     container_name: signoz-mcp-server
-    image: git.trez.wtf/trez/signoz-mcp-server:latest@sha256:452b1ed75679c0a11438f73ff34e57302d5ed4a3a9684810a40ee8a98742fdd6
+    image: signoz/signoz-mcp-server:v0.0.4
     environment:
       SIGNOZ_URL: http://192.168.1.254:36113
       SIGNOZ_API_KEY: ${SIGNOZ_API_KEY}
       TRANSPORT_MODE: http
       MCP_SERVER_PORT: 8000
       LOG_LEVEL: info
-    ports:
-      - 8000:8000
+    expose:
+      - 8000
     restart: unless-stopped
   stable-diffusion-webui:
     container_name: stable-diffusion-webui
@@ -149,6 +161,14 @@ services:
     volumes:
       - ${ULTIMA_DOCKER_DIR}/stable-diffusion-webui/data:/data
       - ${ULTIMA_DOCKER_DIR}/stable-diffusion-webui/output:/output
+  webui-mcpo:
+    container_name: webui-mcpo
+    image: masterno12/webui-mcpo:latest
+    ports:
+      - 18003:8000
+    restart: unless-stopped
+    volumes:
+      - ${ULTIMA_DOCKER_DIR}/mcpo:/opt/mcpo
   wyoming-openwakeword:
     command: "--preload-model ok_nabu"
     container_name: wyoming-openwakeword