diff --git a/.idea/$CACHE_FILE$ b/.idea/$CACHE_FILE$
new file mode 100644
index 0000000..6cb8985
--- /dev/null
+++ b/.idea/$CACHE_FILE$
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..5c98b42
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..cdf6c29
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/nordmart-dev-apps.iml" filepath="$PROJECT_DIR$/.idea/nordmart-dev-apps.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/nordmart-dev-apps.iml b/.idea/nordmart-dev-apps.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/nordmart-dev-apps.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/releases-istio/apps/cart-helm-release.yaml b/releases-istio/apps/cart-helm-release.yaml
index c3a9291..eafcc0d 100644
--- a/releases-istio/apps/cart-helm-release.yaml
+++ b/releases-istio/apps/cart-helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-cart
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -21,15 +21,15 @@ spec:
         app: cart
       image:
         repository: stakater/stakater-nordmart-cart
-        tag: v0.0.1
+        tag: v0.0.2
       volumes: {}
       env:
       - name: CATALOG_ENDPOINT
-        value: "catalog.nordmart-dev-apps.svc.cluster.local:8080"
+        value: "catalog.nordmart-demo.svc.cluster.local:8080"
       - name: KEYCLOAK_REALM
         value: "nordmart"
       - name: KEYCLOAK_URL
-        value: "https://keycloak-dev.DOMAIN/auth/"
+        value: "https://keycloak-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud/auth/"
       - name: KEYCLOAK_CLIENT_BACKEND
         value: "stakater-nordmart-backend"
       - name: KEYCLOAK_CLIENT_SECRET_KEY
diff --git a/releases-istio/apps/cassandra.yaml b/releases-istio/apps/cassandra.yaml
index 3638e86..bb39e44 100644
--- a/releases-istio/apps/cassandra.yaml
+++ b/releases-istio/apps/cassandra.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: cassandra
   name: cassandra
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   clusterIP: None
   ports:
@@ -16,7 +16,7 @@ apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
   name: cassandra
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   serviceName: cassandra
   replicas: 1
@@ -39,7 +39,7 @@ spec:
               name: cql
           env:
             - name: CASSANDRA_SEEDS
-              value: cassandra-0.cassandra.nordmart-dev-apps.svc.cluster.local
+              value: cassandra-0.cassandra.nordmart-demo.svc.cluster.local
             - name: MAX_HEAP_SIZE
               value: 512M
             - name: HEAP_NEWSIZE
@@ -61,10 +61,10 @@ spec:
     - metadata:
         name: cassandra-pvc
         annotations:
-          volume.beta.kubernetes.io/storage-class: STORAGE_CLASS_NAME
+          volume.beta.kubernetes.io/storage-class: ibmc-file-gold
       spec:
         accessModes: [ "ReadWriteOnce" ]
-        storageClassName: STORAGE_CLASS_NAME
+        storageClassName: ibmc-file-gold
         resources:
           requests:
             storage: 1Gi
\ No newline at end of file
diff --git a/releases-istio/apps/catalog-helm-release.yaml b/releases-istio/apps/catalog-helm-release.yaml
index 0948d8d..c37cc98 100644
--- a/releases-istio/apps/catalog-helm-release.yaml
+++ b/releases-istio/apps/catalog-helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-catalog
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -22,7 +22,7 @@ spec:
       volumes: {}
       image:
         repository: stakater/stakater-nordmart-catalog
-        tag: v0.0.1
+        tag: v0.0.2
       fluentdConfigAnnotations:
         regex: /^(?<time>\\d+(?:-\\d+){2}\\s+\\d+(?::\\d+){2}\\.\\d+)\\s*(?<level>\\S+)
           (?<pid>\\d+) --- \\[(?<thread>[\\s\\S]*?)\\] (?<class>\\S+)\\s*:\\s*(?<message>[\\s\\S]*?)(?=\\g<time>|\\Z)/
@@ -40,19 +40,19 @@ spec:
             name: mysql-secret
             key: mysql_password
       - name: MYSQL_HOST
-        value: "mysql-svc.nordmart-dev-apps.svc.cluster.local"
+        value: "mysql-svc.nordmart-demo.svc.cluster.local"
       - name: MYSQL_DB_NAME
         value: "catalog"
       - name: KEYCLOAK_REALM
         value: "nordmart"
       - name: KEYCLOAK_URL
-        value: "https://keycloak-dev.DOMAIN/auth/"
+        value: "https://keycloak-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud/auth/"
       - name: KEYCLOAK_CLIENT_BACKEND
         value: "stakater-nordmart-backend"
       - name: KEYCLOAK_CLIENT_SECRET_KEY
         value: "7672aea2-81ff-4aa2-affe-daf3bad10334"
       - name: KAFKA_ADDRESS
-        value: "kafka-cluster-kafka-bootstrap.nordmart-dev-apps:9092"
+        value: "kafka-cluster-kafka-bootstrap.nordmart-demo:9092"
       - name: JAEGER_ENDPOINT
         value: "http://jaeger-collector.istio-system:14268/api/traces"
 
diff --git a/releases-istio/apps/customer-helm-release.yaml b/releases-istio/apps/customer-helm-release.yaml
index bedb229..c065df8 100644
--- a/releases-istio/apps/customer-helm-release.yaml
+++ b/releases-istio/apps/customer-helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-customer
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -22,17 +22,16 @@ spec:
       image:
         repository: stakater/stakater-nordmart-customer
         tag: v0.0.1
-      imagePullSecrets: "docker-registry-nexus-secret"
       volumes: {}
       env:
       - name: CATALOG_ENDPOINT
-        value: "catalog.nordmart-dev-apps.svc.cluster.local:8080"
+        value: "catalog.nordmart-demo.svc.cluster.local:8080"
       - name: CASSANDRA_HOST
-        value: "cassandra.nordmart-dev-apps.svc.cluster.local"
+        value: "cassandra.nordmart-demo.svc.cluster.local"
       - name: KEYCLOAK_REALM
         value: "nordmart"
       - name: KEYCLOAK_URL
-        value: "https://keycloak-dev.DOMAIN/auth/"
+        value: "https://keycloak-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud/auth/"
       - name: KEYCLOAK_CLIENT_BACKEND
         value: "stakater-nordmart-backend"
       - name: KEYCLOAK_CLIENT_SECRET_KEY
diff --git a/releases-istio/apps/elasticsearch.yaml b/releases-istio/apps/elasticsearch.yaml
index 1176612..84f1590 100644
--- a/releases-istio/apps/elasticsearch.yaml
+++ b/releases-istio/apps/elasticsearch.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: elasticsearch
   name: elasticsearch-svc
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   ports:
     - name: "elasticsearch-port"
@@ -17,7 +17,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: elasticsearch
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   serviceName: "elasticsearch"
   selector:
@@ -49,15 +49,15 @@ spec:
           ports:
             - containerPort: 9200
               name: tcp
-#          volumeMounts:
-#            - mountPath: /data
-#              name: elasticsearch-pvc
-#  volumeClaimTemplates:
-#    - metadata:
-#        name: elasticsearch-pvc
-#      spec:
-#        accessModes: [ "ReadWriteOnce" ]
-#        storageClassName: stakater-storageclass
-#        resources:
-#          requests:
-#            storage: 5Gi
\ No newline at end of file
+          volumeMounts:
+           - mountPath: /data
+             name: elasticsearch-pvc
+  volumeClaimTemplates:
+   - metadata:
+       name: elasticsearch-pvc
+     spec:
+       accessModes: [ "ReadWriteOnce" ]
+       storageClassName: ibmc-block-gold
+       resources:
+         requests:
+           storage: 5Gi
\ No newline at end of file
diff --git a/releases-istio/apps/gateway-helm-release.yaml b/releases-istio/apps/gateway-helm-release.yaml
index 6f0ecf2..bdc8cb7 100644
--- a/releases-istio/apps/gateway-helm-release.yaml
+++ b/releases-istio/apps/gateway-helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-gateway
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -20,7 +20,7 @@ spec:
       podLabels:
         app: gateway
       image:
-        repository: stakater/stakater-nordmart-gateway
+        repository: stakater/stakater-nordmart-gateway-vertx
         tag: v0.0.1
       fluentdConfigAnnotations:
         regex: /^(?<time>\\d+(?:-\\d+){2}\\s+\\d+(?::\\d+){2}\\.\\d+)\\s*(?<level>\\S+)
@@ -49,36 +49,47 @@ spec:
       volumes: {}
       env:
       - name: CATALOG_API_HOST
-        value: "catalog.nordmart-dev-apps.svc.cluster.local"
+        value: "catalog.nordmart-demo.svc.cluster.local"
       - name: CATALOG_API_PORT
         value: "8080"
       - name: CUSTOMER_API_HOST
-        value: "customer.nordmart-dev-apps.svc.cluster.local"
+        value: "customer.nordmart-demo.svc.cluster.local"
       - name: CUSTOMER_API_PORT
         value: "8080"
       - name: INVENTORY_API_HOST
-        value: "inventory.nordmart-dev-apps.svc.cluster.local"
+        value: "inventory.nordmart-demo.svc.cluster.local"
       - name: INVENTORY_API_PORT
         value: "8080"
       - name: DISABLE_CART_DISCOVERY
         value: "false"
       - name: CART_API_HOST
-        value: "cart.nordmart-dev-apps.svc.cluster.local"
+        value: "cart.nordmart-demo.svc.cluster.local"
       - name: CART_API_PORT
         value: "8080"
       - name: HTTP_PORT
         value: "8080"
       - name: REVIEW_API_HOST
-        value: "review.nordmart-dev-apps.svc.cluster.local"
+        value: "review.nordmart-demo.svc.cluster.local"
       - name: REVIEW_API_PORT
         value: "8080"
       - name: PRODUCT_SEARCH_API_HOST
-        value: "search.nordmart-dev-apps"
+        value: "search.nordmart-demo.svc.cluster.local"
       - name: PRODUCT_SEARCH_API_PORT
         value: "8080"
       - name: JAEGER_ENDPOINT
         value: "http://jaeger-collector.istio-system:14268/api/traces"
     service:
+      annotations:
+        config.xposer.stakater.com/Domain: nordmart-eks.stakater.com
+        config.xposer.stakater.com/IngressNameTemplate: '{{.Service}}'
+        config.xposer.stakater.com/IngressURLTemplate: gateway-dev.{{.Domain}}
+        config.xposer.stakater.com/TLS: "true"
+        config.xposer.stakater.com/TLSSecretNameTemplate: tls-cert
+        xposer.stakater.com/annotations: |-
+          kubernetes.io/ingress.class: internal-ingress
+          ingress.kubernetes.io/force-ssl-redirect: false
+          nginx.ingress.kubernetes.io/cors-allow-origin: "*"
+          exposeIngressUrl: globally
       ports:
       - port: 8080
         name: https
@@ -86,21 +97,22 @@ spec:
     rbac:
       create: true
       serviceAccount:
-        create: true
+        # create: true
+        name: default
     configMap:
       enabled: false
----
-apiVersion: networking.istio.io/v1alpha3
-kind: VirtualService
-metadata:
-  name: gateway-dev-virtualservice
-  namespace: istio-system
-spec:
-  hosts:
-    - "gateway-dev.DOMAIN"
-  gateways:
-    - istio-gateway
-  http:
-    - route:
-        - destination:
-            host: gateway.nordmart-dev-apps.svc.cluster.local
\ No newline at end of file
+# ---
+# apiVersion: networking.istio.io/v1alpha3
+# kind: VirtualService
+# metadata:
+#   name: gateway-dev-virtualservice
+#   namespace: istio-system
+# spec:
+#   hosts:
+#     - "gateway-dev.nordmart-eks.stakater.com"
+#   gateways:
+#     - istio-gateway
+#   http:
+#     - route:
+#         - destination:
+#             host: gateway.nordmart-dev-apps.svc.cluster.local
\ No newline at end of file
diff --git a/releases-istio/apps/inventory-helm-release.yaml b/releases-istio/apps/inventory-helm-release.yaml
index b08a0e8..005f8ca 100644
--- a/releases-istio/apps/inventory-helm-release.yaml
+++ b/releases-istio/apps/inventory-helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-inventory
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -22,7 +22,7 @@ spec:
       volumes: {}
       image:
         repository: stakater/stakater-nordmart-inventory
-        tag: v0.0.1
+        tag: v0.0.2
       env:
       - name: JAEGER_ENDPOINT
         value: "http://jaeger-collector.istio-system:14268/api/traces"
diff --git a/releases-istio/apps/kafka.yaml b/releases-istio/apps/kafka.yaml
index 64b1f1a..cc82a5a 100644
--- a/releases-istio/apps/kafka.yaml
+++ b/releases-istio/apps/kafka.yaml
@@ -2,7 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta1
 kind: Kafka
 metadata:
   name: kafka-cluster
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   kafka:
     version: 2.4.0
@@ -22,14 +22,14 @@ spec:
           type: persistent-claim
           size: 1Gi
           deleteClaim: false
-          class: STORAGE_CLASS_NAME
+          class: ibmc-block-gold
   zookeeper:
     replicas: 1
     storage:
       type: persistent-claim
       size: 1Gi
       deleteClaim: false
-      class: STORAGE_CLASS_NAME
+      class: ibmc-block-gold
   entityOperator:
     topicOperator: {}
     userOperator: {}
\ No newline at end of file
diff --git a/releases-istio/apps/mongdb.yaml b/releases-istio/apps/mongdb.yaml
index 383ef13..cb99768 100644
--- a/releases-istio/apps/mongdb.yaml
+++ b/releases-istio/apps/mongdb.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: mongodb
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   serviceName: "mongodb"
   selector:
@@ -33,7 +33,7 @@ spec:
       name: mongodb-pvc
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: STORAGE_CLASS_NAME
+      storageClassName: ibmc-block-gold
       resources:
         requests:
           storage: 1Gi
@@ -44,7 +44,7 @@ metadata:
   labels:
     app: mongodb
   name: mongodb-svc
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   ports:
   - name: "mongo-port"
diff --git a/releases-istio/apps/mysql.yaml b/releases-istio/apps/mysql.yaml
index 7ec0792..893eba7 100644
--- a/releases-istio/apps/mysql.yaml
+++ b/releases-istio/apps/mysql.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: mysql
   name: mysql-svc
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   ports:
   - name: "mysql-port"
@@ -17,7 +17,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: mysql
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
 spec:
   serviceName: "mysql"
   selector:
@@ -61,7 +61,7 @@ spec:
       name: mysql-pvc
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: STORAGE_CLASS_NAME
+      storageClassName: ibmc-block-gold
       resources:
         requests:
           storage: 1Gi
diff --git a/releases-istio/apps/review-helm-release.yaml b/releases-istio/apps/review-helm-release.yaml
index 61e0b27..d484537 100644
--- a/releases-istio/apps/review-helm-release.yaml
+++ b/releases-istio/apps/review-helm-release.yaml
@@ -2,7 +2,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-review
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -20,7 +20,7 @@ spec:
       volumes: {}
       image:
         repository: stakater/stakater-nordmart-review
-        tag: v0.0.1
+        tag: v0.0.2
       fluentdConfigAnnotations:  
           regex: /^(?<time>\\d+(?:-\\d+){2}\\s+\\d+(?::\\d+){2}\\.\\d+)\\s*(?<level>\\S+) (?<pid>\\d+) --- \\[(?<thread>[\\s\\S]*?)\\] (?<class>\\S+)\\s*:\\s*(?<message>[\\s\\S]*?)(?=\\g<time>|\\Z)/
           regexFirstLine: /^\\d+(?:-\\d+){2}\\s+\\d+(?::\\d+){2}\\.\\d+/
@@ -29,7 +29,7 @@ spec:
       - name: DB_NAME
         value: "nordmartDB"
       - name: MONGO_HOST
-        value: "mongodb-svc.nordmart-dev-apps.svc.cluster.local"
+        value: "mongodb-svc.nordmart-demo.svc.cluster.local"
       - name: JAEGER_ENDPOINT
         value: "http://jaeger-collector.istio-system:14268/api/traces"
       probes:
diff --git a/releases-istio/apps/routes/gateway-route.yaml b/releases-istio/apps/routes/gateway-route.yaml
new file mode 100644
index 0000000..2585424
--- /dev/null
+++ b/releases-istio/apps/routes/gateway-route.yaml
@@ -0,0 +1,24 @@
+kind: Route
+metadata:
+  labels:
+    app: gateway
+    chart: application-0.0.12
+    group: com.stakater.platform
+    heritage: Tiller
+    provider: stakater
+    release: nordmart-dev-gateway
+    version: 1.0.0
+  name: gateway-dev
+  namespace: nordmart-demo
+spec:
+  host: gateway-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud
+  port:
+    targetPort: https
+  tls:
+    insecureEdgeTerminationPolicy: Redirect
+    termination: edge
+  to:
+    kind: Service
+    name: gateway
+    weight: 100
+  wildcardPolicy: None
diff --git a/releases-istio/apps/routes/web-route.yaml b/releases-istio/apps/routes/web-route.yaml
new file mode 100644
index 0000000..abdcec7
--- /dev/null
+++ b/releases-istio/apps/routes/web-route.yaml
@@ -0,0 +1,24 @@
+kind: Route
+metadata:
+  labels:
+    app: web
+    chart: application-0.0.12
+    group: com.stakater.platform
+    heritage: Tiller
+    provider: stakater
+    release: nordmart-dev-web
+    version: 1.0.0
+  name: web-dev
+  namespace: nordmart-demo
+spec:
+  host: web-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud
+  port:
+    targetPort: web
+  tls:
+    insecureEdgeTerminationPolicy: Redirect
+    termination: edge
+  to:
+    kind: Service
+    name: web
+    weight: 100
+  wildcardPolicy: None
diff --git a/releases-istio/apps/search-helm-release.yaml b/releases-istio/apps/search-helm-release.yaml
index 0f019b9..5d03706 100644
--- a/releases-istio/apps/search-helm-release.yaml
+++ b/releases-istio/apps/search-helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-search
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -35,11 +35,11 @@ spec:
             name: elasticsearch-secret
             key: elasticsearch_password
       - name: ELASTICSEARCH_HOST
-        value: "elasticsearch-svc.nordmart-dev-apps"
+        value: "elasticsearch-svc.nordmart-demo"
       - name: ELASTICSEARCH_PORT
         value: "9200"
       - name: KAFKA_ADDRESS
-        value: "kafka-cluster-kafka-bootstrap.nordmart-dev-apps"
+        value: "kafka-cluster-kafka-bootstrap.nordmart-demo"
       - name: KAFKA_PORT
         value: "9092"
       - name: JAEGER_ENDPOINT
diff --git a/releases-istio/apps/web-helm-release.yaml b/releases-istio/apps/web-helm-release.yaml
index 45e91ea..b5cb7f0 100644
--- a/releases-istio/apps/web-helm-release.yaml
+++ b/releases-istio/apps/web-helm-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   name: nordmart-dev-web
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   annotations:
     flux.weave.works/automated: "true"
     flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
@@ -21,7 +21,7 @@ spec:
         app: web
       image:
         repository: stakater/stakater-nordmart-web
-        tag: v0.0.1
+        tag: v0.0.4
       fluentdConfigAnnotations:
         regex: /^(?<time>\\d+(?:-\\d+){2}\\s+\\d+(?::\\d+){2}\\.\\d+)\\s*(?<level>\\S+)
           (?<pid>\\d+) --- \\[(?<thread>[\\s\\S]*?)\\] (?<class>\\S+)\\s*:\\s*(?<message>[\\s\\S]*?)(?=\\g<time>|\\Z)/
@@ -51,9 +51,11 @@ spec:
       - name: PORT
         value: "4200"
       - name: SECURE_GW_ENDPOINT
-        value: "https://gateway-dev.DOMAIN"
+        value: "https://gateway-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud"
+      - name: NORDMART_GW_ENDPOINT
+        value: "https://gateway-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud"
       - name: SSO_URL
-        value: "https://keycloak-dev.DOMAIN/auth"
+        value: "https://keycloak-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud/auth/"
       - name: SSO_REALM
         value: "nordmart"
       - name: SSO_CLIENT_ID
@@ -61,9 +63,20 @@ spec:
       - name: JAEGER_ENDPOINT
         value: "http://jaeger-collector.istio-system:14268/api/traces"
     service:
+      annotations:
+        config.xposer.stakater.com/Domain: nordmart-eks.stakater.com
+        config.xposer.stakater.com/IngressNameTemplate: '{{.Service}}'
+        config.xposer.stakater.com/IngressURLTemplate: web-dev.{{.Domain}}
+        config.xposer.stakater.com/TLS: "true"
+        config.xposer.stakater.com/TLSSecretNameTemplate: tls-cert
+        xposer.stakater.com/annotations: |-
+          kubernetes.io/ingress.class: internal-ingress
+          ingress.kubernetes.io/force-ssl-redirect: false
+          nginx.ingress.kubernetes.io/cors-allow-origin: "*"
+          exposeIngressUrl: globally
       ports:
       - port: 4200
-        name: tcp
+        name: web
         protocol: TCP
         targetPort: 4200
     rbac:
@@ -72,18 +85,18 @@ spec:
         create: true
     configMap:
       enabled: false
----
-apiVersion: networking.istio.io/v1alpha3
-kind: VirtualService
-metadata:
-  name: web-dev-virtualservice
-  namespace: istio-system
-spec:
-  hosts:
-    - "web-dev.DOMAIN"
-  gateways:
-    - istio-gateway
-  http:
-    - route:
-        - destination:
-            host: web.nordmart-dev-apps.svc.cluster.local
\ No newline at end of file
+# ---
+# apiVersion: networking.istio.io/v1alpha3
+# kind: VirtualService
+# metadata:
+#   name: web-dev-virtualservice
+#   namespace: istio-system
+# spec:
+#   hosts:
+#     - "web-dev.nordmart-eks.stakater.com"
+#   gateways:
+#     - istio-gateway
+#   http:
+#     - route:
+#         - destination:
+#             host: web.nordmart-dev-apps.svc.cluster.local
diff --git a/releases-istio/istio-gateway.yaml b/releases-istio/istio-gateway.yaml
index d60082b..254d207 100644
--- a/releases-istio/istio-gateway.yaml
+++ b/releases-istio/istio-gateway.yaml
@@ -16,8 +16,8 @@ spec:
         serverCertificate: /etc/istio/ingressgateway-certs/tls.crt
         privateKey: /etc/istio/ingressgateway-certs/tls.key
       hosts:
-        - "gateway-dev.DOMAIN"
-        - "web-dev.DOMAIN"
+        - "gateway-dev.nordmart-eks.stakater.com"
+        - "web-dev.nordmart-eks.stakater.com"
     - port:
         number: 80
         name: http
@@ -25,5 +25,5 @@ spec:
       tls:
         httpsRedirect: true
       hosts:
-        - "gateway-dev.DOMAIN"
-        - "web-dev.DOMAIN"
\ No newline at end of file
+        - "gateway-dev.nordmart-eks.stakater.com"
+        - "web-dev.nordmart-eks.stakater.com"
\ No newline at end of file
diff --git a/releases-istio/secrets/elasticsearch-secret.yaml b/releases-istio/secrets/elasticsearch-secret.yaml
index 779c458..37b0014 100644
--- a/releases-istio/secrets/elasticsearch-secret.yaml
+++ b/releases-istio/secrets/elasticsearch-secret.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   name: elasticsearch-secret
 type: Opaque
 data:
-  elasticsearch_password: cXdlcnR5Nzg2
\ No newline at end of file
+  elasticsearch_password: cXdlcnR5Nzg2
diff --git a/releases-istio/secrets/mysql-secret.yaml b/releases-istio/secrets/mysql-secret.yaml
index 16345bf..6672d63 100644
--- a/releases-istio/secrets/mysql-secret.yaml
+++ b/releases-istio/secrets/mysql-secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: nordmart-dev-apps
+  namespace: nordmart-demo
   name: mysql-secret
 type: Opaque
 data: