diff --git a/db_upgrade_scripts/mosip_credential/sql/1.2.1.0_to_1.2.2.0_rollback.sql b/db_upgrade_scripts/mosip_credential/sql/1.2.1.0_to_1.2.2.0_rollback.sql
new file mode 100644
index 000000000..5548b94e9
--- /dev/null
+++ b/db_upgrade_scripts/mosip_credential/sql/1.2.1.0_to_1.2.2.0_rollback.sql
@@ -0,0 +1 @@
+\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
diff --git a/db_upgrade_scripts/mosip_credential/sql/1.2.1.0_to_1.2.2.0_upgrade.sql b/db_upgrade_scripts/mosip_credential/sql/1.2.1.0_to_1.2.2.0_upgrade.sql
new file mode 100644
index 000000000..5548b94e9
--- /dev/null
+++ b/db_upgrade_scripts/mosip_credential/sql/1.2.1.0_to_1.2.2.0_upgrade.sql
@@ -0,0 +1 @@
+\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
diff --git a/db_upgrade_scripts/mosip_idmap/sql/1.2.1.0_to_1.2.2.0_rollback.sql b/db_upgrade_scripts/mosip_idmap/sql/1.2.1.0_to_1.2.2.0_rollback.sql
new file mode 100644
index 000000000..5548b94e9
--- /dev/null
+++ b/db_upgrade_scripts/mosip_idmap/sql/1.2.1.0_to_1.2.2.0_rollback.sql
@@ -0,0 +1 @@
+\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
diff --git a/db_upgrade_scripts/mosip_idmap/sql/1.2.1.0_to_1.2.2.0_upgrade.sql b/db_upgrade_scripts/mosip_idmap/sql/1.2.1.0_to_1.2.2.0_upgrade.sql
new file mode 100644
index 000000000..5548b94e9
--- /dev/null
+++ b/db_upgrade_scripts/mosip_idmap/sql/1.2.1.0_to_1.2.2.0_upgrade.sql
@@ -0,0 +1 @@
+\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
diff --git a/deploy/install.sh b/deploy/install.sh
index 5ba3b8474..fb9d27d45 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=idrepo
-CHART_VERSION=12.1.0-develop
+CHART_VERSION=12.2.0
 
 echo Create $NS namespace
 kubectl create ns $NS
diff --git a/helm/credential/Chart.yaml b/helm/credential/Chart.yaml
index 333cd8041..4e25b3c17 100644
--- a/helm/credential/Chart.yaml
+++ b/helm/credential/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: credential
 description: A Helm chart for MOSIP IDRepo Identity Service
 type: application
-version: 12.1.0-develop
+version: 12.2.0
 appVersion: ""
 dependencies:
   - name: common
diff --git a/helm/credential/values.yaml b/helm/credential/values.yaml
index 1c0a14742..602de23ac 100644
--- a/helm/credential/values.yaml
+++ b/helm/credential/values.yaml
@@ -12,23 +12,18 @@
 ##
 commonLabels:
   app.kubernetes.io/component: mosip
-
 ## Add annotations to all the deployed resources
 ##
 commonAnnotations: {}
-
 ## Kubernetes Cluster Domain
 ##
 clusterDomain: cluster.local
-
 ## Extra objects to deploy (value evaluated as a template)
 ##
 extraDeploy: []
-
 ## Number of nodes
 ##
 replicaCount: 1
-
 service:
   type: ClusterIP
   port: 80
@@ -49,11 +44,10 @@ service:
   ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
   ##
   externalTrafficPolicy: Cluster
-
 image:
   registry: docker.io
   repository: mosipid/credential-service
-  tag: 1.2.0.1
+  tag: 1.2.2.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -65,10 +59,8 @@ image:
   ##
   # pullSecrets:
   #   - myRegistryKeySecretName
-
 ## Port on which this particular spring service module is running.
 springServicePort: 8095
-
 ## Configure extra options for liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
 ##
@@ -82,7 +74,6 @@ startupProbe:
   timeoutSeconds: 5
   failureThreshold: 30
   successThreshold: 1
-
 livenessProbe:
   enabled: true
   httpGet:
@@ -93,7 +84,6 @@ livenessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 readinessProbe:
   enabled: true
   httpGet:
@@ -104,7 +94,6 @@ readinessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 ##
 # existingConfigmap:
 
@@ -112,12 +101,10 @@ readinessProbe:
 ##
 command: []
 args: []
-
 ## Deployment pod host aliases
 ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
 ##
 hostAliases: []
-
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources:
@@ -131,37 +118,31 @@ resources:
   requests:
     cpu: 100m
     memory: 1500Mi
-
 additionalResources:
   ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
   ## Example: java_opts: "-Xms500M -Xmx500M"
   javaOpts: "-Xms2000M -Xmx2000M"
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
 ## Clamav container already runs as 'mosip' user, so we may not need to enable this
 containerSecurityContext:
   enabled: false
   runAsUser: mosip
   runAsNonRoot: true
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
 ##
 podSecurityContext:
   enabled: false
   fsGroup: 1001
-
 ## Pod affinity preset
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAffinityPreset: ""
-
 ## Pod anti-affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAntiAffinityPreset: soft
-
 ## Node affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
 ## Allowed values: soft, hard
@@ -183,32 +164,26 @@ nodeAffinityPreset:
   ##   - e2e-az2
   ##
   values: []
-
 ## Affinity for pod assignment. Evaluated as a template.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 ##
 affinity: {}
-
 ## Node labels for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
 nodeSelector: {}
-
 ## Tolerations for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 ##
 tolerations: []
-
 ## Pod extra labels
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 ##
 podLabels: {}
-
 ## Annotations for server pods.
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 ##
 podAnnotations: {}
-
 ##  pods' priority.
 ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 ##
@@ -217,15 +192,12 @@ podAnnotations: {}
 ## lifecycleHooks for the  container to automate configuration before or after startup.
 ##
 lifecycleHooks: {}
-
 ## Custom Liveness probes for
 ##
 customLivenessProbe: {}
-
 ## Custom Rediness probes
 ##
 customReadinessProbe: {}
-
 ## Update strategy - only really applicable for deployments with RWO PVs attached
 ## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
 ## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will
@@ -233,7 +205,6 @@ customReadinessProbe: {}
 ##
 updateStrategy:
   type: RollingUpdate
-
 ## Additional environment variables to set
 ## Example:
 ## extraEnvVars:
@@ -241,26 +212,21 @@ updateStrategy:
 ##     value: "bar"
 ##
 extraEnvVars: []
-
 ## ConfigMap with extra environment variables that used
 ##
 extraEnvVarsCM:
   - global
   - config-server-share
   - artifactory-share
-
 ## Secret with extra environment variables
 ##
 extraEnvVarsSecret:
-
 ## Extra volumes to add to the deployment
 ##
 extraVolumes: []
-
 ## Extra volume mounts to add to the container
 ##
 extraVolumeMounts: []
-
 ## Add init containers to the  pods.
 ## Example:
 ## initContainers:
@@ -272,7 +238,6 @@ extraVolumeMounts: []
 ##         containerPort: 1234
 ##
 initContainers: {}
-
 ## Add sidecars to the  pods.
 ## Example:
 ## sidecars:
@@ -284,7 +249,6 @@ initContainers: {}
 ##         containerPort: 1234
 ##
 sidecars: {}
-
 persistence:
   enabled: false
   ## If defined, storageClassName: <storageClass>
@@ -306,7 +270,6 @@ persistence:
   existingClaim:
   # Dir where config and keys are written inside container
   mountDir:
-
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
 ##
@@ -340,12 +303,10 @@ volumePermissions:
     ##   cpu: 100m
     ##   memory: 128Mi
     ##
-
 ## Specifies whether RBAC resources should be created
 ##
 rbac:
   create: true
-
 ## Specifies whether a ServiceAccount should be created
 ##
 serviceAccount:
@@ -354,7 +315,6 @@ serviceAccount:
   ## If not set and create is true, a name is generated using the fullname template
   ##
   name:
-
 ## Prometheus Metrics
 ##
 metrics:
@@ -364,9 +324,7 @@ metrics:
   ##
   podAnnotations:
     prometheus.io/scrape: "true"
-
   endpointPath: /v1/credentialservice/actuator/prometheus
-
   ## Prometheus Service Monitor
   ## ref: https://github.com/coreos/prometheus-operator
   ##
@@ -393,7 +351,6 @@ metrics:
     ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
     ##
     additionalLabels: {}
-
   ## Custom PrometheusRule to be defined
   ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
   ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
@@ -411,7 +368,6 @@ metrics:
     #     labels:
     #       severity: error
     rules: []
-
 ## Partner management needs public access.
 istio:
   enabled: true
diff --git a/helm/credentialrequest/Chart.yaml b/helm/credentialrequest/Chart.yaml
index fe79fe642..b3221461a 100644
--- a/helm/credentialrequest/Chart.yaml
+++ b/helm/credentialrequest/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: credentialrequest
 description: A Helm chart for MOSIP IDRepo Identity Service
 type: application
-version: 12.1.0-develop
+version: 12.2.0
 appVersion: ""
 dependencies:
   - name: common
diff --git a/helm/credentialrequest/values.yaml b/helm/credentialrequest/values.yaml
index 8bccc2669..c169eeef6 100644
--- a/helm/credentialrequest/values.yaml
+++ b/helm/credentialrequest/values.yaml
@@ -12,23 +12,18 @@
 ##
 commonLabels:
   app.kubernetes.io/component: mosip
-
 ## Add annotations to all the deployed resources
 ##
 commonAnnotations: {}
-
 ## Kubernetes Cluster Domain
 ##
 clusterDomain: cluster.local
-
 ## Extra objects to deploy (value evaluated as a template)
 ##
 extraDeploy: []
-
 ## Number of nodes
 ##
 replicaCount: 1
-
 service:
   type: ClusterIP
   port: 80
@@ -49,11 +44,10 @@ service:
   ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
   ##
   externalTrafficPolicy: Cluster
-
 image:
   registry: docker.io
   repository: mosipid/credential-request-generator
-  tag: 1.2.0.1
+  tag: 1.2.2.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -65,10 +59,8 @@ image:
   ##
   # pullSecrets:
   #   - myRegistryKeySecretName
-
 ## Port on which this particular spring service module is running.
 springServicePort: 8094
-
 ## Configure extra options for liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
 ##
@@ -82,7 +74,6 @@ startupProbe:
   timeoutSeconds: 5
   failureThreshold: 30
   successThreshold: 1
-
 livenessProbe:
   enabled: true
   httpGet:
@@ -93,7 +84,6 @@ livenessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 readinessProbe:
   enabled: true
   httpGet:
@@ -104,7 +94,6 @@ readinessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 ##
 # existingConfigmap:
 
@@ -112,12 +101,10 @@ readinessProbe:
 ##
 command: []
 args: []
-
 ## Deployment pod host aliases
 ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
 ##
 hostAliases: []
-
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources:
@@ -131,37 +118,31 @@ resources:
   requests:
     cpu: 100m
     memory: 1000Mi
-
 additionalResources:
   ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
   ## Example: java_opts: "-Xms500M -Xmx500M"
   javaOpts: "-Xms3000M -Xmx3000M"
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
 ## Clamav container already runs as 'mosip' user, so we may not need to enable this
 containerSecurityContext:
   enabled: false
   runAsUser: mosip
   runAsNonRoot: true
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
 ##
 podSecurityContext:
   enabled: false
   fsGroup: 1001
-
 ## Pod affinity preset
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAffinityPreset: ""
-
 ## Pod anti-affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAntiAffinityPreset: soft
-
 ## Node affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
 ## Allowed values: soft, hard
@@ -183,32 +164,26 @@ nodeAffinityPreset:
   ##   - e2e-az2
   ##
   values: []
-
 ## Affinity for pod assignment. Evaluated as a template.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 ##
 affinity: {}
-
 ## Node labels for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
 nodeSelector: {}
-
 ## Tolerations for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 ##
 tolerations: []
-
 ## Pod extra labels
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 ##
 podLabels: {}
-
 ## Annotations for server pods.
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 ##
 podAnnotations: {}
-
 ##  pods' priority.
 ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 ##
@@ -217,15 +192,12 @@ podAnnotations: {}
 ## lifecycleHooks for the  container to automate configuration before or after startup.
 ##
 lifecycleHooks: {}
-
 ## Custom Liveness probes for
 ##
 customLivenessProbe: {}
-
 ## Custom Rediness probes
 ##
 customReadinessProbe: {}
-
 ## Update strategy - only really applicable for deployments with RWO PVs attached
 ## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
 ## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will
@@ -233,7 +205,6 @@ customReadinessProbe: {}
 ##
 updateStrategy:
   type: RollingUpdate
-
 ## Additional environment variables to set
 ## Example:
 ## extraEnvVars:
@@ -241,26 +212,21 @@ updateStrategy:
 ##     value: "bar"
 ##
 extraEnvVars: []
-
 ## ConfigMap with extra environment variables that used
 ##
 extraEnvVarsCM:
   - global
   - config-server-share
   - artifactory-share
-
 ## Secret with extra environment variables
 ##
 extraEnvVarsSecret:
-
 ## Extra volumes to add to the deployment
 ##
 extraVolumes: []
-
 ## Extra volume mounts to add to the container
 ##
 extraVolumeMounts: []
-
 ## Add init containers to the  pods.
 ## Example:
 ## initContainers:
@@ -272,7 +238,6 @@ extraVolumeMounts: []
 ##         containerPort: 1234
 ##
 initContainers: {}
-
 ## Add sidecars to the  pods.
 ## Example:
 ## sidecars:
@@ -284,7 +249,6 @@ initContainers: {}
 ##         containerPort: 1234
 ##
 sidecars: {}
-
 persistence:
   enabled: false
   ## If defined, storageClassName: <storageClass>
@@ -306,7 +270,6 @@ persistence:
   existingClaim:
   # Dir where config and keys are written inside container
   mountDir:
-
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
 ##
@@ -340,12 +303,10 @@ volumePermissions:
     ##   cpu: 100m
     ##   memory: 128Mi
     ##
-
 ## Specifies whether RBAC resources should be created
 ##
 rbac:
   create: true
-
 ## Specifies whether a ServiceAccount should be created
 ##
 serviceAccount:
@@ -354,7 +315,6 @@ serviceAccount:
   ## If not set and create is true, a name is generated using the fullname template
   ##
   name:
-
 ## Prometheus Metrics
 ##
 metrics:
@@ -364,9 +324,7 @@ metrics:
   ##
   podAnnotations:
     prometheus.io/scrape: "true"
-
   endpointPath: /v1/credentialrequest/actuator/prometheus
-
   ## Prometheus Service Monitor
   ## ref: https://github.com/coreos/prometheus-operator
   ##
@@ -393,7 +351,6 @@ metrics:
     ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
     ##
     additionalLabels: {}
-
   ## Custom PrometheusRule to be defined
   ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
   ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
@@ -411,7 +368,6 @@ metrics:
     #     labels:
     #       severity: error
     rules: []
-
 ## Partner management needs public access.
 istio:
   enabled: true
diff --git a/helm/identity/Chart.yaml b/helm/identity/Chart.yaml
index fa3fb5558..3fcfd8e44 100644
--- a/helm/identity/Chart.yaml
+++ b/helm/identity/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: identity
 description: A Helm chart for MOSIP IDRepo Identity Service
 type: application
-version: 12.1.0-develop
+version: 12.2.0
 appVersion: ""
 dependencies:
   - name: common
diff --git a/helm/identity/values.yaml b/helm/identity/values.yaml
index 44d6cff5f..1f2f4b7e8 100644
--- a/helm/identity/values.yaml
+++ b/helm/identity/values.yaml
@@ -12,23 +12,18 @@
 ##
 commonLabels:
   app.kubernetes.io/component: mosip
-
 ## Add annotations to all the deployed resources
 ##
 commonAnnotations: {}
-
 ## Kubernetes Cluster Domain
 ##
 clusterDomain: cluster.local
-
 ## Extra objects to deploy (value evaluated as a template)
 ##
 extraDeploy: []
-
 ## Number of nodes
 ##
 replicaCount: 1
-
 service:
   type: ClusterIP
   port: 80
@@ -49,11 +44,10 @@ service:
   ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
   ##
   externalTrafficPolicy: Cluster
-
 image:
   registry: docker.io
   repository: mosipid/id-repository-identity-service
-  tag: 1.2.0.1
+  tag: 1.2.2.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -65,10 +59,8 @@ image:
   ##
   # pullSecrets:
   #   - myRegistryKeySecretName
-
 ## Port on which this particular spring service module is running.
 springServicePort: 8090
-
 ## Configure extra options for liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
 ##
@@ -82,7 +74,6 @@ startupProbe:
   timeoutSeconds: 5
   failureThreshold: 30
   successThreshold: 1
-
 livenessProbe:
   enabled: true
   httpGet:
@@ -93,7 +84,6 @@ livenessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 readinessProbe:
   enabled: true
   httpGet:
@@ -104,7 +94,6 @@ readinessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 ##
 # existingConfigmap:
 
@@ -112,12 +101,10 @@ readinessProbe:
 ##
 command: []
 args: []
-
 ## Deployment pod host aliases
 ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
 ##
 hostAliases: []
-
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources:
@@ -131,37 +118,31 @@ resources:
   requests:
     cpu: 100m
     memory: 1500Mi
-
 additionalResources:
   ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
   ## Example: java_opts: "-Xms500M -Xmx500M"
   javaOpts: "-Xms2000M -Xmx2000M"
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
 ## Clamav container already runs as 'mosip' user, so we may not need to enable this
 containerSecurityContext:
   enabled: false
   runAsUser: mosip
   runAsNonRoot: true
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
 ##
 podSecurityContext:
   enabled: false
   fsGroup: 1001
-
 ## Pod affinity preset
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAffinityPreset: ""
-
 ## Pod anti-affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAntiAffinityPreset: soft
-
 ## Node affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
 ## Allowed values: soft, hard
@@ -183,32 +164,26 @@ nodeAffinityPreset:
   ##   - e2e-az2
   ##
   values: []
-
 ## Affinity for pod assignment. Evaluated as a template.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 ##
 affinity: {}
-
 ## Node labels for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
 nodeSelector: {}
-
 ## Tolerations for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 ##
 tolerations: []
-
 ## Pod extra labels
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 ##
 podLabels: {}
-
 ## Annotations for server pods.
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 ##
 podAnnotations: {}
-
 ##  pods' priority.
 ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 ##
@@ -217,15 +192,12 @@ podAnnotations: {}
 ## lifecycleHooks for the  container to automate configuration before or after startup.
 ##
 lifecycleHooks: {}
-
 ## Custom Liveness probes for
 ##
 customLivenessProbe: {}
-
 ## Custom Rediness probes
 ##
 customReadinessProbe: {}
-
 ## Update strategy - only really applicable for deployments with RWO PVs attached
 ## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
 ## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will
@@ -233,7 +205,6 @@ customReadinessProbe: {}
 ##
 updateStrategy:
   type: RollingUpdate
-
 ## Additional environment variables to set
 ## Example:
 ## extraEnvVars:
@@ -241,26 +212,21 @@ updateStrategy:
 ##     value: "bar"
 ##
 extraEnvVars: []
-
 ## ConfigMap with extra environment variables that used
 ##
 extraEnvVarsCM:
   - global
   - config-server-share
   - artifactory-share
-
 ## Secret with extra environment variables
 ##
 extraEnvVarsSecret:
-
 ## Extra volumes to add to the deployment
 ##
 extraVolumes: []
-
 ## Extra volume mounts to add to the container
 ##
 extraVolumeMounts: []
-
 ## Add init containers to the  pods.
 ## Example:
 ## initContainers:
@@ -272,7 +238,6 @@ extraVolumeMounts: []
 ##         containerPort: 1234
 ##
 initContainers: {}
-
 ## Add sidecars to the  pods.
 ## Example:
 ## sidecars:
@@ -284,7 +249,6 @@ initContainers: {}
 ##         containerPort: 1234
 ##
 sidecars: {}
-
 persistence:
   enabled: false
   ## If defined, storageClassName: <storageClass>
@@ -306,7 +270,6 @@ persistence:
   existingClaim:
   # Dir where config and keys are written inside container
   mountDir:
-
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
 ##
@@ -340,12 +303,10 @@ volumePermissions:
     ##   cpu: 100m
     ##   memory: 128Mi
     ##
-
 ## Specifies whether RBAC resources should be created
 ##
 rbac:
   create: true
-
 ## Specifies whether a ServiceAccount should be created
 ##
 serviceAccount:
@@ -354,7 +315,6 @@ serviceAccount:
   ## If not set and create is true, a name is generated using the fullname template
   ##
   name:
-
 ## Prometheus Metrics
 ##
 metrics:
@@ -364,9 +324,7 @@ metrics:
   ##
   podAnnotations:
     prometheus.io/scrape: "true"
-
   endpointPath: /idrepository/v1/identity/actuator/prometheus
-
   ## Prometheus Service Monitor
   ## ref: https://github.com/coreos/prometheus-operator
   ##
@@ -393,7 +351,6 @@ metrics:
     ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
     ##
     additionalLabels: {}
-
   ## Custom PrometheusRule to be defined
   ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
   ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
@@ -411,7 +368,6 @@ metrics:
     #     labels:
     #       severity: error
     rules: []
-
 ## Partner management needs public access.
 istio:
   enabled: true
diff --git a/helm/idrepo-saltgen/Chart.yaml b/helm/idrepo-saltgen/Chart.yaml
index aa2fecc34..380bdeccc 100644
--- a/helm/idrepo-saltgen/Chart.yaml
+++ b/helm/idrepo-saltgen/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: idrepo-saltgen
 description: A Helm chart to generate salt for ID Repo.
 type: application
-version: 12.1.0-develop
+version: 12.2.0
 appVersion: ""
 dependencies:
   - name: common
diff --git a/helm/idrepo-saltgen/values.yaml b/helm/idrepo-saltgen/values.yaml
index b89e53a38..51659ebcc 100644
--- a/helm/idrepo-saltgen/values.yaml
+++ b/helm/idrepo-saltgen/values.yaml
@@ -12,27 +12,22 @@
 ##
 commonLabels:
   app.kubernetes.io/component: mosip
-
 ## Add annotations to all the deployed resources
 ##
 commonAnnotations: {}
-
 ## Kubernetes Cluster Domain
 ##
 clusterDomain: cluster.local
-
 ## Extra objects to deploy (value evaluated as a template)
 ##
 extraDeploy: []
-
 ## Number of nodes
 ##
 replicaCount: 1
-
 image:
   registry: docker.io
   repository: mosipid/id-repository-salt-generator
-  tag: 1.2.0.1
+  tag: 1.2.2.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -44,7 +39,6 @@ image:
   ##
   # pullSecrets:
   #   - myRegistryKeySecretName
-
 ##
 # existingConfigmap:
 
@@ -52,12 +46,10 @@ image:
 ##
 command: []
 args: []
-
 ## Deployment pod host aliases
 ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
 ##
 hostAliases: []
-
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources:
@@ -71,37 +63,31 @@ resources:
   requests: {}
   #   cpu: 200m
   #   memory: 10Mi
-
 additionalResources:
   ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
   ## Example: java_opts: "-Xms500M -Xmx500M"
   javaOpts: ""
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
 ## Clamav container already runs as 'mosip' user, so we may not need to enable this
 containerSecurityContext:
   enabled: false
   runAsUser: mosip
   runAsNonRoot: true
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
 ##
 podSecurityContext:
   enabled: false
   fsGroup: 1001
-
 ## Pod affinity preset
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAffinityPreset: ""
-
 ## Pod anti-affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAntiAffinityPreset: soft
-
 ## Node affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
 ## Allowed values: soft, hard
@@ -123,32 +109,26 @@ nodeAffinityPreset:
   ##   - e2e-az2
   ##
   values: []
-
 ## Affinity for pod assignment. Evaluated as a template.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 ##
 affinity: {}
-
 ## Node labels for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
 nodeSelector: {}
-
 ## Tolerations for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 ##
 tolerations: []
-
 ## Pod extra labels
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 ##
 podLabels: {}
-
 ## Annotations for server pods.
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 ##
 podAnnotations: {}
-
 ##  pods' priority.
 ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 ##
@@ -157,19 +137,15 @@ podAnnotations: {}
 ## lifecycleHooks for the  container to automate configuration before or after startup.
 ##
 lifecycleHooks: {}
-
 ## Custom Liveness probes for
 ##
 customLivenessProbe: {}
-
 ## Custom Rediness probes
 ##
 customReadinessProbe: {}
-
 ## "backoff" strategy - It is used when dealing with resources that are retrying or recovering from failures.
 ##
 backoffLimit: 0
-
 ## Update strategy - only really applicable for deployments with RWO PVs attached
 ## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
 ## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will
@@ -177,7 +153,6 @@ backoffLimit: 0
 ##
 updateStrategy:
   type: RollingUpdate
-
 ## Additional environment variables to set
 ## Example:
 ## extraEnvVars:
@@ -185,25 +160,20 @@ updateStrategy:
 ##     value: "bar"
 ##
 extraEnvVars: []
-
 ## ConfigMap with extra environment variables that used
 ##
 extraEnvVarsCM:
   - global
   - config-server-share
-
 ## Secret with extra environment variables
 ##
 extraEnvVarsSecret:
-
 ## Extra volumes to add to the deployment
 ##
 extraVolumes: []
-
 ## Extra volume mounts to add to the container
 ##
 extraVolumeMounts: []
-
 ## Add init containers to the  pods.
 ## Example:
 ## initContainers:
@@ -215,7 +185,6 @@ extraVolumeMounts: []
 ##         containerPort: 1234
 ##
 initContainers: {}
-
 ## Add sidecars to the  pods.
 ## Example:
 ## sidecars:
@@ -227,7 +196,6 @@ initContainers: {}
 ##         containerPort: 1234
 ##
 sidecars: {}
-
 persistence:
   enabled: false
   ## If defined, storageClassName: <storageClass>
@@ -249,7 +217,6 @@ persistence:
   existingClaim:
   # Dir where config and keys are written inside container
   mountDir:
-
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
 ##
@@ -283,12 +250,10 @@ volumePermissions:
     ##   cpu: 100m
     ##   memory: 128Mi
     ##
-
 ## Specifies whether RBAC resources should be created
 ##
 rbac:
   create: true
-
 ## Specifies whether a ServiceAccount should be created
 ##
 serviceAccount:
diff --git a/helm/idrepo/Chart.yaml b/helm/idrepo/Chart.yaml
index e2fba19ef..b992a496f 100644
--- a/helm/idrepo/Chart.yaml
+++ b/helm/idrepo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: idrepo
 description: A Helm chart for Idrepo module of MOSIP.
 type: application
-version: 12.1.0-develop
+version: 12.2.0
 appVersion: ""
 home: https://mosip.io
 keywords:
diff --git a/helm/vid/Chart.yaml b/helm/vid/Chart.yaml
index 0d74a0123..11b9df5c8 100644
--- a/helm/vid/Chart.yaml
+++ b/helm/vid/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: vid
 description: A Helm chart for MOSIP IDRepo VID Service
 type: application
-version: 12.1.0-develop
+version: 12.2.0
 appVersion: ""
 dependencies:
   - name: common
diff --git a/helm/vid/values.yaml b/helm/vid/values.yaml
index c80783c84..ca59f2685 100644
--- a/helm/vid/values.yaml
+++ b/helm/vid/values.yaml
@@ -12,23 +12,18 @@
 ##
 commonLabels:
   app.kubernetes.io/component: mosip
-
 ## Add annotations to all the deployed resources
 ##
 commonAnnotations: {}
-
 ## Kubernetes Cluster Domain
 ##
 clusterDomain: cluster.local
-
 ## Extra objects to deploy (value evaluated as a template)
 ##
 extraDeploy: []
-
 ## Number of nodes
 ##
 replicaCount: 1
-
 service:
   type: ClusterIP
   port: 80
@@ -49,11 +44,10 @@ service:
   ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
   ##
   externalTrafficPolicy: Cluster
-
 image:
   registry: docker.io
   repository: mosipid/id-repository-vid-service
-  tag: 1.2.0.1
+  tag: 1.2.2.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -65,15 +59,12 @@ image:
   ##
   # pullSecrets:
   #   - myRegistryKeySecretName
-
 ## Port on which this particular spring service module is running.
 springServicePort: 8091
-
 ## Configure extra options for liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
 ##
 ## TODO: health url needs correction in code. It does not have 'vid'
-
 startupProbe:
   enabled: true
   httpGet:
@@ -84,7 +75,6 @@ startupProbe:
   timeoutSeconds: 5
   failureThreshold: 30
   successThreshold: 1
-
 livenessProbe:
   enabled: true
   httpGet:
@@ -95,7 +85,6 @@ livenessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 readinessProbe:
   enabled: true
   httpGet:
@@ -106,7 +95,6 @@ readinessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
-
 ##
 # existingConfigmap:
 
@@ -114,12 +102,10 @@ readinessProbe:
 ##
 command: []
 args: []
-
 ## Deployment pod host aliases
 ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
 ##
 hostAliases: []
-
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources:
@@ -133,37 +119,31 @@ resources:
   requests:
     cpu: 100m
     memory: 1500Mi
-
 additionalResources:
   ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
   ## Example: java_opts: "-Xms500M -Xmx500M"
   javaOpts: "-Xms1000M -Xmx1000M"
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
 ## Clamav container already runs as 'mosip' user, so we may not need to enable this
 containerSecurityContext:
   enabled: false
   runAsUser: mosip
   runAsNonRoot: true
-
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
 ##
 podSecurityContext:
   enabled: false
   fsGroup: 1001
-
 ## Pod affinity preset
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAffinityPreset: ""
-
 ## Pod anti-affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
 ## Allowed values: soft, hard
 ##
 podAntiAffinityPreset: soft
-
 ## Node affinity preset
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
 ## Allowed values: soft, hard
@@ -185,32 +165,26 @@ nodeAffinityPreset:
   ##   - e2e-az2
   ##
   values: []
-
 ## Affinity for pod assignment. Evaluated as a template.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 ##
 affinity: {}
-
 ## Node labels for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
 nodeSelector: {}
-
 ## Tolerations for pod assignment. Evaluated as a template.
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 ##
 tolerations: []
-
 ## Pod extra labels
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 ##
 podLabels: {}
-
 ## Annotations for server pods.
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 ##
 podAnnotations: {}
-
 ##  pods' priority.
 ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 ##
@@ -219,15 +193,12 @@ podAnnotations: {}
 ## lifecycleHooks for the  container to automate configuration before or after startup.
 ##
 lifecycleHooks: {}
-
 ## Custom Liveness probes for
 ##
 customLivenessProbe: {}
-
 ## Custom Rediness probes
 ##
 customReadinessProbe: {}
-
 ## Update strategy - only really applicable for deployments with RWO PVs attached
 ## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the
 ## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will
@@ -235,7 +206,6 @@ customReadinessProbe: {}
 ##
 updateStrategy:
   type: RollingUpdate
-
 ## Additional environment variables to set
 ## Example:
 ## extraEnvVars:
@@ -243,26 +213,21 @@ updateStrategy:
 ##     value: "bar"
 ##
 extraEnvVars: []
-
 ## ConfigMap with extra environment variables that used
 ##
 extraEnvVarsCM:
   - global
   - config-server-share
   - artifactory-share
-
 ## Secret with extra environment variables
 ##
 extraEnvVarsSecret:
-
 ## Extra volumes to add to the deployment
 ##
 extraVolumes: []
-
 ## Extra volume mounts to add to the container
 ##
 extraVolumeMounts: []
-
 ## Add init containers to the  pods.
 ## Example:
 ## initContainers:
@@ -274,7 +239,6 @@ extraVolumeMounts: []
 ##         containerPort: 1234
 ##
 initContainers: {}
-
 ## Add sidecars to the  pods.
 ## Example:
 ## sidecars:
@@ -286,7 +250,6 @@ initContainers: {}
 ##         containerPort: 1234
 ##
 sidecars: {}
-
 persistence:
   enabled: false
   ## If defined, storageClassName: <storageClass>
@@ -308,7 +271,6 @@ persistence:
   existingClaim:
   # Dir where config and keys are written inside container
   mountDir:
-
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
 ##
@@ -342,12 +304,10 @@ volumePermissions:
     ##   cpu: 100m
     ##   memory: 128Mi
     ##
-
 ## Specifies whether RBAC resources should be created
 ##
 rbac:
   create: true
-
 ## Specifies whether a ServiceAccount should be created
 ##
 serviceAccount:
@@ -356,7 +316,6 @@ serviceAccount:
   ## If not set and create is true, a name is generated using the fullname template
   ##
   name:
-
 ## Prometheus Metrics
 ##
 metrics:
@@ -366,9 +325,7 @@ metrics:
   ##
   podAnnotations:
     prometheus.io/scrape: "true"
-
   endpointPath: /idrepository/v1/actuator/prometheus
-
   ## Prometheus Service Monitor
   ## ref: https://github.com/coreos/prometheus-operator
   ##
@@ -395,7 +352,6 @@ metrics:
     ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
     ##
     additionalLabels: {}
-
   ## Custom PrometheusRule to be defined
   ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
   ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
@@ -413,7 +369,6 @@ metrics:
     #     labels:
     #       severity: error
     rules: []
-
 ## Partner management needs public access.
 istio:
   enabled: true