diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 3a764c7..acae404 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -163,7 +163,7 @@ jobs:
           echo "@mintel:registry=https://${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}" > .npmrc
           echo "//${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}/:_authToken=${{ secrets.REGISTRY_PASS }}" >> .npmrc
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: pnpm install --no-frozen-lockfile
       - name: 🧪 QA Checks
         if: github.event.inputs.skip_checks != 'true'
         run: |
diff --git a/Dockerfile b/Dockerfile
index b44a1a7..6990777 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ COPY pnpm-lock.yaml package.json .npmrc* ./
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     --mount=type=secret,id=NPM_TOKEN \
     export NPM_TOKEN=$(cat /run/secrets/NPM_TOKEN 2>/dev/null || echo $NPM_TOKEN) && \
-    pnpm install --frozen-lockfile
+    pnpm install --no-frozen-lockfile
 
 # Copy source code
 COPY . .
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index e081904..e887754 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -13,8 +13,8 @@ services:
       # Build / dependency installation
       NPM_TOKEN: ${NPM_TOKEN}
       CI: 'true'
-    ports:
-      - "3000:3000"
+    # ports:
+    #   - "3000:3000"
     labels:
       - "traefik.enable=true"
       # Clear all production-related TLS/Middleware settings for the main routers
@@ -31,10 +31,10 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.${PROJECT_NAME:-mb-grid-solutions}-directus.entrypoints=web"
-      - "traefik.http.routers.${PROJECT_NAME:-mb-grid-solutions}-directus.rule=Host(`${DIRECTUS_HOST:-cms.mb-grid-solutions.localhost}`)"
+      - "traefik.http.routers.${PROJECT_NAME:-mb-grid-solutions}-directus.rule=Host(`cms.mb-grid.localhost`)"
       - "traefik.http.routers.${PROJECT_NAME:-mb-grid-solutions}-directus.tls=false"
       - "traefik.http.routers.${PROJECT_NAME:-mb-grid-solutions}-directus.middlewares="
-    ports:
-      - "8055:8055"
+    # ports:
+    #   - "8055:8055"
     environment:
-      PUBLIC_URL: http://${DIRECTUS_HOST:-cms.mb-grid-solutions.localhost}
+      PUBLIC_URL: http://cms.mb-grid.localhost
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7ca62dc..3ba5630 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,5 +1,5 @@
 services:
-  app:
+  mb-grid-app:
     image: registry.infra.mintel.me/mintel/mb-grid-solutions:${IMAGE_TAG:-latest}
     restart: always
     networks:
@@ -8,31 +8,34 @@ services:
       - ${ENV_FILE:-.env}
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${PROJECT_NAME}.rule=${TRAEFIK_RULE:-Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`)}"
-      - "traefik.http.routers.${PROJECT_NAME}.entrypoints=websecure"
-      - "traefik.http.routers.${PROJECT_NAME}.tls.certresolver=le"
-      - "traefik.http.routers.${PROJECT_NAME}.tls=true"
-      - "traefik.http.routers.${PROJECT_NAME}.priority=1000"
-      - "traefik.http.services.${PROJECT_NAME}.loadbalancer.server.port=3000"
-      - "traefik.http.routers.${PROJECT_NAME}.middlewares=${TRAEFIK_MIDDLEWARES:-${PROJECT_NAME}-auth,${PROJECT_NAME}-forward,compress}"
+      - "traefik.http.routers.mb-grid.rule=${TRAEFIK_RULE:-Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`)}"
+      - "traefik.http.routers.mb-grid.entrypoints=websecure"
+      - "traefik.http.routers.mb-grid.tls.certresolver=le"
+      - "traefik.http.routers.mb-grid.tls=true"
+      - "traefik.http.routers.mb-grid.priority=1000"
+      - "traefik.http.routers.mb-grid.service=mb-grid-app-svc"
+      - "traefik.http.services.mb-grid-app-svc.loadbalancer.server.port=3000"
+      - "traefik.http.routers.mb-grid.middlewares=${TRAEFIK_MIDDLEWARES:-mb-grid-auth,mb-grid-forward,compress}"
       - "traefik.docker.network=infra"
+      - "caddy=http://${TRAEFIK_HOST:-mb-grid-solutions.localhost}"
+      - "caddy.reverse_proxy={{upstreams 3000}}"
 
       # Forwarded Headers (Protocol Normalization)
-      - "traefik.http.middlewares.${PROJECT_NAME}-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
-      - "traefik.http.middlewares.${PROJECT_NAME}-forward.headers.customrequestheaders.X-Forwarded-Ssl=on"
+      - "traefik.http.middlewares.mb-grid-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
+      - "traefik.http.middlewares.mb-grid-forward.headers.customrequestheaders.X-Forwarded-Ssl=on"
 
       # Gatekeeper Router (Path-based)
-      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.rule=(Host(`${TRAEFIK_HOST}`) && PathPrefix(`/gatekeeper`))"
-      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.entrypoints=websecure"
-      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.tls.certresolver=le"
-      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.tls=true"
-      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.priority=2000"
-      - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.service=${PROJECT_NAME}-gatekeeper"
+      - "traefik.http.routers.mb-grid-gatekeeper.rule=(Host(`${TRAEFIK_HOST}`) && PathPrefix(`/gatekeeper`))"
+      - "traefik.http.routers.mb-grid-gatekeeper.entrypoints=websecure"
+      - "traefik.http.routers.mb-grid-gatekeeper.tls.certresolver=le"
+      - "traefik.http.routers.mb-grid-gatekeeper.tls=true"
+      - "traefik.http.routers.mb-grid-gatekeeper.priority=2000"
+      - "traefik.http.routers.mb-grid-gatekeeper.service=mb-grid-gatekeeper-svc"
 
-      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.address=http://${PROJECT_NAME}-gatekeeper:3000/gatekeeper/api/verify"
-      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.trustForwardHeader=true"
-      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.authRequestHeaders=X-Forwarded-Host,X-Forwarded-Proto,X-Forwarded-For,Cookie"
-      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.authResponseHeaders=X-Auth-User"
+      - "traefik.http.middlewares.mb-grid-auth.forwardauth.address=http://mb-grid-gatekeeper:3000/gatekeeper/api/verify"
+      - "traefik.http.middlewares.mb-grid-auth.forwardauth.trustForwardHeader=true"
+      - "traefik.http.middlewares.mb-grid-auth.forwardauth.authRequestHeaders=X-Forwarded-Host,X-Forwarded-Proto,X-Forwarded-For,Cookie"
+      - "traefik.http.middlewares.mb-grid-auth.forwardauth.authResponseHeaders=X-Auth-User"
     healthcheck:
       test: [ "CMD", "node", "-e", "fetch('http://127.0.0.1:3000/api/health').then(r => r.ok ? process.exit(0) : process.exit(1)).catch(() => process.exit(1))" ]
       interval: 10s
@@ -40,7 +43,7 @@ services:
       retries: 5
       start_period: 30s
 
-  gatekeeper:
+  mb-grid-gatekeeper:
     image: registry.infra.mintel.me/mintel/gatekeeper:v1.7.12
     container_name: ${PROJECT_NAME:-mb-grid-solutions}-gatekeeper
     profiles: [ "gatekeeper" ]
@@ -48,7 +51,7 @@ services:
     networks:
       infra:
         aliases:
-          - ${PROJECT_NAME:-mb-grid-solutions}-gatekeeper
+          - mb-grid-gatekeeper
     env_file:
       - ${ENV_FILE:-.env}
     environment:
@@ -66,22 +69,22 @@ services:
       retries: 5
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.${PROJECT_NAME}-gatekeeper.loadbalancer.server.port=3000"
+      - "traefik.http.services.mb-grid-gatekeeper-svc.loadbalancer.server.port=3000"
       - "traefik.docker.network=infra"
 
-  directus:
+  mb-grid-cms:
     image: directus/directus:11
     restart: always
     networks:
       infra:
         aliases:
-          - ${PROJECT_NAME:-mb-grid-solutions}-directus
-      testing-backend:
+          - mb-grid-cms
+      default:
     env_file:
       - ${ENV_FILE:-.env}
     environment:
       DB_CLIENT: 'pg'
-      DB_HOST: 'directus-db'
+      DB_HOST: 'mb-grid-db'
       DB_PORT: '5432'
       WEBSOCKETS_ENABLED: 'true'
       PUBLIC_URL: ${DIRECTUS_URL}
@@ -101,14 +104,17 @@ services:
       - ./directus/extensions:/directus/extensions
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${PROJECT_NAME}-directus.rule=Host(`${DIRECTUS_HOST:-cms.mb-grid-solutions.localhost}`)"
-      - "traefik.http.routers.${PROJECT_NAME}-directus.entrypoints=websecure"
-      - "traefik.http.routers.${PROJECT_NAME}-directus.tls.certresolver=le"
-      - "traefik.http.routers.${PROJECT_NAME}-directus.tls=true"
-      - "traefik.http.routers.${PROJECT_NAME}-directus.priority=1000"
-      - "traefik.http.routers.${PROJECT_NAME}-directus.middlewares=${PROJECT_NAME}-forward,compress"
-      - "traefik.http.services.${PROJECT_NAME}-directus.loadbalancer.server.port=8055"
+      - "traefik.http.routers.mb-grid-cms.rule=Host(`${DIRECTUS_HOST:-cms.mb-grid-solutions.localhost}`)"
+      - "traefik.http.routers.mb-grid-cms.entrypoints=websecure"
+      - "traefik.http.routers.mb-grid-cms.tls.certresolver=le"
+      - "traefik.http.routers.mb-grid-cms.tls=true"
+      - "traefik.http.routers.mb-grid-cms.priority=1000"
+      - "traefik.http.routers.mb-grid-cms.service=mb-grid-cms-svc"
+      - "traefik.http.routers.mb-grid-cms.middlewares=mb-grid-forward,compress"
+      - "traefik.http.services.mb-grid-cms-svc.loadbalancer.server.port=8055"
       - "traefik.docker.network=infra"
+      - "caddy=http://${DIRECTUS_HOST:-cms.mb-grid-solutions.localhost}"
+      - "caddy.reverse_proxy={{upstreams 8055}}"
     healthcheck:
       test: [ "CMD", "node", "-e", "fetch('http://localhost:8055/admin').then(r => r.ok ? process.exit(0) : process.exit(1)).catch(() => process.exit(1))" ]
       interval: 30s
@@ -116,11 +122,11 @@ services:
       retries: 3
       start_period: 30s
 
-  directus-db:
+  mb-grid-db:
     image: postgres:15-alpine
     restart: always
     networks:
-      - testing-backend
+      - default
     env_file:
       - ${ENV_FILE:-.env}
     environment:
@@ -131,10 +137,12 @@ services:
       - directus-db-data:/var/lib/postgresql/data
 
 networks:
+  default:
+    name: mb-grid-solutions-internal
   infra:
     external: true
-  testing-backend:
-    internal: true
 
 volumes:
   directus-db-data:
+    external: true
+    name: mb-grid-solutions-production_directus-db-data
diff --git a/next-env.d.ts b/next-env.d.ts
index 9edff1c..c4b7818 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/package.json b/package.json
index 58719e4..be4bf33 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,8 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@mintel/next-config": "^1.8.21",
-    "@mintel/next-utils": "^1.8.21",
+    "@mintel/next-config": "^1.8.20",
+    "@mintel/next-utils": "^1.8.20",
     "@sentry/nextjs": "^10.38.0",
     "framer-motion": "^12.29.2",
     "lucide-react": "^0.562.0",
@@ -42,10 +42,10 @@
     "@commitlint/cli": "^20.4.0",
     "@commitlint/config-conventional": "^20.4.0",
     "@directus/sdk": "^21.0.0",
-    "@mintel/cli": "^1.8.21",
-    "@mintel/eslint-config": "^1.8.21",
-    "@mintel/husky-config": "^1.8.21",
-    "@mintel/tsconfig": "^1.8.21",
+    "@mintel/cli": "^1.8.20",
+    "@mintel/eslint-config": "^1.8.20",
+    "@mintel/husky-config": "^1.8.20",
+    "@mintel/tsconfig": "^1.8.20",
     "@tailwindcss/postcss": "^4.1.18",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
@@ -67,5 +67,9 @@
     "tailwindcss": "^4.1.18",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
+  },
+  "repository": {
+    "type": "git",
+    "url": "ssh://git@git.infra.mintel.me:2222/mmintel/mb-grid-solutions.com.git"
   }
 }