diff --git a/README.md b/README.md
index e6b542d..55b7cd1 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ This project demonstrates enterprise-grade API Gateway patterns using **API7 Ent
 - **Automated Deployment**: Gitea Actions CI/CD + Helm charts
 - **Production-Ready**: TLS, monitoring, autoscaling, and security policies
 
-**Live Demo**: `https://api7-demo.commandware.it`
+**Live Demo**: `https://commandware.it`
 
 ## 🏗️ Architecture
 
@@ -798,7 +798,7 @@ kubectl get challenge -n api7ee
 - **Repository**: https://git.commandware.com/demos/api7-demo
 - **Helm Registry**: https://git.commandware.com/api/packages/demos/helm
 - **Container Registry**: https://git.commandware.com/demos/-/packages/container
-- **Live Demo**: https://api7-demo.commandware.it
+- **Live Demo**: https://commandware.it
 
 ### Support
 
diff --git a/helm/api7ee-demo-k8s/README.md b/helm/api7ee-demo-k8s/README.md
index 43ecc87..5d52b80 100644
--- a/helm/api7ee-demo-k8s/README.md
+++ b/helm/api7ee-demo-k8s/README.md
@@ -210,9 +210,9 @@ helm install api7ee-dev ./helm/api7ee-demo-k8s \
 | `ingress.enabled`           | Enable ingress      | `true`                       |
 | `ingress.className`         | Ingress class       | `nginx`                      |
 | `ingress.annotations`       | Ingress annotations | See values.yaml              |
-| `ingress.hosts[0].host`     | Hostname            | `api7-demo.commandware.it`   |
+| `ingress.hosts[0].host`     | Hostname            | `commandware.it`   |
 | `ingress.tls[0].secretName` | TLS secret          | `api7ee-tls`                 |
-| `ingress.tls[0].hosts`      | TLS hosts           | `[api7-demo.commandware.it]` |
+| `ingress.tls[0].hosts`      | TLS hosts           | `[commandware.it]` |
 
 ### API7 Gateway Configuration
 
@@ -228,7 +228,7 @@ helm install api7ee-dev ./helm/api7ee-demo-k8s \
 | `api7.gateway.gatewayService` | Gateway service name   | `gateway-0-xxx-gateway`              |
 | `api7.backend`                | Backend type           | `api7ee`                             |
 | `api7.autoPublish`            | Auto-publish routes    | `true`                               |
-| `api7.hosts`                  | Routing hosts          | `[api7-demo.commandware.it]`         |
+| `api7.hosts`                  | Routing hosts          | `[commandware.it]`         |
 
 ### TLS Configuration
 
diff --git a/helm/api7ee-demo-k8s/values-production.yaml b/helm/api7ee-demo-k8s/values-production.yaml
index fd41cd5..458a602 100644
--- a/helm/api7ee-demo-k8s/values-production.yaml
+++ b/helm/api7ee-demo-k8s/values-production.yaml
@@ -10,7 +10,7 @@ web:
   replicaCount: 3
 
   image:
-    tag: "v1.0.0"  # Use specific version in production
+    tag: "v1.0.0" # Use specific version in production
     pullPolicy: Always
 
   resources:
@@ -30,7 +30,7 @@ api:
   replicaCount: 5
 
   image:
-    tag: "v1.0.0"  # Use specific version in production
+    tag: "v1.0.0" # Use specific version in production
     pullPolicy: Always
 
   resources:
@@ -76,11 +76,11 @@ api7:
   enabled: true
   gateway:
     adminUrl: http://api7ee3-0-1759339083-dp-manager.api7ee.svc.cluster.local:7900
-    adminKey: "${API7_ADMIN_KEY}"  # Should be provided via secret in production
+    adminKey: "${API7_ADMIN_KEY}" # Should be provided via secret in production
     gatewayService: gateway-0-1759393614-gateway
   hosts:
-    - api7-demo.commandware.it
-    - api7-demo.commandware.com  # Additional production domain
+    - commandware.it
+    - api7-demo.commandware.com # Additional production domain
   tls:
     enabled: true
     certManager:
@@ -89,17 +89,18 @@ api7:
   plugins:
     rateLimit:
       enabled: true
-      count: 1000  # Higher limits for production
+      count: 1000 # Higher limits for production
       timeWindow: 60
-      apiCount: 10000  # Much higher for API endpoints
+      apiCount: 10000 # Much higher for API endpoints
     cors:
       enabled: true
-      allowOrigins: ["https://api7-demo.commandware.it", "https://api7-demo.commandware.com"]
+      allowOrigins:
+        ["https://commandware.it", "https://api7-demo.commandware.com"]
       allowCredentials: true
     auth:
-      enabled: true  # Enable auth in production
+      enabled: true # Enable auth in production
     prometheus:
       enabled: true
     logging:
       enabled: true
-      endpoint: http://logging-service.monitoring:8080/logs
\ No newline at end of file
+      endpoint: http://logging-service.monitoring:8080/logs
diff --git a/helm/api7ee-demo-k8s/values.yaml b/helm/api7ee-demo-k8s/values.yaml
index d9ab5f4..916ac04 100644
--- a/helm/api7ee-demo-k8s/values.yaml
+++ b/helm/api7ee-demo-k8s/values.yaml
@@ -135,7 +135,7 @@ ingress:
     cert-manager.io/cluster-issuer: "cloudflare-acme-prod"
 
   hosts:
-    - host: api7-demo.commandware.it
+    - host: commandware.it
       paths:
         - path: /
           pathType: Prefix
@@ -147,7 +147,7 @@ ingress:
   tls:
     - secretName: api7ee-tls
       hosts:
-        - api7-demo.commandware.it
+        - commandware.it
 
 # ServiceAccount configuration
 serviceAccount:
@@ -232,7 +232,7 @@ api7:
 
   # Hosts for routing (using wildcard domain from existing ingress)
   hosts:
-    - api7-demo.commandware.it
+    - commandware.it
 
   # TLS/SSL Configuration
   tls:
diff --git a/web/README.md b/web/README.md
index b102484..4d20663 100644
--- a/web/README.md
+++ b/web/README.md
@@ -601,7 +601,7 @@ When deployed behind API7 Gateway:
 **Routing**:
 
 - Priority 1: `/*` routes to web service (matches all except `/api`)
-- Hosts: `api7-demo.commandware.it`
+- Hosts: `commandware.it`
 
 **Plugins**: