diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json b/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json
index 5e2fe164..48feacb0 100644
--- a/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json
+++ b/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json
@@ -5,7 +5,7 @@
     "RedirectAllowedUrls": "http://app-web"
   },
   "AuthServer": {
-    "Authority": "http://app-authserver",
+    "Authority": "http://app-authserver", // Identity Server
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "WebGateway_Swagger",
     "SwaggerClientSecret": "1q2w3e*"
diff --git a/build/build-images-locally.sh b/build/build-images-locally.sh
index b24e775b..85237331 100755
--- a/build/build-images-locally.sh
+++ b/build/build-images-locally.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export IMAGE_TAG="1.0.5"
+export IMAGE_TAG="1.0.0"
 export total=11
 cd ../
 export currentFolder=`pwd`
diff --git a/etc/k8s/azure/scripts/push-images-ghcr.sh b/etc/k8s/azure/scripts/push-images-ghcr.sh
new file mode 100755
index 00000000..c28e8629
--- /dev/null
+++ b/etc/k8s/azure/scripts/push-images-ghcr.sh
@@ -0,0 +1,36 @@
+export version="1.0.0"
+
+az acr login --name volocr
+
+docker tag eshoponabp/app-web:"${version}" ghcr.io/volosoft/eshoponabp/app-web:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/app-web:"${version}"
+
+docker tag eshoponabp/app-authserver:"${version}" ghcr.io/volosoft/eshoponabp/app-authserver:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/app-authserver:"${version}"
+
+docker tag eshoponabp/app-publicweb:"${version}" ghcr.io/volosoft/eshoponabp/app-publicweb:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/app-publicweb:"${version}"
+
+docker tag eshoponabp/gateway-web:"${version}" ghcr.io/volosoft/eshoponabp/gateway-web:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/gateway-web:"${version}"
+
+docker tag eshoponabp/gateway-web-public:"${version}" ghcr.io/volosoft/eshoponabp/gateway-web-public:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/gateway-web-public:"${version}"
+
+docker tag eshoponabp/service-identity:"${version}" ghcr.io/volosoft/eshoponabp/service-identity:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/service-identity:"${version}"
+
+docker tag eshoponabp/service-administration:"${version}" ghcr.io/volosoft/eshoponabp/service-administration:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/service-administration:"${version}"
+
+docker tag eshoponabp/service-basket:"${version}" ghcr.io/volosoft/eshoponabp/service-basket:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/service-basket:"${version}"
+
+docker tag eshoponabp/service-catalog:"${version}" ghcr.io/volosoft/eshoponabp/service-catalog:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/service-catalog:"${version}"
+
+docker tag eshoponabp/service-ordering:"${version}" ghcr.io/volosoft/eshoponabp/service-ordering:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/service-ordering:"1.0.1"
+
+docker tag eshoponabp/service-payment:"${version}" ghcr.io/volosoft/eshoponabp/service-payment:"${version}"
+docker push ghcr.io/volosoft/eshoponabp/service-payment:"${version}"
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/Chart.yaml b/etc/k8s/eshoponabp/Chart.yaml
index a1801db0..72fc48c7 100644
--- a/etc/k8s/eshoponabp/Chart.yaml
+++ b/etc/k8s/eshoponabp/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 1.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "1.0.0"
diff --git a/etc/k8s/eshoponabp/README.md b/etc/k8s/eshoponabp/README.md
new file mode 100644
index 00000000..be3a3d1a
--- /dev/null
+++ b/etc/k8s/eshoponabp/README.md
@@ -0,0 +1,82 @@
+# abp-charts
+
+# eShopOnAbp
+This project is a reference for who want to build microservice solutions with the ABP Framework.
+
+## Pre-requirement
+
+* [Helm](https://helm.sh) must be installed to use the charts.
+Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
+* Install [NGINX ingress](https://kubernetes.github.io/ingress-nginx/deploy/) for k8s or Install NGINX ingress using helm
+  ```powershell
+  helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+  helm repo update
+
+  helm upgrade --install --version=4.0.19 ingress-nginx ingress-nginx/ingress-nginx
+  ```
+
+Once Helm is set up properly, add the repo as follows:
+
+```console
+helm repo add abp-charts https://abpframework.github.io/abp-charts/eshoponabp
+```
+
+Initial authentication data (redirectURIs etc) are seeded based on **eshop-st** name and **eshop** namespace for the deployment.
+
+## Configuring HTTPS
+
+You can also run the staging solution on your local Kubernetes Cluster with HTTPS. There are various ways to create self-signed certificate. 
+
+### Installing mkcert
+This guide will use mkcert to create self-signed certificates.
+
+Follow the [installation guide](https://github.com/FiloSottile/mkcert#installation) to install mkcert.
+
+### Creating mkcert Root CA
+Use the command to create root (local) certificate authority for your certificates:
+```powershell
+mkcert -install
+```
+
+**Note:** all the certificates created by mkcert certificate creation will be trusted by local machine
+
+### Run mkcert
+
+Create certificate for the eshopOnAbp domains using the mkcert command below:
+```powershell
+mkcert "eshop-st-web" "eshop-st-public-web" "eshop-st-authserver" "eshop-st-identity" "eshop-st-administration" "eshop-st-basket" "eshop-st-catalog" "eshop-st-ordering" "eshop-st-payment" "eshop-st-gateway-web" "eshop-st-gateway-web-public"
+```
+
+At the end of the output you will see something like
+
+The certificate is at "./eshop-st-web+10.pem" and the key at "./eshop-st-web+10-key.pem"
+
+Copy the cert name and key name below to create tls secret
+
+```powershell
+kubectl create namespace eshop
+kubectl create secret tls -n eshop eshop-wildcard-tls --cert=./eshop-st-web+10.pem --key=./eshop-st-web+10-key.pem
+```
+
+## How to run?
+
+* Add entries to the hosts file (in Windows: `C:\Windows\System32\drivers\etc\hosts`, in linux and macos: `/etc/hosts` ):
+
+  ````powershell
+  127.0.0.1 eshop-st-web
+  127.0.0.1 eshop-st-public-web
+  127.0.0.1 eshop-st-authserver
+  127.0.0.1 eshop-st-identity
+  127.0.0.1 eshop-st-administration
+  127.0.0.1 eshop-st-basket
+  127.0.0.1 eshop-st-catalog
+  127.0.0.1 eshop-st-ordering
+  127.0.0.1 eshop-st-payment
+  127.0.0.1 eshop-st-gateway-web
+  127.0.0.1 eshop-st-gateway-web-public
+  ````
+
+* Run `helm upgrade --install eshop-st abp-charts/eshoponabp --namespace eshop --create-namespace`
+* *You may wait ~30 seconds on first run for preparing the database*.
+* Browse https://eshop-st-public-web for public and https://eshop-st-web for web application
+* Username: `admin`, password: `1q2w3E*`.
diff --git a/etc/k8s/eshoponabp/charts/authserver/values-st.yaml b/etc/k8s/eshoponabp/charts/authserver/values-st.yaml
new file mode 100644
index 00000000..758862d9
--- /dev/null
+++ b/etc/k8s/eshoponabp/charts/authserver/values-st.yaml
@@ -0,0 +1,20 @@
+config:
+  selfUrl: https://demomicro-st-authserver.eshoponabp.com   
+  corsOrigins: https://demomicro-st-gateway.eshoponabp.com,https://demomicro-st-gateway-public.eshoponabp.com,https://demomicro-st-identity.eshoponabp.com,https://demomicro-st-administration.eshoponabp.com,https://demomicro-st-basket.eshoponabp.com,https://demomicro-st-catalog.eshoponabp.com,https://demomicro-st-order.eshoponabp.com,https://demomicro-st-payment.eshoponabp.com,https://demomicro-st-admin.eshoponabp.com,https://demomicro-st-eshoponabp.com
+  allowedRedirectUrls: https://demomicro-st-admin.eshoponabp.com
+  authServer:
+    authority: https://demomicro-st-authserver.eshoponabp.com
+    requireHttpsMetadata: "false"
+  connectionStrings:
+    administrationService: "Host=postgresdb-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+    identityService: "Host=postgresdb-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
+  dotnetEnv: Production
+  redisHost: redis-redis
+  rabbitmqHost: rabbitmq-rabbitmq
+  elasticsearchHost: elasticsearch-elasticsearch
+ingress:
+  host: demomicro-st-authserver.eshoponabp.com
+  tlsSecret: eshop-wildcard-tls
+image:
+  repository: "volocr.azurecr.io/demomicro/app-authserver"
+  tag: 1.0.1
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml
new file mode 100644
index 00000000..cc837965
--- /dev/null
+++ b/etc/k8s/eshoponabp/values.st.yaml
@@ -0,0 +1,381 @@
+# auth-server sub-chart override
+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
+    allowedRedirectUrls: https://eshop-st-web
+    authServer:
+      authority: http://eshop-st-authserver
+      requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
+    connectionStrings:
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
+    dotnetEnv: Staging
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
+  ingress:
+    host: eshop-st-authserver
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/app-authserver"
+    tag: 1.0.0
+
+# web sub-chart override
+web:
+  config:
+    selfUrl: https://eshop-st-web
+    gatewayUrl: https://eshop-st-gateway-web
+    authServer:
+      authority: http://eshop-st-authserver
+      requireHttpsMetadata: false
+      responseType: "code"
+      strictDiscoveryDocumentValidation: false
+      skipIssuerCheck: true
+  ingress:
+    host: eshop-st-web
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/app-web"
+    tag: 1.0.0
+
+# public-web sub-chart override
+public-web:
+  config:
+    selfUrl: https://eshop-st-public-web
+    gatewayUrl: http://eshop-st-gateway-web-public/
+    authServer:
+      authority: http://eshop-st-authserver
+      requireHttpsMetadata: "false"
+      isOnProd: "false"
+      metaAddress: http://eshop-st-authserver
+    dotnetEnv: Staging
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
+  ingress:
+    host: eshop-st-public-web
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/app-publicweb"
+    tag: 1.0.0
+
+# identity-service sub-chart override
+identity:
+  config:
+    selfUrl: https://eshop-st-identity
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
+    connectionStrings:
+      identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;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    
+  identityServerClients: # Seeded Clients
+    webRootUrl: https://eshop-st-web/  
+    publicWebRootUrl: https://eshop-st-public-web/
+    webGatewayRootUrl: https://eshop-st-gateway-web/
+    publicWebGatewayRootUrl: https://eshop-st-gateway-web-public/
+    identityServiceRootUrl: https://eshop-st-identity/
+    administrationServiceRootUrl: https://eshop-st-administration/
+    accountServiceRootUrl: https://eshop-st-authserver/
+    basketServiceRootUrl: https://eshop-st-basket/
+    catalogServiceRootUrl: https://eshop-st-catalog/
+    orderingServiceRootUrl: https://eshop-st-ordering/
+    paymentServiceRootUrl: https://eshop-st-payment/
+  ingress:
+    host: eshop-st-identity
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/service-identity"
+    tag: 1.0.0
+
+# administration sub-chart override
+administration:
+  config:
+    selfUrl: https://eshop-st-administration
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
+    connectionStrings:
+      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*"
+    remoteServices:
+      abpIdentityBaseUrl: https://eshop-st-identity
+      useCurrentToken: "false"  
+    dotnetEnv: Staging
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
+  synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions
+    authority: https://eshop-st-authserver
+  ingress:
+    host: eshop-st-administration
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/service-administration"
+    tag: 1.0.0
+
+# gateway-web sub-chart override
+gateway-web:
+  config:
+    selfUrl: https://eshop-st-gateway-web
+    corsOrigins: https://eshop-st-web
+    globalConfigurationBaseUrl: http://eshop-st-gateway-public
+    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-gateway-web
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/gateway-web"
+    tag: 1.0.0
+  reRoutes:
+    accountService:
+      url: http://eshop-st-authserver
+    identityService:
+      url: http://eshop-st-identity
+    administrationService:
+      url: http://eshop-st-administration
+    catalogService:
+      url: http://eshop-st-catalog
+    orderingService:
+      url: http://eshop-st-ordering
+
+# gateway-web-public sub-chart override
+gateway-web-public:
+  config:
+    selfUrl: https://eshop-st-gateway-web-public
+    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-gateway-web-public
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/gateway-web-public"
+    tag: 1.0.0
+  reRoutes:
+    accountService:
+      url: http://eshop-st-authserver
+    identityService:
+      url: http://eshop-st-identity
+    administrationService:
+      url: http://eshop-st-administration
+    catalogService:
+      url: http://eshop-st-catalog
+    basketService:
+      url: http://eshop-st-basket
+    orderingService:
+      url: http://eshop-st-ordering
+    paymentService:
+      url: http://eshop-st-payment  
+
+# basket-service sub-chart override
+basket:
+  config:
+    selfUrl: https://eshop-st-basket
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-public-web
+    connectionStrings:
+      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
+    remoteServices:
+      catalogBaseUrl: http://eshop-st-catalog:80
+      catalogGrpcUrl: http://eshop-st-catalog:81
+  ingress:
+    host: eshop-st-basket
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/service-basket"
+    tag: 1.0.0
+
+# catalog-service sub-chart override
+catalog:
+  config:
+    selfUrl: https://eshop-st-catalog
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-public-web,https://eshop-st-web
+    connectionStrings:
+      catalogService: "mongodb://eshop-st-mongodb/EShopOnAbp_Catalog"
+      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
+    kestrel:
+      httpUrl: http://eshop-st-catalog:80
+      httpProtocols: Http1AndHttp2
+      grpcUrl: http://eshop-st-catalog:81
+      grpcProtocols: Http2
+  ingress:
+    host: eshop-st-catalog
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/service-catalog"
+    tag: 1.0.0
+
+# ordering-service sub-chart override
+ordering:
+  config:
+    selfUrl: https://eshop-st-ordering
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
+    connectionStrings:
+      orderingService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;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-ordering
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/service-ordering"
+    tag: 1.0.0
+
+# payment-service sub-chart override
+payment:
+  config:
+    selfUrl: https://eshop-st-payment
+    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
+    connectionStrings:
+      paymentService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Payment;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-payment
+    tlsSecret: eshop-wildcard-tls
+  image:
+    repository: "eshoponabp/service-payment"
+    tag: 1.0.0
+
+# Default values for eshoponabp.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index 46ff2563..8bc098db 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -20,7 +20,7 @@ authserver:
     host: eshop-st-authserver
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/app-authserver"
+    repository: "ghcr.io/volosoft/eshoponabp/app-authserver"
     tag: 1.0.0
 
 # web sub-chart override
@@ -38,13 +38,13 @@ web:
     host: eshop-st-web
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/app-web"
+    repository: "ghcr.io/volosoft/eshoponabp/app-web"
     tag: 1.0.0
 
 # public-web sub-chart override
 public-web:
   config:
-    selfUrl: c
+    selfUrl: https://eshop-st-public-web
     gatewayUrl: http://eshop-st-gateway-web-public/
     authServer:
       authority: http://eshop-st-authserver
@@ -59,7 +59,7 @@ public-web:
     host: eshop-st-public-web
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/app-publicweb"
+    repository: "ghcr.io/volosoft/eshoponabp/app-publicweb"
     tag: 1.0.0
 
 # identity-service sub-chart override
@@ -95,7 +95,7 @@ identity:
     host: eshop-st-identity
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/service-identity"
+    repository: "ghcr.io/volosoft/eshoponabp/service-identity"
     tag: 1.0.0
 
 # administration sub-chart override
@@ -123,7 +123,7 @@ administration:
     host: eshop-st-administration
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/service-administration"
+    repository: "ghcr.io/volosoft/eshoponabp/service-administration"
     tag: 1.0.0
 
 # gateway-web sub-chart override
@@ -145,7 +145,7 @@ gateway-web:
     host: eshop-st-gateway-web
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/gateway-web"
+    repository: "ghcr.io/volosoft/eshoponabp/gateway-web"
     tag: 1.0.0
   reRoutes:
     accountService:
@@ -176,7 +176,7 @@ gateway-web-public:
     host: eshop-st-gateway-web-public
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/gateway-web-public"
+    repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public"
     tag: 1.0.0
   reRoutes:
     accountService:
@@ -217,7 +217,7 @@ basket:
     host: eshop-st-basket
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/service-basket"
+    repository: "ghcr.io/volosoft/eshoponabp/service-basket"
     tag: 1.0.0
 
 # catalog-service sub-chart override
@@ -246,7 +246,7 @@ catalog:
     host: eshop-st-catalog
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/service-catalog"
+    repository: "ghcr.io/volosoft/eshoponabp/service-catalog"
     tag: 1.0.0
 
 # ordering-service sub-chart override
@@ -270,8 +270,8 @@ ordering:
     host: eshop-st-ordering
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/service-ordering"
-    tag: 1.0.0
+    repository: "ghcr.io/volosoft/eshoponabp/service-ordering"
+    tag: 1.0.1
 
 # payment-service sub-chart override
 payment:
@@ -294,7 +294,7 @@ payment:
     host: eshop-st-payment
     tlsSecret: eshop-wildcard-tls
   image:
-    repository: "eshoponabp/service-payment"
+    repository: "ghcr.io/volosoft/eshoponabp/service-payment"
     tag: 1.0.0
 
 # Default values for eshoponabp.