diff --git a/docker-compose-mortons-site.yaml b/docker-compose-mortons-site.yaml
new file mode 100644
index 0000000..752175f
--- /dev/null
+++ b/docker-compose-mortons-site.yaml
@@ -0,0 +1,65 @@
+---
+services:
+  valkey:
+    image: valkey/valkey:8.0-alpine
+    volumes: [valkey_data:/data]
+    command: >
+      valkey-server
+      --save 60 1
+      --loglevel warning
+      --maxmemory 256mb
+      --maxmemory-policy allkeys-lru
+    healthcheck:
+      test: [CMD, valkey-cli, ping]
+      interval: 10s
+      timeout: 3s
+      retries: 3
+      start_period: 5s
+    networks: [default]
+  gds-mock-mcp:
+    image: gds-mock-mcp:latest
+    depends_on:
+      valkey:
+        condition: service_healthy
+    environment:
+      - NODE_ENV=production
+      - LOG_LEVEL=debug
+      - VALKEY_HOST=valkey
+      - VALKEY_PORT=6379
+      - MCP_SESSION_TIMEOUT=3600
+      - MOCK_DATA_SEED=random
+      - PORT=3000
+      - HOST=0.0.0.0  # Bind to all interfaces in Docker
+    deploy:
+      labels:
+        traefik.enable: 'true'
+        traefik.http.routers.gds-mock-mcp.entrypoints: https
+        traefik.http.routers.gds-mock-mcp.rule: Host(`gds.mortons.site`)
+        traefik.http.routers.gds-mock-mcp.tls.certResolver: le
+        traefik.http.routers.gds-mock-mcp.tls.domains[0].main: gds.mortons.site
+        traefik.http.services.gds-mock-mcp.loadbalancer.server.port: '3000'
+    networks: [default, foundation_public]
+    healthcheck:
+      test:
+        - CMD
+        - wget
+        - --no-verbose
+        - --tries=1
+        - --spider
+        - http://localhost:3000/health
+      interval: 30s
+      timeout: 3s
+      retries: 3
+      start_period: 10s
+volumes:
+  valkey_data:
+    name: valkey_data
+    driver: local
+    driver_opts:
+      device: :/volume1/docker-volumes/iva-project/gds/valkey_data
+      o: addr=10.0.0.21
+      type: nfs4
+networks:
+  foundation_public:
+    external: true
+  default:
diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl
index 592ff98..df2ed9b 100644
--- a/docker/docker-bake.hcl
+++ b/docker/docker-bake.hcl
@@ -1,21 +1,9 @@
+target "docker-metadata-action" {}
+
 target "default" {
+  inherits = ["docker-metadata-action"]
   context = ".."
   dockerfile = "docker/Dockerfile"
   platforms = ["linux/amd64", "linux/arm64"]
-  tags = [
-    "gds-mock-mcp:latest",
-    "gds-mock-mcp:0.1.0"
-  ]
 }
 
-target "amd64" {
-  inherits = ["default"]
-  platforms = ["linux/amd64"]
-  tags = ["gds-mock-mcp:0.1.0-amd64"]
-}
-
-target "arm64" {
-  inherits = ["default"]
-  platforms = ["linux/arm64"]
-  tags = ["gds-mock-mcp:0.1.0-arm64"]
-}