diff --git a/.github/add-repos.sh b/.github/add-repos.sh
index 2064a98..e599c50 100755
--- a/.github/add-repos.sh
+++ b/.github/add-repos.sh
@@ -6,4 +6,4 @@ helm repo add restorecommerce https://restorecommerce.github.io/helm/
 helm repo add minio https://helm.min.io
 helm repo add bitnami https://charts.bitnami.com/bitnami
 helm repo add elastic https://helm.elastic.co
-helm repo add stable https://kubernetes-charts.storage.googleapis.com
\ No newline at end of file
+helm repo add stable https://charts.helm.sh/stable
\ No newline at end of file
diff --git a/.github/ct.yaml b/.github/ct.yaml
index b1b02c2..d5f71a5 100644
--- a/.github/ct.yaml
+++ b/.github/ct.yaml
@@ -10,4 +10,4 @@ chart-repos:
   - minio=https://helm.min.io
   - bitnami=https://charts.bitnami.com/bitnami
   - elastic=https://helm.elastic.co
-  - stable=https://kubernetes-charts.storage.googleapis.com
\ No newline at end of file
+  - stable=https://charts.helm.sh/stable
\ No newline at end of file
diff --git a/README.md b/README.md
index 4ac6234..29a03af 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ This repository contains helm charts for the following services:
 * [access-control-srv](./charts/access-control-srv)
 * [catalog-srv](./charts/catalog-srv)
 * [console](./charts/console)
+* [facade-srv](./charts/facade-srv)
 * [fulfillment-srv](./charts/fulfillment-srv)
 * [identity-srv](./charts/identity-srv)
 * [indexing-srv](./charts/indexing-srv)
@@ -15,6 +16,7 @@ This repository contains helm charts for the following services:
 * [payment-srv](./charts/payment-srv)
 * [pdf-rendering-srv](./charts/pdf-rendering-srv)
 * [rendering-srv](./charts/rendering-srv)
+* [resource-srv](./charts/resource-srv)
 * [scheduling-srv](./charts/scheduling-srv)
 * [store-front](./charts/store-front)
 * [system](./charts/system)
diff --git a/charts/access-control-srv/Chart.yaml b/charts/access-control-srv/Chart.yaml
index 45cf4f1..dc111ee 100644
--- a/charts/access-control-srv/Chart.yaml
+++ b/charts/access-control-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: access-control-srv
 description: A Helm chart for restorecommerce access-control-srv
 type: application
-version: 0.1.2
-appVersion: 0.1.6
+version: 0.1.3
+appVersion: 0.1.17
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/access-control-srv/index.html
 sources:
diff --git a/charts/access-control-srv/README.md b/charts/access-control-srv/README.md
index 5a3b5fe..65ac204 100644
--- a/charts/access-control-srv/README.md
+++ b/charts/access-control-srv/README.md
@@ -1,6 +1,6 @@
 # access-control-srv
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.6](https://img.shields.io/badge/AppVersion-0.1.6-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.17](https://img.shields.io/badge/AppVersion-0.1.17-informational?style=flat-square)
 
 A Helm chart for restorecommerce access-control-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce access-control-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/access-control-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.1.6"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/access-control-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/access-control-srv/values.yaml b/charts/access-control-srv/values.yaml
index ac9c9e7..c65bc85 100644
--- a/charts/access-control-srv/values.yaml
+++ b/charts/access-control-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/access-control-srv
+  repository: ghcr.io/restorecommerce/access-control-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.1.6
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/catalog-srv/Chart.yaml b/charts/catalog-srv/Chart.yaml
index e22e122..650b3ae 100644
--- a/charts/catalog-srv/Chart.yaml
+++ b/charts/catalog-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: catalog-srv
 description: A Helm chart for restorecommerce catalog-srv
 type: application
-version: 0.1.0
-appVersion: 0.0.3
+version: 0.1.1
+appVersion: 0.0.4
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/catalog-srv/index.html
 sources:
diff --git a/charts/catalog-srv/README.md b/charts/catalog-srv/README.md
index d6d8a59..4502002 100644
--- a/charts/catalog-srv/README.md
+++ b/charts/catalog-srv/README.md
@@ -1,6 +1,6 @@
 # catalog-srv
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.3](https://img.shields.io/badge/AppVersion-0.0.3-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.4](https://img.shields.io/badge/AppVersion-0.0.4-informational?style=flat-square)
 
 A Helm chart for restorecommerce catalog-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce catalog-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/catalog-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.0.3"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/catalog-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/catalog-srv/values.yaml b/charts/catalog-srv/values.yaml
index a8ab01b..cf053e4 100644
--- a/charts/catalog-srv/values.yaml
+++ b/charts/catalog-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/catalog-srv
+  repository: ghcr.io/restorecommerce/catalog-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.0.3
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/facade-srv/.helmignore b/charts/facade-srv/.helmignore
new file mode 100644
index 0000000..0e8a0eb
--- /dev/null
+++ b/charts/facade-srv/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/facade-srv/Chart.yaml b/charts/facade-srv/Chart.yaml
new file mode 100644
index 0000000..e225527
--- /dev/null
+++ b/charts/facade-srv/Chart.yaml
@@ -0,0 +1,14 @@
+apiVersion: v2
+name: facade-srv
+description: A Helm chart for restorecommerce facade-srv
+type: application
+version: 0.1.0
+appVersion: 0.1.3
+icon: https://avatars0.githubusercontent.com/u/8339525
+home: https://docs.restorecommerce.io/facade-srv/index.html
+sources:
+  - https://github.com/restorecommerce/facade-srv
+maintainers:
+  - name: restorecommerce
+    url: https://restorecommerce.io/
+    email: info@restorecommerce.io
diff --git a/charts/facade-srv/README.md b/charts/facade-srv/README.md
new file mode 100644
index 0000000..f5e7594
--- /dev/null
+++ b/charts/facade-srv/README.md
@@ -0,0 +1,51 @@
+# facade-srv
+
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.3](https://img.shields.io/badge/AppVersion-0.1.3-informational?style=flat-square)
+
+A Helm chart for restorecommerce facade-srv
+
+**Homepage:** <https://docs.restorecommerce.io/facade-srv/index.html>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| restorecommerce | info@restorecommerce.io | https://restorecommerce.io/ |
+
+## Source Code
+
+* <https://github.com/restorecommerce/facade-srv>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Specify the affinity for all pods |
+| autoscaling.enabled | bool | `false` | Enable HPA |
+| autoscaling.maxReplicas | int | `100` | Max amount of replicas for HPA |
+| autoscaling.minReplicas | int | `1` | Min amount of replicas for HPA |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU usage for HPA |
+| autoscaling.targetMemoryUtilizationPercentage | int | `80` | Target memory usage for HPA |
+| config.file | string | `"config_production_override.json"` | Name of the file in the config map |
+| config.literal | string | `""` | Provide the literal config through this string. Has to be in a JSON format |
+| config.name | string | `""` | Name of the config map to be mounted. If specified, config will be appended to the node environment automatically |
+| env.extras | list | `[]` | Any extra environment variables appended to all pods |
+| env.nodeEnv | string | `"production"` | The selected node environment and config |
+| fullnameOverride | string | `""` | Full name override for all resources |
+| image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
+| image.repository | string | `"ghcr.io/restorecommerce/facade-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
+| imagePullSecrets | list | `[]` | List of secrets for images |
+| nameOverride | string | `""` | Name override for all resources |
+| nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
+| podAnnotations | object | `{}` | Any extra annotations for all pods |
+| podSecurityContext | object | `{}` | Security context override for all pods |
+| replicaCount | int | `1` | Replica count of the deployment |
+| resources | object | `{}` | Any resource configuration applied to all pods |
+| securityContext | object | `{}` | Security context override for all containers |
+| service.port | int | `5000` | Port to be exposed on the service |
+| service.type | string | `"ClusterIP"` | Service type to be used |
+| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and serviceAccount.create is true, a name is generated using the fullname template |
+| tolerations | list | `[]` | Specify the tolerations for all pods |
diff --git a/charts/facade-srv/templates/_helpers.tpl b/charts/facade-srv/templates/_helpers.tpl
new file mode 100644
index 0000000..468f741
--- /dev/null
+++ b/charts/facade-srv/templates/_helpers.tpl
@@ -0,0 +1,76 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "facade-srv.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "facade-srv.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "facade-srv.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "facade-srv.labels" -}}
+helm.sh/chart: {{ include "facade-srv.chart" . }}
+{{ include "facade-srv.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "facade-srv.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "facade-srv.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "facade-srv.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "facade-srv.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the NODE_ENV variable.
+*/}}
+{{- define "facade-srv.nodeEnv" -}}
+{{- if .Values.config.name }}
+{{- printf "%s:%s" .Values.env.nodeEnv (.Values.config.file | trimPrefix (printf "config_%s_" .Values.env.nodeEnv) | trimSuffix  ".json") }}
+{{- else if .Values.config.literal }}
+{{- printf "%s:override" .Values.env.nodeEnv }}
+{{- else }}
+{{- printf "%s" .Values.env.nodeEnv }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/facade-srv/templates/configmap.yaml b/charts/facade-srv/templates/configmap.yaml
new file mode 100644
index 0000000..857fa25
--- /dev/null
+++ b/charts/facade-srv/templates/configmap.yaml
@@ -0,0 +1,10 @@
+{{- if .Values.config.literal }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "facade-srv.fullname" . }}-config"
+  labels:
+    {{- include "facade-srv.labels" . | nindent 4 }}
+data:
+  config_production_override.json: {{ .Values.config.literal | quote }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/facade-srv/templates/deployment.yaml b/charts/facade-srv/templates/deployment.yaml
new file mode 100644
index 0000000..9727b2f
--- /dev/null
+++ b/charts/facade-srv/templates/deployment.yaml
@@ -0,0 +1,77 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "facade-srv.fullname" . }}
+  labels:
+    {{- include "facade-srv.labels" . | nindent 4 }}
+spec:
+{{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+{{- end }}
+  selector:
+    matchLabels:
+      {{- include "facade-srv.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "facade-srv.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "facade-srv.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: grpc
+              containerPort: 50051
+              protocol: TCP
+          env:
+            - name: NODE_ENV
+              value: {{ include "facade-srv.nodeEnv" . }}
+            {{- if .Values.env.extras }}
+            {{- toYaml .Values.env.extras | nindent 12 }}
+            {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            {{- if or .Values.config.name .Values.config.literal }}
+            - name: config
+              mountPath: "/home/node/facade-srv/cfg/config_{{ .Values.env.nodeEnv }}_override.json"
+              subPath: {{ .Values.config.file | quote }}
+            {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        {{- if or .Values.config.name .Values.config.literal }}
+        - name: config
+          configMap:
+            {{- with .Values.config.name }}
+            name: {{ . | quote }}
+            {{- end }}
+            {{- if .Values.config.literal }}
+            name: "{{ include "facade-srv.fullname" . }}-config"
+            {{- end }}
+        {{- end }}
diff --git a/charts/facade-srv/templates/hpa.yaml b/charts/facade-srv/templates/hpa.yaml
new file mode 100644
index 0000000..29b932b
--- /dev/null
+++ b/charts/facade-srv/templates/hpa.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "facade-srv.fullname" . }}
+  labels:
+    {{- include "facade-srv.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "facade-srv.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}
+  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- end }}
+{{- end }}
diff --git a/charts/facade-srv/templates/service.yaml b/charts/facade-srv/templates/service.yaml
new file mode 100644
index 0000000..02c2008
--- /dev/null
+++ b/charts/facade-srv/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "facade-srv.fullname" . }}
+  labels:
+    {{- include "facade-srv.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
+  selector:
+    {{- include "facade-srv.selectorLabels" . | nindent 4 }}
diff --git a/charts/facade-srv/templates/serviceaccount.yaml b/charts/facade-srv/templates/serviceaccount.yaml
new file mode 100644
index 0000000..a11a393
--- /dev/null
+++ b/charts/facade-srv/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "facade-srv.serviceAccountName" . }}
+  labels:
+    {{- include "facade-srv.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/facade-srv/values.yaml b/charts/facade-srv/values.yaml
new file mode 100644
index 0000000..bc8b89c
--- /dev/null
+++ b/charts/facade-srv/values.yaml
@@ -0,0 +1,111 @@
+# Default values for facade-srv.
+
+# replicaCount -- Replica count of the deployment
+replicaCount: 1
+
+image:
+  # image.repository -- Image to be used for deployment
+  repository: ghcr.io/restorecommerce/facade-srv
+
+  # image.pullPolicy -- Pull policy of the deployment
+  pullPolicy: Always
+
+  # image.tag -- Image tag
+  tag: ""
+
+# imagePullSecrets -- List of secrets for images
+imagePullSecrets: []
+
+# nameOverride -- Name override for all resources
+nameOverride: ""
+
+# fullnameOverride -- Full name override for all resources
+fullnameOverride: ""
+
+serviceAccount:
+  # serviceAccount.create -- Specifies whether a service account should be created
+  create: true
+
+  # serviceAccount.annotations -- Annotations to add to the service account
+  annotations: {}
+
+  # serviceAccount.name -- The name of the service account to use.
+  # If not set and serviceAccount.create is true, a name is generated using the fullname template
+  name: ""
+
+# podAnnotations -- Any extra annotations for all pods
+podAnnotations: {}
+
+# podSecurityContext -- Security context override for all pods
+podSecurityContext: {}
+  # fsGroup: 2000
+
+# securityContext -- Security context override for all containers
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  # service.type -- Service type to be used
+  type: ClusterIP
+
+  # service.port -- Port to be exposed on the service
+  port: 5000
+
+# resources -- Any resource configuration applied to all pods
+resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  # autoscaling.enabled -- Enable HPA
+  enabled: false
+
+  # autoscaling.minReplicas -- Min amount of replicas for HPA
+  minReplicas: 1
+
+  # autoscaling.maxReplicas -- Max amount of replicas for HPA
+  maxReplicas: 100
+
+  # autoscaling.targetCPUUtilizationPercentage -- Target CPU usage for HPA
+  targetCPUUtilizationPercentage: 80
+
+  # autoscaling.targetMemoryUtilizationPercentage -- Target memory usage for HPA
+  targetMemoryUtilizationPercentage: 80
+
+# nodeSelector -- Specify the nodeSelector for all pods
+nodeSelector: {}
+
+# tolerations -- Specify the tolerations for all pods
+tolerations: []
+
+# affinity -- Specify the affinity for all pods
+affinity: {}
+
+env:
+  # env.nodeEnv -- The selected node environment and config
+  nodeEnv: production
+
+  # env.extras -- Any extra environment variables appended to all pods
+  extras: []
+
+# Override the config of the container
+config:
+  # config.name -- Name of the config map to be mounted.
+  # If specified, config will be appended to the node environment automatically
+  name: ""
+
+  # config.file -- Name of the file in the config map
+  file: "config_production_override.json"
+
+  # config.literal -- Provide the literal config through this string.
+  # Has to be in a JSON format
+  literal: ""
diff --git a/charts/fulfillment-srv/Chart.yaml b/charts/fulfillment-srv/Chart.yaml
index ba9e22c..f5297a6 100644
--- a/charts/fulfillment-srv/Chart.yaml
+++ b/charts/fulfillment-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: fulfillment-srv
 description: A Helm chart for restorecommerce fulfillment-srv
 type: application
-version: 0.1.0
-appVersion: 0.0.17
+version: 0.1.1
+appVersion: 0.0.19
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/fulfillment-srv/index.html
 sources:
diff --git a/charts/fulfillment-srv/README.md b/charts/fulfillment-srv/README.md
index 84ebc5e..8896deb 100644
--- a/charts/fulfillment-srv/README.md
+++ b/charts/fulfillment-srv/README.md
@@ -1,6 +1,6 @@
 # fulfillment-srv
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.17](https://img.shields.io/badge/AppVersion-0.0.17-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.19](https://img.shields.io/badge/AppVersion-0.0.19-informational?style=flat-square)
 
 A Helm chart for restorecommerce fulfillment-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce fulfillment-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/fulfillment-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.0.17"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/fulfillment-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/fulfillment-srv/values.yaml b/charts/fulfillment-srv/values.yaml
index b15571d..391081d 100644
--- a/charts/fulfillment-srv/values.yaml
+++ b/charts/fulfillment-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/fulfillment-srv
+  repository: ghcr.io/restorecommerce/fulfillment-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.0.17
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/identity-srv/Chart.yaml b/charts/identity-srv/Chart.yaml
index d49adba..865c8f4 100644
--- a/charts/identity-srv/Chart.yaml
+++ b/charts/identity-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: identity-srv
 description: A Helm chart for restorecommerce identity-srv
 type: application
-version: 0.1.3
-appVersion: 0.1.12
+version: 0.1.4
+appVersion: 0.1.28
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/identity-srv/index.html
 sources:
diff --git a/charts/identity-srv/README.md b/charts/identity-srv/README.md
index 13c3766..838668b 100644
--- a/charts/identity-srv/README.md
+++ b/charts/identity-srv/README.md
@@ -1,6 +1,6 @@
 # identity-srv
 
-![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.12](https://img.shields.io/badge/AppVersion-0.1.12-informational?style=flat-square)
+![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.28](https://img.shields.io/badge/AppVersion-0.1.28-informational?style=flat-square)
 
 A Helm chart for restorecommerce identity-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce identity-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/identity-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.1.12"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/identity-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/identity-srv/values.yaml b/charts/identity-srv/values.yaml
index 5942682..b89b2a6 100644
--- a/charts/identity-srv/values.yaml
+++ b/charts/identity-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/identity-srv
+  repository: ghcr.io/restorecommerce/identity-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.1.12
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/indexing-srv/Chart.yaml b/charts/indexing-srv/Chart.yaml
index 743e334..c0f377e 100644
--- a/charts/indexing-srv/Chart.yaml
+++ b/charts/indexing-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: indexing-srv
 description: A Helm chart for restorecommerce indexing-srv
 type: application
-version: 0.1.0
-appVersion: 0.0.13
+version: 0.1.1
+appVersion: 0.0.15
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/indexing-srv/index.html
 sources:
diff --git a/charts/indexing-srv/README.md b/charts/indexing-srv/README.md
index f2b32a8..b26212d 100644
--- a/charts/indexing-srv/README.md
+++ b/charts/indexing-srv/README.md
@@ -1,6 +1,6 @@
 # indexing-srv
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.13](https://img.shields.io/badge/AppVersion-0.0.13-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.15](https://img.shields.io/badge/AppVersion-0.0.15-informational?style=flat-square)
 
 A Helm chart for restorecommerce indexing-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce indexing-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/indexing-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.0.13"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/indexing-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/indexing-srv/values.yaml b/charts/indexing-srv/values.yaml
index b16ea6a..e0df6e7 100644
--- a/charts/indexing-srv/values.yaml
+++ b/charts/indexing-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/indexing-srv
+  repository: ghcr.io/restorecommerce/indexing-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.0.13
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/invoicing-srv/Chart.yaml b/charts/invoicing-srv/Chart.yaml
index 87e12c5..654771c 100644
--- a/charts/invoicing-srv/Chart.yaml
+++ b/charts/invoicing-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: invoicing-srv
 description: A Helm chart for restorecommerce invoicing-srv
 type: application
-version: 0.1.0
-appVersion: 0.0.8
+version: 0.1.1
+appVersion: 0.0.10
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/invoicing-srv/index.html
 sources:
diff --git a/charts/invoicing-srv/README.md b/charts/invoicing-srv/README.md
index e8d9a57..120d4e0 100644
--- a/charts/invoicing-srv/README.md
+++ b/charts/invoicing-srv/README.md
@@ -1,6 +1,6 @@
 # invoicing-srv
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.8](https://img.shields.io/badge/AppVersion-0.0.8-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.10](https://img.shields.io/badge/AppVersion-0.0.10-informational?style=flat-square)
 
 A Helm chart for restorecommerce invoicing-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce invoicing-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/invoicing-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.0.8"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/invoicing-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/invoicing-srv/values.yaml b/charts/invoicing-srv/values.yaml
index ca85de3..bb7b124 100644
--- a/charts/invoicing-srv/values.yaml
+++ b/charts/invoicing-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/invoicing-srv
+  repository: ghcr.io/restorecommerce/invoicing-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.0.8
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/notification-srv/Chart.yaml b/charts/notification-srv/Chart.yaml
index 380018e..22de06e 100644
--- a/charts/notification-srv/Chart.yaml
+++ b/charts/notification-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: notification-srv
 description: A Helm chart for restorecommerce notification-srv
 type: application
-version: 0.1.2
-appVersion: 0.1.5
+version: 0.1.3
+appVersion: 0.1.15
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/notification-srv/index.html
 sources:
diff --git a/charts/notification-srv/README.md b/charts/notification-srv/README.md
index 12abb32..843bb2f 100644
--- a/charts/notification-srv/README.md
+++ b/charts/notification-srv/README.md
@@ -1,6 +1,6 @@
 # notification-srv
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.5](https://img.shields.io/badge/AppVersion-0.1.5-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.15](https://img.shields.io/badge/AppVersion-0.1.15-informational?style=flat-square)
 
 A Helm chart for restorecommerce notification-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce notification-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/notification-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.1.5"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/notification-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/notification-srv/values.yaml b/charts/notification-srv/values.yaml
index c4ad198..8383982 100644
--- a/charts/notification-srv/values.yaml
+++ b/charts/notification-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/notification-srv
+  repository: ghcr.io/restorecommerce/notification-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.1.5
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/ordering-srv/Chart.yaml b/charts/ordering-srv/Chart.yaml
index 6321cc5..544acd1 100644
--- a/charts/ordering-srv/Chart.yaml
+++ b/charts/ordering-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: ordering-srv
 description: A Helm chart for restorecommerce ordering-srv
 type: application
-version: 0.1.0
-appVersion: 0.0.3
+version: 0.1.1
+appVersion: 0.0.4
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/ordering-srv/index.html
 sources:
diff --git a/charts/ordering-srv/README.md b/charts/ordering-srv/README.md
index d65d366..f1046da 100644
--- a/charts/ordering-srv/README.md
+++ b/charts/ordering-srv/README.md
@@ -1,6 +1,6 @@
 # ordering-srv
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.3](https://img.shields.io/badge/AppVersion-0.0.3-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.4](https://img.shields.io/badge/AppVersion-0.0.4-informational?style=flat-square)
 
 A Helm chart for restorecommerce ordering-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce ordering-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/ordering-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.0.3"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/ordering-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/ordering-srv/values.yaml b/charts/ordering-srv/values.yaml
index d4f8865..703879e 100644
--- a/charts/ordering-srv/values.yaml
+++ b/charts/ordering-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/ordering-srv
+  repository: ghcr.io/restorecommerce/ordering-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.0.3
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/ostorage-srv/Chart.yaml b/charts/ostorage-srv/Chart.yaml
index 5799e4b..b8862ea 100644
--- a/charts/ostorage-srv/Chart.yaml
+++ b/charts/ostorage-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: ostorage-srv
 description: A Helm chart for restorecommerce ostorage-srv
 type: application
-version: 0.1.2
-appVersion: 0.1.6
+version: 0.1.3
+appVersion: 0.1.23
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/ostorage-srv/index.html
 sources:
diff --git a/charts/ostorage-srv/README.md b/charts/ostorage-srv/README.md
index 7f55c73..c52eba6 100644
--- a/charts/ostorage-srv/README.md
+++ b/charts/ostorage-srv/README.md
@@ -1,6 +1,6 @@
 # ostorage-srv
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.6](https://img.shields.io/badge/AppVersion-0.1.6-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.23](https://img.shields.io/badge/AppVersion-0.1.23-informational?style=flat-square)
 
 A Helm chart for restorecommerce ostorage-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce ostorage-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/ostorage-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.1.6"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/ostorage-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/ostorage-srv/values.yaml b/charts/ostorage-srv/values.yaml
index 6c191d3..eaee998 100644
--- a/charts/ostorage-srv/values.yaml
+++ b/charts/ostorage-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/ostorage-srv
+  repository: ghcr.io/restorecommerce/ostorage-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.1.6
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/payment-srv/Chart.yaml b/charts/payment-srv/Chart.yaml
index 133210b..15719af 100644
--- a/charts/payment-srv/Chart.yaml
+++ b/charts/payment-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: payment-srv
 description: A Helm chart for restorecommerce payment-srv
 type: application
-version: 0.1.0
-appVersion: 0.0.2
+version: 0.1.2
+appVersion: 0.0.3
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/payment-srv/index.html
 sources:
diff --git a/charts/payment-srv/README.md b/charts/payment-srv/README.md
index 971642f..0da8e6b 100644
--- a/charts/payment-srv/README.md
+++ b/charts/payment-srv/README.md
@@ -1,6 +1,6 @@
 # payment-srv
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.2](https://img.shields.io/badge/AppVersion-0.0.2-informational?style=flat-square)
+![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.3](https://img.shields.io/badge/AppVersion-0.0.3-informational?style=flat-square)
 
 A Helm chart for restorecommerce payment-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce payment-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/payment-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.0.2"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/payment-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/payment-srv/values.yaml b/charts/payment-srv/values.yaml
index 24337b9..f0875f6 100644
--- a/charts/payment-srv/values.yaml
+++ b/charts/payment-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/payment-srv
+  repository: ghcr.io/restorecommerce/payment-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.0.2
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/rendering-srv/Chart.yaml b/charts/rendering-srv/Chart.yaml
index 7c7737f..8ddf7cd 100644
--- a/charts/rendering-srv/Chart.yaml
+++ b/charts/rendering-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: rendering-srv
 description: A Helm chart for restorecommerce rendering-srv
 type: application
-version: 0.1.2
-appVersion: 0.1.5
+version: 0.1.3
+appVersion: 0.1.14
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/rendering-srv/index.html
 sources:
diff --git a/charts/rendering-srv/README.md b/charts/rendering-srv/README.md
index 2ada78c..58284a4 100644
--- a/charts/rendering-srv/README.md
+++ b/charts/rendering-srv/README.md
@@ -1,6 +1,6 @@
 # rendering-srv
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.5](https://img.shields.io/badge/AppVersion-0.1.5-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.14](https://img.shields.io/badge/AppVersion-0.1.14-informational?style=flat-square)
 
 A Helm chart for restorecommerce rendering-srv
 
@@ -34,8 +34,8 @@ A Helm chart for restorecommerce rendering-srv
 | fullnameOverride | string | `""` | Full name override for all resources |
 | handlebars | object | `{"helper-list.js":"module.exports = function listHandlebarsExtensions(hbs, opts) {\n  hbs.registerHelper(\"list\", function(items, options) {\n    const itemsAsHtml = items.map(item => \"<li>\" + options.fn(item) + \"</li>\");\n    return \"<ul>\\n\" + itemsAsHtml.join(\"\\n\") + \"\\n</ul>\";\n  });\n};\n"}` | Handlebar helpers to be injected in the container More information: https://github.com/restorecommerce/handlebars-helperized |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/rendering-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.1.5"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/rendering-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/rendering-srv/values.yaml b/charts/rendering-srv/values.yaml
index ee1c33e..c739583 100644
--- a/charts/rendering-srv/values.yaml
+++ b/charts/rendering-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/rendering-srv
+  repository: ghcr.io/restorecommerce/rendering-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.1.5
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/charts/resource-srv/.helmignore b/charts/resource-srv/.helmignore
new file mode 100644
index 0000000..0e8a0eb
--- /dev/null
+++ b/charts/resource-srv/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/resource-srv/Chart.yaml b/charts/resource-srv/Chart.yaml
new file mode 100644
index 0000000..55ec8b8
--- /dev/null
+++ b/charts/resource-srv/Chart.yaml
@@ -0,0 +1,14 @@
+apiVersion: v2
+name: resource-srv
+description: A Helm chart for restorecommerce resource-srv
+type: application
+version: 0.1.0
+appVersion: 0.0.12
+icon: https://avatars0.githubusercontent.com/u/8339525
+home: https://docs.restorecommerce.io/resource-srv/index.html
+sources:
+  - https://github.com/restorecommerce/resource-srv
+maintainers:
+  - name: restorecommerce
+    url: https://restorecommerce.io/
+    email: info@restorecommerce.io
diff --git a/charts/resource-srv/README.md b/charts/resource-srv/README.md
new file mode 100644
index 0000000..b72691f
--- /dev/null
+++ b/charts/resource-srv/README.md
@@ -0,0 +1,51 @@
+# resource-srv
+
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.12](https://img.shields.io/badge/AppVersion-0.0.12-informational?style=flat-square)
+
+A Helm chart for restorecommerce resource-srv
+
+**Homepage:** <https://docs.restorecommerce.io/resource-srv/index.html>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| restorecommerce | info@restorecommerce.io | https://restorecommerce.io/ |
+
+## Source Code
+
+* <https://github.com/restorecommerce/resource-srv>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Specify the affinity for all pods |
+| autoscaling.enabled | bool | `false` | Enable HPA |
+| autoscaling.maxReplicas | int | `100` | Max amount of replicas for HPA |
+| autoscaling.minReplicas | int | `1` | Min amount of replicas for HPA |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU usage for HPA |
+| autoscaling.targetMemoryUtilizationPercentage | int | `80` | Target memory usage for HPA |
+| config.file | string | `"config_production_override.json"` | Name of the file in the config map |
+| config.literal | string | `""` | Provide the literal config through this string. Has to be in a JSON format |
+| config.name | string | `""` | Name of the config map to be mounted. If specified, config will be appended to the node environment automatically |
+| env.extras | list | `[]` | Any extra environment variables appended to all pods |
+| env.nodeEnv | string | `"production"` | The selected node environment and config |
+| fullnameOverride | string | `""` | Full name override for all resources |
+| image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
+| image.repository | string | `"ghcr.io/restorecommerce/resource-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
+| imagePullSecrets | list | `[]` | List of secrets for images |
+| nameOverride | string | `""` | Name override for all resources |
+| nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
+| podAnnotations | object | `{}` | Any extra annotations for all pods |
+| podSecurityContext | object | `{}` | Security context override for all pods |
+| replicaCount | int | `1` | Replica count of the deployment |
+| resources | object | `{}` | Any resource configuration applied to all pods |
+| securityContext | object | `{}` | Security context override for all containers |
+| service.port | int | `50051` | Port to be exposed on the service |
+| service.type | string | `"ClusterIP"` | Service type to be used |
+| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and serviceAccount.create is true, a name is generated using the fullname template |
+| tolerations | list | `[]` | Specify the tolerations for all pods |
diff --git a/charts/resource-srv/templates/_helpers.tpl b/charts/resource-srv/templates/_helpers.tpl
new file mode 100644
index 0000000..7fc9d1d
--- /dev/null
+++ b/charts/resource-srv/templates/_helpers.tpl
@@ -0,0 +1,76 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "resource-srv.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "resource-srv.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "resource-srv.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "resource-srv.labels" -}}
+helm.sh/chart: {{ include "resource-srv.chart" . }}
+{{ include "resource-srv.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "resource-srv.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "resource-srv.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "resource-srv.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "resource-srv.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the NODE_ENV variable.
+*/}}
+{{- define "resource-srv.nodeEnv" -}}
+{{- if .Values.config.name }}
+{{- printf "%s:%s" .Values.env.nodeEnv (.Values.config.file | trimPrefix (printf "config_%s_" .Values.env.nodeEnv) | trimSuffix  ".json") }}
+{{- else if .Values.config.literal }}
+{{- printf "%s:override" .Values.env.nodeEnv }}
+{{- else }}
+{{- printf "%s" .Values.env.nodeEnv }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/resource-srv/templates/configmap.yaml b/charts/resource-srv/templates/configmap.yaml
new file mode 100644
index 0000000..0b68d00
--- /dev/null
+++ b/charts/resource-srv/templates/configmap.yaml
@@ -0,0 +1,10 @@
+{{- if .Values.config.literal }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "resource-srv.fullname" . }}-config"
+  labels:
+    {{- include "resource-srv.labels" . | nindent 4 }}
+data:
+  config_production_override.json: {{ .Values.config.literal | quote }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/resource-srv/templates/deployment.yaml b/charts/resource-srv/templates/deployment.yaml
new file mode 100644
index 0000000..66cb16e
--- /dev/null
+++ b/charts/resource-srv/templates/deployment.yaml
@@ -0,0 +1,92 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "resource-srv.fullname" . }}
+  labels:
+    {{- include "resource-srv.labels" . | nindent 4 }}
+spec:
+{{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+{{- end }}
+  selector:
+    matchLabels:
+      {{- include "resource-srv.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "resource-srv.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "resource-srv.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: grpc
+              containerPort: 50051
+              protocol: TCP
+          env:
+            - name: NODE_ENV
+              value: {{ include "resource-srv.nodeEnv" . }}
+            {{- if .Values.env.extras }}
+            {{- toYaml .Values.env.extras | nindent 12 }}
+            {{- end }}
+          livenessProbe:
+            initialDelaySeconds: 10
+            periodSeconds: 30
+            exec:
+              command:
+                - /bin/grpc_health_probe
+                - -addr=:50051
+          readinessProbe:
+            initialDelaySeconds: 10
+            periodSeconds: 15
+            exec:
+              command:
+                - /bin/grpc_health_probe
+                - -addr=:50051
+                - -service=readiness
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            {{- if or .Values.config.name .Values.config.literal }}
+            - name: config
+              mountPath: "/home/node/resource-srv/cfg/config_{{ .Values.env.nodeEnv }}_override.json"
+              subPath: {{ .Values.config.file | quote }}
+            {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        {{- if or .Values.config.name .Values.config.literal }}
+        - name: config
+          configMap:
+            {{- with .Values.config.name }}
+            name: {{ . | quote }}
+            {{- end }}
+            {{- if .Values.config.literal }}
+            name: "{{ include "resource-srv.fullname" . }}-config"
+            {{- end }}
+        {{- end }}
diff --git a/charts/resource-srv/templates/hpa.yaml b/charts/resource-srv/templates/hpa.yaml
new file mode 100644
index 0000000..1eff125
--- /dev/null
+++ b/charts/resource-srv/templates/hpa.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "resource-srv.fullname" . }}
+  labels:
+    {{- include "resource-srv.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "resource-srv.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}
+  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- end }}
+{{- end }}
diff --git a/charts/resource-srv/templates/service.yaml b/charts/resource-srv/templates/service.yaml
new file mode 100644
index 0000000..1ddd29d
--- /dev/null
+++ b/charts/resource-srv/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "resource-srv.fullname" . }}
+  labels:
+    {{- include "resource-srv.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
+  selector:
+    {{- include "resource-srv.selectorLabels" . | nindent 4 }}
diff --git a/charts/resource-srv/templates/serviceaccount.yaml b/charts/resource-srv/templates/serviceaccount.yaml
new file mode 100644
index 0000000..1e98143
--- /dev/null
+++ b/charts/resource-srv/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "resource-srv.serviceAccountName" . }}
+  labels:
+    {{- include "resource-srv.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/resource-srv/values.yaml b/charts/resource-srv/values.yaml
new file mode 100644
index 0000000..bc486e0
--- /dev/null
+++ b/charts/resource-srv/values.yaml
@@ -0,0 +1,111 @@
+# Default values for resource-srv.
+
+# replicaCount -- Replica count of the deployment
+replicaCount: 1
+
+image:
+  # image.repository -- Image to be used for deployment
+  repository: ghcr.io/restorecommerce/resource-srv
+
+  # image.pullPolicy -- Pull policy of the deployment
+  pullPolicy: Always
+
+  # image.tag -- Image tag
+  tag: ""
+
+# imagePullSecrets -- List of secrets for images
+imagePullSecrets: []
+
+# nameOverride -- Name override for all resources
+nameOverride: ""
+
+# fullnameOverride -- Full name override for all resources
+fullnameOverride: ""
+
+serviceAccount:
+  # serviceAccount.create -- Specifies whether a service account should be created
+  create: true
+
+  # serviceAccount.annotations -- Annotations to add to the service account
+  annotations: {}
+
+  # serviceAccount.name -- The name of the service account to use.
+  # If not set and serviceAccount.create is true, a name is generated using the fullname template
+  name: ""
+
+# podAnnotations -- Any extra annotations for all pods
+podAnnotations: {}
+
+# podSecurityContext -- Security context override for all pods
+podSecurityContext: {}
+  # fsGroup: 2000
+
+# securityContext -- Security context override for all containers
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  # service.type -- Service type to be used
+  type: ClusterIP
+
+  # service.port -- Port to be exposed on the service
+  port: 50051
+
+# resources -- Any resource configuration applied to all pods
+resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  # autoscaling.enabled -- Enable HPA
+  enabled: false
+
+  # autoscaling.minReplicas -- Min amount of replicas for HPA
+  minReplicas: 1
+
+  # autoscaling.maxReplicas -- Max amount of replicas for HPA
+  maxReplicas: 100
+
+  # autoscaling.targetCPUUtilizationPercentage -- Target CPU usage for HPA
+  targetCPUUtilizationPercentage: 80
+
+  # autoscaling.targetMemoryUtilizationPercentage -- Target memory usage for HPA
+  targetMemoryUtilizationPercentage: 80
+
+# nodeSelector -- Specify the nodeSelector for all pods
+nodeSelector: {}
+
+# tolerations -- Specify the tolerations for all pods
+tolerations: []
+
+# affinity -- Specify the affinity for all pods
+affinity: {}
+
+env:
+  # env.nodeEnv -- The selected node environment and config
+  nodeEnv: production
+
+  # env.extras -- Any extra environment variables appended to all pods
+  extras: []
+
+# Override the config of the container
+config:
+  # config.name -- Name of the config map to be mounted.
+  # If specified, config will be appended to the node environment automatically
+  name: ""
+
+  # config.file -- Name of the file in the config map
+  file: "config_production_override.json"
+
+  # config.literal -- Provide the literal config through this string.
+  # Has to be in a JSON format
+  literal: ""
diff --git a/charts/scheduling-srv/Chart.yaml b/charts/scheduling-srv/Chart.yaml
index 4090c8e..4e83eaa 100644
--- a/charts/scheduling-srv/Chart.yaml
+++ b/charts/scheduling-srv/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: scheduling-srv
 description: A Helm chart for restorecommerce scheduling-srv
 type: application
-version: 0.1.2
-appVersion: 0.1.7
+version: 0.1.3
+appVersion: 0.1.18
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://docs.restorecommerce.io/scheduling-srv/index.html
 sources:
diff --git a/charts/scheduling-srv/README.md b/charts/scheduling-srv/README.md
index 77f6941..d143d0f 100644
--- a/charts/scheduling-srv/README.md
+++ b/charts/scheduling-srv/README.md
@@ -1,6 +1,6 @@
 # scheduling-srv
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.7](https://img.shields.io/badge/AppVersion-0.1.7-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.18](https://img.shields.io/badge/AppVersion-0.1.18-informational?style=flat-square)
 
 A Helm chart for restorecommerce scheduling-srv
 
@@ -33,8 +33,8 @@ A Helm chart for restorecommerce scheduling-srv
 | env.nodeEnv | string | `"production"` | The selected node environment and config |
 | fullnameOverride | string | `""` | Full name override for all resources |
 | image.pullPolicy | string | `"Always"` | Pull policy of the deployment |
-| image.repository | string | `"restorecommerce/scheduling-srv"` | Image to be used for deployment |
-| image.tag | string | `"0.1.7"` | Image tag |
+| image.repository | string | `"ghcr.io/restorecommerce/scheduling-srv"` | Image to be used for deployment |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | List of secrets for images |
 | nameOverride | string | `""` | Name override for all resources |
 | nodeSelector | object | `{}` | Specify the nodeSelector for all pods |
diff --git a/charts/scheduling-srv/values.yaml b/charts/scheduling-srv/values.yaml
index cdc9357..1606365 100644
--- a/charts/scheduling-srv/values.yaml
+++ b/charts/scheduling-srv/values.yaml
@@ -5,13 +5,13 @@ replicaCount: 1
 
 image:
   # image.repository -- Image to be used for deployment
-  repository: restorecommerce/scheduling-srv
+  repository: ghcr.io/restorecommerce/scheduling-srv
 
   # image.pullPolicy -- Pull policy of the deployment
   pullPolicy: Always
 
   # image.tag -- Image tag
-  tag: 0.1.7
+  tag: ""
 
 # imagePullSecrets -- List of secrets for images
 imagePullSecrets: []
diff --git a/example/helmfile/arangodb-crd-helmfile.yaml b/example/helmfile/arangodb-crd-helmfile.yaml
index 2e37970..a9e8271 100644
--- a/example/helmfile/arangodb-crd-helmfile.yaml
+++ b/example/helmfile/arangodb-crd-helmfile.yaml
@@ -1,7 +1,7 @@
 releases:
   - name: arangodb-crd
     namespace: restorecommerce
-    chart: https://github.com/arangodb/kube-arangodb/releases/download/1.1.0/kube-arangodb-crd-1.1.0.tgz
+    chart: https://github.com/arangodb/kube-arangodb/releases/download/1.1.5/kube-arangodb-crd-1.1.5.tgz
     installed: true
     atomic: true
     cleanupOnFail: true
\ No newline at end of file
diff --git a/example/helmfile/helmfile.yaml b/example/helmfile/helmfile.yaml
index a9c3e53..40f48d5 100644
--- a/example/helmfile/helmfile.yaml
+++ b/example/helmfile/helmfile.yaml
@@ -1,6 +1,7 @@
 helmDefaults:
   wait: true
   createNamespace: true
+  timeout: 1200
 
 environments:
   default:
@@ -19,7 +20,7 @@ repositories:
   - name: elastic
     url: https://helm.elastic.co
   - name: stable
-    url: https://kubernetes-charts.storage.googleapis.com
+    url: https://charts.helm.sh/stable
 
 # Deploy after initial to wait for CRD's to deploy
 helmfiles:
@@ -30,8 +31,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/identity-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -47,8 +47,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/notification-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -62,8 +61,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/access-control-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -79,8 +77,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/ostorage-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -100,8 +97,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/scheduling-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -117,8 +113,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/rendering-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -132,16 +127,14 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/pdf-rendering-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
 
   - name: fulfillment-srv
     namespace: restorecommerce
     chart: ../../charts/fulfillment-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -155,8 +148,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/indexing-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -172,8 +164,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/catalog-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -187,8 +178,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/invoicing-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -202,8 +192,7 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/ordering-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
@@ -217,17 +206,39 @@ releases:
     namespace: restorecommerce
     chart: ../../charts/payment-srv
     installed: true
-    atomic: false
-    wait: false
+    atomic: true
+    cleanupOnFail: true
+    values:
+      - env:
+          extras:
+            - name: redis__host
+              value: redis-master
+            - name: logger__elasticsearch__clientOpts__node
+              value: http://elasticsearch-master:9200
+
+  - name: resource-srv
+    namespace: restorecommerce
+    chart: ../../charts/resource-srv
+    installed: true
+    atomic: true
     cleanupOnFail: true
     values:
       - env:
           extras:
             - name: redis__host
               value: redis-master
+            - name: authorization__cache__host
+              value: redis-master
             - name: logger__elasticsearch__clientOpts__node
               value: http://elasticsearch-master:9200
 
+  - name: facade-srv
+    namespace: restorecommerce
+    chart: ../../charts/facade-srv
+    installed: true
+    atomic: true
+    cleanupOnFail: true
+
   - name: minio
     namespace: restorecommerce
     chart: minio/minio
@@ -319,7 +330,7 @@ releases:
 
   - name: arangodb
     namespace: restorecommerce
-    chart: https://github.com/arangodb/kube-arangodb/releases/download/1.1.0/kube-arangodb-1.1.0.tgz
+    chart: https://github.com/arangodb/kube-arangodb/releases/download/1.1.5/kube-arangodb-1.1.5.tgz
     installed: true
     atomic: true
     cleanupOnFail: true