diff --git a/mojaloop/account-lookup-service/Chart.yaml b/mojaloop/account-lookup-service/Chart.yaml
index 8cf836c9..87d44692 100644
--- a/mojaloop/account-lookup-service/Chart.yaml
+++ b/mojaloop/account-lookup-service/Chart.yaml
@@ -19,7 +19,7 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
   - name: account-lookup-service
     version: 13.0.0
     repository: "file://../chart-service"
diff --git a/mojaloop/admin-api-svc/Chart.yaml b/mojaloop/admin-api-svc/Chart.yaml
index 3eb63226..238c65fe 100644
--- a/mojaloop/admin-api-svc/Chart.yaml
+++ b/mojaloop/admin-api-svc/Chart.yaml
@@ -19,4 +19,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/bof/Chart.yaml b/mojaloop/bof/Chart.yaml
index f34ee3eb..e5218f33 100644
--- a/mojaloop/bof/Chart.yaml
+++ b/mojaloop/bof/Chart.yaml
@@ -15,27 +15,20 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.0.0
+version: 5.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.0.0"
+appVersion: "5.0.0"
 dependencies:
   - name: common
     repository: "file://../common"
     tags:
       - mojaloop
       - common
-    version: 2.1.0
-  - name: role-assignment-service
-    condition: role-assignment-service.enabled
-    repository: "file://../role-assignment-service"
-    tags:
-      - mojaloop
-      - role-assignment-service
-    version: 2.0.0
+    version: 3.0.0
   - name: security-role-perm-operator-svc
     condition: security-role-perm-operator-svc.enabled
     repository: "file://../security-role-perm-operator-svc"
diff --git a/mojaloop/bof/values.yaml b/mojaloop/bof/values.yaml
index 4370aa37..0d713623 100644
--- a/mojaloop/bof/values.yaml
+++ b/mojaloop/bof/values.yaml
@@ -9,41 +9,11 @@ global:
   keto:
     readURL: "http://keto-read:80"
     writeURL: "http://keto-write:80"
-  wso2:
-    identityServer:
-      host: "wso2-identity-server.local"
-      port: 9443
-      userListURL: "http://wso2-identity-server.local:9443/scim2/Users"
-      user: 'admin'
-      secret:
-        name: wso2-is-admin-creds
-        key: password
 
   rolePermOperator:
     mojaloopRole: {}
     mojaloopPermissionExclusion: {}
     apiSvc: {}
-  ## Currently setting the following to dummy values and we need to remove this dependency
-  adminApiSvc:
-    host: "dummy"
-    port: 80
-
-role-assignment-service:
-  enabled: true
-  ingress:
-    enabled: true
-    hostname: api-bof.local
-    path: /proxy/iam(/|$)(.*)
-    annotations:
-      nginx.ingress.kubernetes.io/rewrite-target: /$2
-  configFiles:
-    default.json: {
-        "ROLES_LIST": [
-          "USER_ROLE_abc7a2fd-4acf-4547-a194-1673f63eb37c",
-          "ADMIN_ROLE_6c1ec084-86d4-4915-ba81-6c59b87a65a6"
-        ]
-      }
-
 
 security-role-perm-operator-svc:
   enabled: true
diff --git a/mojaloop/chart-admin/Chart.yaml b/mojaloop/chart-admin/Chart.yaml
index 90769b3d..4590d093 100644
--- a/mojaloop/chart-admin/Chart.yaml
+++ b/mojaloop/chart-admin/Chart.yaml
@@ -13,4 +13,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/chart-service/Chart.yaml b/mojaloop/chart-service/Chart.yaml
index 460343e2..bd1f1540 100644
--- a/mojaloop/chart-service/Chart.yaml
+++ b/mojaloop/chart-service/Chart.yaml
@@ -13,4 +13,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
\ No newline at end of file
+    version: 3.0.0
\ No newline at end of file
diff --git a/mojaloop/common/Chart.yaml b/mojaloop/common/Chart.yaml
index ccc06a39..1bf0f75d 100644
--- a/mojaloop/common/Chart.yaml
+++ b/mojaloop/common/Chart.yaml
@@ -2,7 +2,7 @@ annotations:
   category: Infrastructure
 apiVersion: v2
 # Please make sure that version and appVersion are always the same.
-appVersion: 2.1.0
+appVersion: 3.0.0
 description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself.
 home: https://github.com/mojaloop/charts/tree/master/mojaloop/common
 icon: https://bitnami.com/downloads/logos/bitnami-mark.png
@@ -20,4 +20,4 @@ sources:
   - https://github.com/mojaloop/charts
   - http://www.bitnami.com/
 type: library
-version: 2.1.0
+version: 3.0.0
diff --git a/mojaloop/common/templates/backends/_keycloak.tpl b/mojaloop/common/templates/backends/_keycloak.tpl
new file mode 100644
index 00000000..44ca5e68
--- /dev/null
+++ b/mojaloop/common/templates/backends/_keycloak.tpl
@@ -0,0 +1,59 @@
+{{/*
+Get fully qualified keto name.
+*/}}
+{{- define "common.backends.keycloak.fullname" -}}
+  {{- if .Values.keycloak -}}
+    {{- if .Values.keycloak.fullnameOverride -}}
+      {{- .Values.keycloak.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+    {{- else -}}
+      {{- $name := default "wso2" .Values.keycloak.nameOverride -}}
+      {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- $name := default "wso2" .Values.keycloak.nameOverride -}}
+    {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Get keycloak url.
+*/}}
+{{- define "common.backends.keycloak.url" -}}
+  {{- default "http://keycloak:8080" (default .Values.global.keycloak.url .Values.keycloak.url) -}}
+{{- end -}}
+
+{{/*
+Get keycloak username.
+*/}}
+{{- define "common.backends.keycloak.user" -}}
+  {{- default "admin" (default .Values.global.keycloak.user .Values.keycloak.user) -}}
+{{- end -}}
+
+{{/*
+Get keycloak password.
+*/}}
+{{- define "common.backends.keycloak.password" -}}
+  {{- default "admin" (default .Values.global.keycloak.password .Values.keycloak.password) -}}
+{{- end -}}
+
+{{/*
+Get keycloak realm.
+*/}}
+{{- define "common.backends.keycloak.realm" -}}
+  {{- default "master" (default .Values.global.keycloak.realm .Values.keycloak.realm) -}}
+{{- end -}}
+
+{{/*
+Get keycloak secret.name
+*/}}
+{{- define "common.backends.keycloak.secret.name" -}}
+  {{- default "" (default .Values.global.keycloak.secret.name .Values.keycloak.secret.name) -}}
+{{- end -}}
+
+{{/*
+Get keycloak secret.key
+*/}}
+{{- define "common.backends.keycloak.secret.key" -}}
+  {{- default "" (default .Values.global.keycloak.secret.key .Values.keycloak.secret.key) -}}
+{{- end -}}
+
diff --git a/mojaloop/common/templates/backends/_wso2.tpl b/mojaloop/common/templates/backends/_wso2.tpl
deleted file mode 100644
index 246a77f4..00000000
--- a/mojaloop/common/templates/backends/_wso2.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{{/*
-Get fully qualified keto name.
-*/}}
-{{- define "common.backends.wso2.fullname" -}}
-  {{- if .Values.wso2 -}}
-    {{- if .Values.wso2.fullnameOverride -}}
-      {{- .Values.wso2.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-    {{- else -}}
-      {{- $name := default "wso2" .Values.wso2.nameOverride -}}
-      {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- $name := default "wso2" .Values.wso2.nameOverride -}}
-    {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-  {{- end -}}
-{{- end -}}
-
-{{/*
-Get wso2 identity-server host.
-*/}}
-{{- define "common.backends.wso2.identityServer.host" -}}
-  {{- default "localhost" (default .Values.global.wso2.identityServer.host .Values.wso2.identityServer.host) -}}
-{{- end -}}
-
-{{/*
-Get wso2 identity-server port.
-*/}}
-{{- define "common.backends.wso2.identityServer.port" -}}
-  {{- default 4467 (default .Values.global.wso2.identityServer.port .Values.wso2.identityServer.port) -}}
-{{- end -}}
-
-{{/*
-Get wso2 identity-server username.
-*/}}
-{{- define "common.backends.wso2.identityServer.user" -}}
-  {{- default "admin" (default .Values.global.wso2.identityServer.user .Values.wso2.identityServer.user) -}}
-{{- end -}}
-
-
-{{/*
-Get wso2 identity-server secret.name
-*/}}
-{{- define "common.backends.wso2.identityServer.secret.name" -}}
-  {{- default "wso2-is-admin-creds" (default .Values.global.wso2.identityServer.secret.name .Values.wso2.identityServer.secret.name) -}}
-{{- end -}}
-
-{{/*
-Get wso2 identity-server secret.key
-*/}}
-{{- define "common.backends.wso2.identityServer.secret.key" -}}
-  {{- default "password" (default .Values.global.wso2.identityServer.secret.key .Values.wso2.identityServer.secret.key) -}}
-{{- end -}}
-
-
-{{/*
-Get wso2 user list url.
-*/}}
-{{- define "common.backends.wso2.identityServer.userListURL" -}}
-  {{- default "http://wso2-identity-server.local:9443/scim2/Users" (default .Values.global.wso2.identityServer.userListURL .Values.wso2.identityServer.userListURL) -}}
-{{- end -}}
-
-{{/*
-Get wso2 introspection url.
-*/}}
-{{- define "common.backends.wso2.identityServer.introspectionURL" -}}
-  {{- default "https://wso2-identity-server.local:9443/oauth2/introspect" (default .Values.global.wso2.identityServer.introspectionURL .Values.wso2.identityServer.introspectionURL) -}}
-{{- end -}}
diff --git a/mojaloop/finance-portal/Chart.yaml b/mojaloop/finance-portal/Chart.yaml
index df6ec446..7af66b85 100644
--- a/mojaloop/finance-portal/Chart.yaml
+++ b/mojaloop/finance-portal/Chart.yaml
@@ -15,20 +15,27 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.0.0
+version: 4.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.0.0"
+appVersion: "4.1.0"
 dependencies:
   - name: common
     repository: "file://../common"
     tags:
       - mojaloop
       - common
-    version: 2.1.0
+    version: 3.0.0
+  - name: role-assignment-service
+    condition: role-assignment-service.enabled
+    repository: "file://../role-assignment-service"
+    tags:
+      - mojaloop
+      - role-assignment-service
+    version: 3.0.0
   - name: reporting-hub-bop-shell
     condition: reporting-hub-bop-shell.enabled
     repository: "file://../reporting-hub-bop-shell"
diff --git a/mojaloop/finance-portal/values.yaml b/mojaloop/finance-portal/values.yaml
index 7804c1ce..1ab858f2 100644
--- a/mojaloop/finance-portal/values.yaml
+++ b/mojaloop/finance-portal/values.yaml
@@ -36,6 +36,16 @@ global:
     host: test1-kafka-headless
     port: 9092
     topic: topic-event
+  rolePermOperator:
+    apiSvc: {}
+  keycloak:
+    url: 'http://keycloak:8080'
+    user: 'admin'
+    password: ''
+    # secret:
+    #   name: 'keycloak-secret'
+    #   key: 'password'
+    realm: 'master'
 
 ## TODO: Disabling the tests by default for now. Need to figure out how to configure the tests.
 ## RBAC Tests
@@ -177,10 +187,26 @@ reportTests:
   initContainers: []
 
 ## Backend API services
+role-assignment-service:
+  enabled: true
+  ingress:
+    enabled: false
+    hostname: api-bof.local
+    path: /proxy/iam(/|$)(.*)
+    annotations:
+      nginx.ingress.kubernetes.io/rewrite-target: /$2
+  configFiles:
+    default.json: {
+        "ROLES_LIST": [
+          "USER_ROLE_abc7a2fd-4acf-4547-a194-1673f63eb37c",
+          "ADMIN_ROLE_6c1ec084-86d4-4915-ba81-6c59b87a65a6"
+        ]
+      }
+
 reporting-hub-bop-api-svc:
   enabled: true
   ingress:
-    enabled: true
+    enabled: false
     hostname: api-bof.local
     path: /proxy/transfers(/|$)(.*)
     annotations:
@@ -189,7 +215,7 @@ reporting-hub-bop-api-svc:
 reporting-legacy-api:
   enabled: true
   ingress:
-    enabled: true
+    enabled: false
     hostname: api-bof.local
     path: /proxy/reports(/|$)(.*)
     annotations:
@@ -220,7 +246,7 @@ reporting-hub-bop-shell:
 reporting-hub-bop-role-ui:
   enabled: true
   ingress:
-    enabled: true
+    enabled: false
     pathType: ImplementationSpecific
     hostname: reporting-hub-bop-role-ui.local
   config:
@@ -230,7 +256,7 @@ reporting-hub-bop-role-ui:
 reporting-hub-bop-trx-ui:
   enabled: true
   ingress:
-    enabled: true
+    enabled: false
     pathType: ImplementationSpecific
     hostname: reporting-hub-bop-trx-ui.local
   config:
@@ -240,7 +266,7 @@ reporting-hub-bop-trx-ui:
 reporting-hub-bop-positions-ui:
   enabled: true
   ingress:
-    enabled: true
+    enabled: false
     pathType: ImplementationSpecific
     hostname: reporting-hub-bop-positions-ui.local
   config:
@@ -250,7 +276,7 @@ reporting-hub-bop-positions-ui:
 reporting-hub-bop-settlements-ui:
   enabled: true
   ingress:
-    enabled: true
+    enabled: false
     pathType: ImplementationSpecific
     hostname: reporting-hub-bop-settlements-ui.local
   config:
diff --git a/mojaloop/fspiop-transfer-api-svc/Chart.yaml b/mojaloop/fspiop-transfer-api-svc/Chart.yaml
index f5b75596..eaf8544a 100644
--- a/mojaloop/fspiop-transfer-api-svc/Chart.yaml
+++ b/mojaloop/fspiop-transfer-api-svc/Chart.yaml
@@ -19,4 +19,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/mojaloop/Chart.yaml b/mojaloop/mojaloop/Chart.yaml
index f9562d1a..7e0e7436 100644
--- a/mojaloop/mojaloop/Chart.yaml
+++ b/mojaloop/mojaloop/Chart.yaml
@@ -28,7 +28,7 @@ dependencies:
     tags:
       - mojaloop
       - common
-    version: 2.1.0
+    version: 3.0.0
   - name: fspiop-transfer-api-svc
     repository: "file://../fspiop-transfer-api-svc"
     tags:
diff --git a/mojaloop/reporting-events-processor-svc/Chart.yaml b/mojaloop/reporting-events-processor-svc/Chart.yaml
index 9295407d..9fe122db 100644
--- a/mojaloop/reporting-events-processor-svc/Chart.yaml
+++ b/mojaloop/reporting-events-processor-svc/Chart.yaml
@@ -17,4 +17,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-hub-bop-api-svc/Chart.yaml b/mojaloop/reporting-hub-bop-api-svc/Chart.yaml
index 82fb143c..0e21a631 100644
--- a/mojaloop/reporting-hub-bop-api-svc/Chart.yaml
+++ b/mojaloop/reporting-hub-bop-api-svc/Chart.yaml
@@ -17,4 +17,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-hub-bop-experience-api-svc/Chart.yaml b/mojaloop/reporting-hub-bop-experience-api-svc/Chart.yaml
index ec03135e..688615b0 100644
--- a/mojaloop/reporting-hub-bop-experience-api-svc/Chart.yaml
+++ b/mojaloop/reporting-hub-bop-experience-api-svc/Chart.yaml
@@ -17,4 +17,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml b/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml
index 05de6f79..f3dc5afb 100644
--- a/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml
+++ b/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml
@@ -19,4 +19,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-hub-bop-role-ui/Chart.yaml b/mojaloop/reporting-hub-bop-role-ui/Chart.yaml
index 01af5b83..5b179514 100644
--- a/mojaloop/reporting-hub-bop-role-ui/Chart.yaml
+++ b/mojaloop/reporting-hub-bop-role-ui/Chart.yaml
@@ -19,4 +19,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml b/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml
index 21b6bbe8..aeb0ada4 100644
--- a/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml
+++ b/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml
@@ -19,4 +19,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-hub-bop-shell/Chart.yaml b/mojaloop/reporting-hub-bop-shell/Chart.yaml
index 36f0e4e9..57e6e51d 100644
--- a/mojaloop/reporting-hub-bop-shell/Chart.yaml
+++ b/mojaloop/reporting-hub-bop-shell/Chart.yaml
@@ -17,4 +17,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml b/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml
index 20e838c4..e4945a81 100644
--- a/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml
+++ b/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml
@@ -19,4 +19,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/reporting-legacy-api/Chart.yaml b/mojaloop/reporting-legacy-api/Chart.yaml
index c8260120..f4f9c5f4 100644
--- a/mojaloop/reporting-legacy-api/Chart.yaml
+++ b/mojaloop/reporting-legacy-api/Chart.yaml
@@ -17,7 +17,7 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
   - name: reporting-k8s-templates
     alias: reporting-k8s-templates
     condition: install-templates
diff --git a/mojaloop/role-assignment-service/Chart.yaml b/mojaloop/role-assignment-service/Chart.yaml
index 23175d1a..7c0edca6 100644
--- a/mojaloop/role-assignment-service/Chart.yaml
+++ b/mojaloop/role-assignment-service/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: API service for assigning roles and participants to users
 name: role-assignment-service
-version: 2.0.0
-appVersion: "1.0.1"
+version: 3.0.0
+appVersion: "2.0.0"
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
@@ -17,4 +17,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/role-assignment-service/templates/deployment.yaml b/mojaloop/role-assignment-service/templates/deployment.yaml
index a5a3e8ef..4c32c466 100644
--- a/mojaloop/role-assignment-service/templates/deployment.yaml
+++ b/mojaloop/role-assignment-service/templates/deployment.yaml
@@ -106,12 +106,14 @@ spec:
           volumeMounts:
             - name: {{ template "common.names.fullname" . }}-config-volume
               mountPath: /opt/role-assignment-service/config
+          {{- if (include "common.backends.keycloak.secret.name" .) }}
           env:
-            - name: ROLE_ASSIGNMENT_SERVICE_WSO2_PASSWORD
+            - name: ROLE_ASSIGNMENT_SERVICE_KEYCLOAK_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: '{{ include "common.backends.wso2.identityServer.secret.name" . }}'
-                  key: '{{ include "common.backends.wso2.identityServer.secret.key" . }}'
+                  name: '{{ include "common.backends.keycloak.secret.name" . }}'
+                  key: '{{ include "common.backends.keycloak.secret.key" . }}'
+          {{- end }}
       volumes:
         - name: {{ template "common.names.fullname" . }}-config-volume
           configMap:
diff --git a/mojaloop/role-assignment-service/values.yaml b/mojaloop/role-assignment-service/values.yaml
index a06b6f8e..de8aaf52 100644
--- a/mojaloop/role-assignment-service/values.yaml
+++ b/mojaloop/role-assignment-service/values.yaml
@@ -17,13 +17,19 @@ global:
   storageClass: ""
   keto: {}
   adminApiSvc: {}
-  wso2:
-    identityServer:
-      secret: {}
   rolePermOperator:
     mojaloopRole: {}
     mojaloopPermissionExclusion: {}
     apiSvc: {}
+  keycloak:
+    url: 'http://keycloak:8080'
+    user: 'admin'
+    password: ''
+    secret: {}
+    # secret:
+    #   name: 'keycloak-secret'
+    #   key: 'password'
+    realm: 'master'
 
 podAffinityPreset: ""
 ## @param podAntiAffinityPreset Pod anti-affinity preset. Ignored if `main.affinity` is set. Allowed values: `soft` or `hard`
@@ -85,7 +91,7 @@ containerSecurityContext:
 image:
   registry: docker.io
   repository: mojaloop/role-assignment-service
-  tag: v1.0.1
+  tag: v2.0.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
@@ -194,9 +200,9 @@ keto: {}
 #   readURL: 'http://keto-read'
 #   writeURL: 'http://keto-write'
 
-wso2:
-  identityServer:
-    secret: {}
+keycloak:
+  secret: {}
+  refreshInterval: 58000
 
 rolePermOperator:
   mojaloopRole: {}
@@ -377,8 +383,11 @@ configFiles:
       "ROLE_OPERATOR_SERVICE_URL": '{{ printf "http://%s:%s" (include "common.backends.rolePermOperator.apiSvc.host" .) (include "common.backends.rolePermOperator.apiSvc.port" .) }}',
       "ORY_KETO_READ_SERVICE_URL": '{{ include "common.backends.keto.readURL" . }}',
       "ORY_KETO_WRITE_SERVICE_URL": '{{ include "common.backends.keto.writeURL" . }}',
-      "WSO2IS_USER_LIST_URL": '{{ include "common.backends.wso2.identityServer.userListURL" . }}',
-      "WSO2_USER": '{{ include "common.backends.wso2.identityServer.user" . }}',
+      "KEYCLOAK_URL": '{{ include "common.backends.keycloak.url" . }}',
+      "KEYCLOAK_USER": '{{ include "common.backends.keycloak.user" . }}',
+      "KEYCLOAK_PASSWORD": '{{ include "common.backends.keycloak.password" . }}',
+      "KEYCLOAK_REALM": '{{ include "common.backends.keycloak.realm" . }}',
+      "KEYCLOAK_REFRESH_INTERVAL": '{{ .Values.keycloak.refreshInterval }}',
       "ERROR_HANDLING": {
         "includeCauseExtension": true,
         "truncateExtensions": true
diff --git a/mojaloop/security-hub-bop-kratos-ui/Chart.yaml b/mojaloop/security-hub-bop-kratos-ui/Chart.yaml
index a5dc4119..7453eeec 100644
--- a/mojaloop/security-hub-bop-kratos-ui/Chart.yaml
+++ b/mojaloop/security-hub-bop-kratos-ui/Chart.yaml
@@ -17,4 +17,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/mojaloop/security-role-perm-operator-svc/Chart.yaml b/mojaloop/security-role-perm-operator-svc/Chart.yaml
index f9c21f28..7fedba66 100644
--- a/mojaloop/security-role-perm-operator-svc/Chart.yaml
+++ b/mojaloop/security-role-perm-operator-svc/Chart.yaml
@@ -17,4 +17,4 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
diff --git a/template/CHART_NAME/Chart.yaml b/template/CHART_NAME/Chart.yaml
index 1e8bd1d3..3b8e7c2d 100644
--- a/template/CHART_NAME/Chart.yaml
+++ b/template/CHART_NAME/Chart.yaml
@@ -7,7 +7,7 @@ dependencies:
     repository: "file://../common"
     tags:
       - moja-common
-    version: 2.1.0
+    version: 3.0.0
   - condition: SUBCHART_NAME.enabled
     name: SUBCHART_NAME
     repository: https://charts.bitnami.com/bitnami