diff --git a/etc/k8s/eshoponabp/values.azure.yaml b/etc/k8s/eshoponabp/values.azure.yaml
index f57d5fb9..d1f3a76f 100644
--- a/etc/k8s/eshoponabp/values.azure.yaml
+++ b/etc/k8s/eshoponabp/values.azure.yaml
@@ -2,7 +2,7 @@
 authserver:
   config:
     selfUrl: https://auth.eshoponabp.com   
-    corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://www.eshoponabp.com
+    corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://cmskit.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://www.eshoponabp.com
     allowedRedirectUrls: https://admin.eshoponabp.com
     authServer:
       authority: https://auth.eshoponabp.com
@@ -87,6 +87,7 @@ identity:
     basketServiceRootUrl: https://basket.eshoponabp.com/
     catalogServiceRootUrl: https://catalog.eshoponabp.com
     orderingServiceRootUrl: https://order.eshoponabp.com
+    cmskitServiceRootUrl: https://cmskit.eshoponabp.com
     paymentServiceRootUrl: https://payment.eshoponabp.com
   ingress:
     host: identity.eshoponabp.com
@@ -152,6 +153,8 @@ gateway-web:
       url: http://eshop-az-catalog
     orderingService:
       url: http://eshop-az-ordering
+    cmskitService:
+      url: http://eshop-az-cmskit
 
 # gateway-web-public sub-chart override
 gateway-web-public:
@@ -184,6 +187,8 @@ gateway-web-public:
       url: http://eshop-az-basket
     orderingService:
       url: http://eshop-az-ordering
+    cmskitService:
+      url: http://eshop-az-cmskit
     paymentService:
       url: http://eshop-az-payment  
 
@@ -263,6 +268,29 @@ ordering:
     repository: "volocr.azurecr.io/eshoponabp/service-ordering"
     tag: 1.0.5
 
+# cmskit-service sub-chart override
+cmskit:
+  config:
+    selfUrl: https://cmskit.eshoponabp.com
+    corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com
+    connectionStrings:
+      cmskitService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+    authServer:
+      authority: http://eshop-az-authserver
+      requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
+    dotnetEnv: Production
+    redisHost: eshop-az-redis
+    rabbitmqHost: eshop-az-rabbitmq
+    elasticsearchHost: eshop-az-elasticsearch
+  ingress:
+    host: cmskit.eshoponabp.com
+  image:
+    repository: "volocr.azurecr.io/eshoponabp/service-cmskit"
+    tag: 1.0.5
+
 # payment-service sub-chart override
 payment:
   config:
diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml
index cc837965..5f8526d0 100644
--- a/etc/k8s/eshoponabp/values.st.yaml
+++ b/etc/k8s/eshoponabp/values.st.yaml
@@ -2,7 +2,7 @@
 authserver:
   config:
     selfUrl: https://eshop-st-authserver    
-    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-basket,https://eshop-st-catalog,https://eshop-st-ordering,https://eshop-st-payment,https://eshop-st-web,https://eshop-st-public-web
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-basket,https://eshop-st-catalog,https://eshop-st-ordering,https://eshop-st-cmskit,https://eshop-st-payment,https://eshop-st-web,https://eshop-st-public-web
     allowedRedirectUrls: https://eshop-st-web
     authServer:
       authority: http://eshop-st-authserver
@@ -90,6 +90,7 @@ identity:
     basketServiceRootUrl: https://eshop-st-basket/
     catalogServiceRootUrl: https://eshop-st-catalog/
     orderingServiceRootUrl: https://eshop-st-ordering/
+    cmskitServiceRootUrl: https://eshop-st-cmskit/
     paymentServiceRootUrl: https://eshop-st-payment/
   ingress:
     host: eshop-st-identity
@@ -158,6 +159,8 @@ gateway-web:
       url: http://eshop-st-catalog
     orderingService:
       url: http://eshop-st-ordering
+    cmskitService:
+      url: http://eshop-st-cmskit
 
 # gateway-web-public sub-chart override
 gateway-web-public:
@@ -191,6 +194,8 @@ gateway-web-public:
       url: http://eshop-st-basket
     orderingService:
       url: http://eshop-st-ordering
+    cmskitService:
+      url: http://eshop-st-cmskit
     paymentService:
       url: http://eshop-st-payment  
 
@@ -273,6 +278,30 @@ ordering:
     repository: "eshoponabp/service-ordering"
     tag: 1.0.0
 
+# cmskit-service sub-chart override
+cmskit:
+  config:
+    selfUrl: https://eshop-st-cmskit
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
+    connectionStrings:
+      cmskitervice: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+    authServer:
+      authority: http://eshop-st-authserver
+      requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
+    dotnetEnv: Staging
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
+  ingress:
+    host: eshop-st-cmskit
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/service-cmskit"
+    tag: 1.0.0
+
 # payment-service sub-chart override
 payment:
   config:
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index 8bc098db..c73c09b8 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -2,7 +2,7 @@
 authserver:
   config:
     selfUrl: https://eshop-st-authserver    
-    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-basket,https://eshop-st-catalog,https://eshop-st-ordering,https://eshop-st-payment,https://eshop-st-web,https://eshop-st-public-web
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-basket,https://eshop-st-catalog,https://eshop-st-ordering,https://eshop-st-cmskit,https://eshop-st-payment,https://eshop-st-web,https://eshop-st-public-web
     allowedRedirectUrls: https://eshop-st-web
     authServer:
       authority: http://eshop-st-authserver
@@ -90,6 +90,7 @@ identity:
     basketServiceRootUrl: https://eshop-st-basket/
     catalogServiceRootUrl: https://eshop-st-catalog/
     orderingServiceRootUrl: https://eshop-st-ordering/
+    cmskitServiceRootUrl: https://eshop-st-cmskit/
     paymentServiceRootUrl: https://eshop-st-payment/
   ingress:
     host: eshop-st-identity
@@ -158,6 +159,8 @@ gateway-web:
       url: http://eshop-st-catalog
     orderingService:
       url: http://eshop-st-ordering
+    cmskitService:
+      url: http://eshop-st-cmskit
 
 # gateway-web-public sub-chart override
 gateway-web-public:
@@ -191,6 +194,8 @@ gateway-web-public:
       url: http://eshop-st-basket
     orderingService:
       url: http://eshop-st-ordering
+    cmskitService:
+      url: http://eshop-st-cmskit
     paymentService:
       url: http://eshop-st-payment  
 
@@ -273,6 +278,30 @@ ordering:
     repository: "ghcr.io/volosoft/eshoponabp/service-ordering"
     tag: 1.0.1
 
+# cmskit-service sub-chart override
+cmskit:
+  config:
+    selfUrl: https://eshop-st-cmskit
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
+    connectionStrings:
+      cmskitService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+    authServer:
+      authority: http://eshop-st-authserver
+      requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
+    dotnetEnv: Staging
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
+  ingress:
+    host: eshop-st-cmskit
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "ghcr.io/volosoft/eshoponabp/service-cmskit"
+    tag: 1.0.1
+
 # payment-service sub-chart override
 payment:
   config: