diff --git a/central/Chart.yaml b/central/Chart.yaml
index 72095103e..eab437892 100644
--- a/central/Chart.yaml
+++ b/central/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central Helm chart for Kubernetes
 name: central
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/central/requirements.yaml b/central/requirements.yaml
index de7dc02d4..bab708b15 100644
--- a/central/requirements.yaml
+++ b/central/requirements.yaml
@@ -5,7 +5,7 @@ dependencies:
 #  repository: "file://../centralhub"
 #  condition: centralhub.enabled
 - name: centralledger
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://../centralledger"
   condition: centralledger.enabled
 - name: centraldirectory
@@ -13,6 +13,6 @@ dependencies:
   repository: "file://../centraldirectory"
   condition: centraldirectory.enabled
 - name: centralsettlement
-  version: 3.8.0
+  version: 3.8.1
   repository: "file://../centralsettlement"
   condition: centralsettlement.enabled
diff --git a/central/values.yaml b/central/values.yaml
index 15654589e..fbde6513d 100644
--- a/central/values.yaml
+++ b/central/values.yaml
@@ -99,7 +99,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -779,7 +779,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -1470,7 +1470,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -2160,7 +2160,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -2851,7 +2851,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -3541,7 +3541,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -4231,7 +4231,7 @@ centralledger:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -5934,7 +5934,7 @@ centralsettlement:
     db_type: 'mysql'
     # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
     db_driver: 'mysql'
-    db_host: centralledger-mysql
+    db_host: '$release_name-centralledger-mysql'
     db_port: 3306
     db_user: central_ledger
     db_password: oyMxgZChuu
diff --git a/centralhub/Chart.yaml b/centralhub/Chart.yaml
index eeb5d67ce..e5162d25e 100644
--- a/centralhub/Chart.yaml
+++ b/centralhub/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Hub Helm chart for Kubernetes
 name: centralhub
-version: 3.5.1
+version: 3.5.2
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralhub/requirements.yaml b/centralhub/requirements.yaml
index df7e4a7f1..6ef8c967f 100644
--- a/centralhub/requirements.yaml
+++ b/centralhub/requirements.yaml
@@ -1,6 +1,6 @@
 # requirements.yaml
 dependencies:
 - name: centralledger
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://../centralledger"
   condition: centralledger.enabled
diff --git a/centralhub/values.yaml b/centralhub/values.yaml
index e599e635a..e62fc7dd3 100644
--- a/centralhub/values.yaml
+++ b/centralhub/values.yaml
@@ -181,7 +181,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -861,7 +861,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -1552,7 +1552,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -2242,7 +2242,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -2933,7 +2933,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -3623,7 +3623,7 @@ centralledger:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu
@@ -4313,7 +4313,7 @@ centralledger:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
diff --git a/centralledger/Chart.yaml b/centralledger/Chart.yaml
index 45c81b505..48c75b4fa 100644
--- a/centralledger/Chart.yaml
+++ b/centralledger/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Helm chart for Kubernetes
 name: centralledger
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-handler-admin-transfer/Chart.yaml b/centralledger/chart-handler-admin-transfer/Chart.yaml
index 8f9d76b8a..7e209cdf3 100644
--- a/centralledger/chart-handler-admin-transfer/Chart.yaml
+++ b/centralledger/chart-handler-admin-transfer/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes
 name: centralledger-handler-admin-transfer
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-handler-admin-transfer/templates/secret.yaml b/centralledger/chart-handler-admin-transfer/templates/secret.yaml
index af0d50fe0..e50b8161d 100644
--- a/centralledger/chart-handler-admin-transfer/templates/secret.yaml
+++ b/centralledger/chart-handler-admin-transfer/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralledger/chart-handler-admin-transfer/values.yaml b/centralledger/chart-handler-admin-transfer/values.yaml
index 7272a607c..cdb25249e 100644
--- a/centralledger/chart-handler-admin-transfer/values.yaml
+++ b/centralledger/chart-handler-admin-transfer/values.yaml
@@ -57,7 +57,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/centralledger/chart-handler-timeout/Chart.yaml b/centralledger/chart-handler-timeout/Chart.yaml
index e1cdba348..ee3525781 100644
--- a/centralledger/chart-handler-timeout/Chart.yaml
+++ b/centralledger/chart-handler-timeout/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Timeout Handler Helm chart for Kubernetes
 name: centralledger-handler-timeout
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-handler-timeout/templates/secret.yaml b/centralledger/chart-handler-timeout/templates/secret.yaml
index 3fe382aee..e59300782 100644
--- a/centralledger/chart-handler-timeout/templates/secret.yaml
+++ b/centralledger/chart-handler-timeout/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralledger/chart-handler-timeout/values.yaml b/centralledger/chart-handler-timeout/values.yaml
index b701954d6..26ea39704 100644
--- a/centralledger/chart-handler-timeout/values.yaml
+++ b/centralledger/chart-handler-timeout/values.yaml
@@ -57,7 +57,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/centralledger/chart-handler-transfer-fulfil/Chart.yaml b/centralledger/chart-handler-transfer-fulfil/Chart.yaml
index 3ed12739d..afc858f2e 100644
--- a/centralledger/chart-handler-transfer-fulfil/Chart.yaml
+++ b/centralledger/chart-handler-transfer-fulfil/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Transfer Fulfil Handler Helm chart for Kubernetes
 name: centralledger-handler-transfer-fulfil
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-handler-transfer-fulfil/templates/secret.yaml b/centralledger/chart-handler-transfer-fulfil/templates/secret.yaml
index 945fdf9df..6c5652d7f 100644
--- a/centralledger/chart-handler-transfer-fulfil/templates/secret.yaml
+++ b/centralledger/chart-handler-transfer-fulfil/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralledger/chart-handler-transfer-fulfil/values.yaml b/centralledger/chart-handler-transfer-fulfil/values.yaml
index f17e8b60a..2c07f4ccd 100644
--- a/centralledger/chart-handler-transfer-fulfil/values.yaml
+++ b/centralledger/chart-handler-transfer-fulfil/values.yaml
@@ -57,7 +57,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/centralledger/chart-handler-transfer-get/Chart.yaml b/centralledger/chart-handler-transfer-get/Chart.yaml
index f2df53993..234884599 100644
--- a/centralledger/chart-handler-transfer-get/Chart.yaml
+++ b/centralledger/chart-handler-transfer-get/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Get Transfer Handler Helm chart for Kubernetes
 name: centralledger-handler-transfer-get
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-handler-transfer-get/templates/secret.yaml b/centralledger/chart-handler-transfer-get/templates/secret.yaml
index 99e18abcc..805abdf84 100644
--- a/centralledger/chart-handler-transfer-get/templates/secret.yaml
+++ b/centralledger/chart-handler-transfer-get/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralledger/chart-handler-transfer-get/values.yaml b/centralledger/chart-handler-transfer-get/values.yaml
index ae7339da3..d512bc7c3 100644
--- a/centralledger/chart-handler-transfer-get/values.yaml
+++ b/centralledger/chart-handler-transfer-get/values.yaml
@@ -57,7 +57,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/centralledger/chart-handler-transfer-position/Chart.yaml b/centralledger/chart-handler-transfer-position/Chart.yaml
index e5dc8a07a..f1e2c8b64 100644
--- a/centralledger/chart-handler-transfer-position/Chart.yaml
+++ b/centralledger/chart-handler-transfer-position/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Transfer Position Handler Helm chart for Kubernetes
 name: centralledger-handler-transfer-position
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-handler-transfer-position/templates/secret.yaml b/centralledger/chart-handler-transfer-position/templates/secret.yaml
index 7e474758b..f3f6420a3 100644
--- a/centralledger/chart-handler-transfer-position/templates/secret.yaml
+++ b/centralledger/chart-handler-transfer-position/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralledger/chart-handler-transfer-position/values.yaml b/centralledger/chart-handler-transfer-position/values.yaml
index 98241c25b..2db9d63fe 100644
--- a/centralledger/chart-handler-transfer-position/values.yaml
+++ b/centralledger/chart-handler-transfer-position/values.yaml
@@ -57,7 +57,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/centralledger/chart-handler-transfer-prepare/Chart.yaml b/centralledger/chart-handler-transfer-prepare/Chart.yaml
index b8d4d63b5..7764a2bcc 100644
--- a/centralledger/chart-handler-transfer-prepare/Chart.yaml
+++ b/centralledger/chart-handler-transfer-prepare/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes
 name: centralledger-handler-transfer-prepare
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-handler-transfer-prepare/templates/secret.yaml b/centralledger/chart-handler-transfer-prepare/templates/secret.yaml
index 26863a85f..c4a582e0a 100644
--- a/centralledger/chart-handler-transfer-prepare/templates/secret.yaml
+++ b/centralledger/chart-handler-transfer-prepare/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralledger/chart-handler-transfer-prepare/values.yaml b/centralledger/chart-handler-transfer-prepare/values.yaml
index 7158e6ab2..c08b6ef0e 100644
--- a/centralledger/chart-handler-transfer-prepare/values.yaml
+++ b/centralledger/chart-handler-transfer-prepare/values.yaml
@@ -57,7 +57,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/centralledger/chart-service/Chart.yaml b/centralledger/chart-service/Chart.yaml
index 257350877..96860f50a 100644
--- a/centralledger/chart-service/Chart.yaml
+++ b/centralledger/chart-service/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Ledger Service Helm chart for Kubernetes
 name: centralledger-service
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralledger/chart-service/templates/secret.yaml b/centralledger/chart-service/templates/secret.yaml
index 6081f4aa1..4a2e756cf 100644
--- a/centralledger/chart-service/templates/secret.yaml
+++ b/centralledger/chart-service/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralledger/chart-service/values.yaml b/centralledger/chart-service/values.yaml
index ecc5a1c9d..97f1a94f0 100644
--- a/centralledger/chart-service/values.yaml
+++ b/centralledger/chart-service/values.yaml
@@ -88,7 +88,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/centralledger/requirements.yaml b/centralledger/requirements.yaml
index b40265db6..6dd07df41 100644
--- a/centralledger/requirements.yaml
+++ b/centralledger/requirements.yaml
@@ -1,31 +1,31 @@
 # requirements.yaml
 dependencies:
 - name: centralledger-service
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://./chart-service"
   condition: centralledger-service.enabled
 - name: centralledger-handler-transfer-prepare
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://./chart-handler-transfer-prepare"
   condition: centralledger-handler-transfer-prepare.enabled
 - name: centralledger-handler-transfer-position
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://./chart-handler-transfer-position"
   condition: centralledger-handler-transfer-position.enabled
 - name: centralledger-handler-transfer-get
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://./chart-handler-transfer-get"
   condition: centralledger-handler-transfer-get.enabled
 - name: centralledger-handler-transfer-fulfil
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://./chart-handler-transfer-fulfil"
   condition: centralledger-handler-transfer-fulfil.enabled
 - name: centralledger-handler-timeout
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://./chart-handler-timeout"
   condition: centralledger-handler-timeout.enabled
 - name: centralledger-handler-admin-transfer
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://./chart-handler-admin-transfer"
   condition: centralledger-handler-transfer-get.enabled
 - name: forensicloggingsidecar
diff --git a/centralledger/values.yaml b/centralledger/values.yaml
index f99a05ed9..bb7600a60 100644
--- a/centralledger/values.yaml
+++ b/centralledger/values.yaml
@@ -94,7 +94,7 @@ centralledger-service:
     db_type: 'mysql'
     # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
     db_driver: 'mysql'
-    db_host: centralledger-mysql
+    db_host: '$release_name-centralledger-mysql'
     db_port: 3306
     db_user: central_ledger
     db_password: oyMxgZChuu
@@ -774,7 +774,7 @@ centralledger-handler-transfer-prepare:
     db_type: 'mysql'
     # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
     db_driver: 'mysql'
-    db_host: centralledger-mysql
+    db_host: '$release_name-centralledger-mysql'
     db_port: 3306
     db_user: central_ledger
     db_password: oyMxgZChuu
@@ -1463,7 +1463,7 @@ centralledger-handler-transfer-position:
     db_type: 'mysql'
     # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
     db_driver: 'mysql'
-    db_host: centralledger-mysql
+    db_host: '$release_name-centralledger-mysql'
     db_port: 3306
     db_user: central_ledger
     db_password: oyMxgZChuu
@@ -2151,7 +2151,7 @@ centralledger-handler-transfer-get:
     db_type: 'mysql'
     # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
     db_driver: 'mysql'
-    db_host: centralledger-mysql
+    db_host: '$release_name-centralledger-mysql'
     db_port: 3306
     db_user: central_ledger
     db_password: oyMxgZChuu
@@ -2840,7 +2840,7 @@ centralledger-handler-transfer-fulfil:
     db_type: 'mysql'
     # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
     db_driver: 'mysql'
-    db_host: centralledger-mysql
+    db_host: '$release_name-centralledger-mysql'
     db_port: 3306
     db_user: central_ledger
     db_password: oyMxgZChuu
@@ -3528,7 +3528,7 @@ centralledger-handler-timeout:
     db_type: 'mysql'
     # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
     db_driver: 'mysql'
-    db_host: centralledger-mysql
+    db_host: '$release_name-centralledger-mysql'
     db_port: 3306
     db_user: central_ledger
     db_password: oyMxgZChuu
@@ -4216,7 +4216,7 @@ centralledger-handler-admin-transfer:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
diff --git a/centralsettlement/Chart.yaml b/centralsettlement/Chart.yaml
index c40a9895e..490372603 100644
--- a/centralsettlement/Chart.yaml
+++ b/centralsettlement/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Central-Settlement Helm chart for Kubernetes
 name: centralsettlement
-version: 3.8.0
+version: 3.8.1
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/centralsettlement/templates/secret.yaml b/centralsettlement/templates/secret.yaml
index 26ad134f8..396705933 100644
--- a/centralsettlement/templates/secret.yaml
+++ b/centralsettlement/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $dbHost := printf "%s-%s" .Release.Name .Values.config.db_host -}}
+{{- $dbHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }}
 {{- $dbURL := printf "%s://%s:%s@%s:%.0f/%s" .Values.config.db_type .Values.config.db_user .Values.config.db_password $dbHost .Values.config.db_port .Values.config.db_database -}}
 apiVersion: v1
 kind: Secret
diff --git a/centralsettlement/values.yaml b/centralsettlement/values.yaml
index 335020a1c..da540e9d5 100644
--- a/centralsettlement/values.yaml
+++ b/centralsettlement/values.yaml
@@ -44,7 +44,7 @@ config:
   db_type: 'mysql'
   # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
   db_driver: 'mysql'
-  db_host: centralledger-mysql
+  db_host: '$release_name-centralledger-mysql'
   db_port: 3306
   db_user: central_ledger
   db_password: oyMxgZChuu
diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml
index acbaeb893..b244f4694 100644
--- a/mojaloop/Chart.yaml
+++ b/mojaloop/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Mojaloop Helm chart for Kubernetes
 name: mojaloop
-version: 3.8.4
+version: 3.8.5
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/mojaloop/requirements.yaml b/mojaloop/requirements.yaml
index 2c6c38e0d..c041e48c3 100644
--- a/mojaloop/requirements.yaml
+++ b/mojaloop/requirements.yaml
@@ -1,7 +1,7 @@
 # requirements.yaml
 dependencies:
 - name: central
-  version: 3.8.4
+  version: 3.8.5
   repository: "file://../central"
   condition: central.enabled
 - name: interop-switch
diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml
index 6df575719..ede7143b2 100644
--- a/mojaloop/values.yaml
+++ b/mojaloop/values.yaml
@@ -101,7 +101,7 @@ central:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -781,7 +781,7 @@ central:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -1471,7 +1471,7 @@ central:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -2161,7 +2161,7 @@ central:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -2851,7 +2851,7 @@ central:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -3541,7 +3541,7 @@ central:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -4231,7 +4231,7 @@ central:
         db_type: 'mysql'
         # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
         db_driver: 'mysql'
-        db_host: centralledger-mysql
+        db_host: '$release_name-centralledger-mysql'
         db_port: 3306
         db_user: central_ledger
         db_password: oyMxgZChuu
@@ -5935,7 +5935,7 @@ central:
       db_type: 'mysql'
       # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set.
       db_driver: 'mysql'
-      db_host: centralledger-mysql
+      db_host: '$release_name-centralledger-mysql'
       db_port: 3306
       db_user: central_ledger
       db_password: oyMxgZChuu