diff --git a/configmaps/econsent-service-configs-new.yml b/configmaps/econsent-service-configs-new.yml
index 3ed4040..ee52060 100644
--- a/configmaps/econsent-service-configs-new.yml
+++ b/configmaps/econsent-service-configs-new.yml
@@ -11,7 +11,7 @@ data:
   AppKeys__VidaPlusLoginUri: https://csi-dev.cloudsolutions.lk/auth/realms
   AppKeys__patientInformationGetCSI: http://csi-net-empiread/api/ConsentScreen/patients/
   AppKeys__patientInformationPostCSI: http://csi-pms-adt-request/consent/confirm
-  ConnectionStrings__Pg: Host=172.15.100.240;Port=5432;Database=quat;User Id=em_management;Password=devpg123;
+  ConnectionStrings__Pg: Host=172.15.100.52;Port=5432;Database=quat;User Id=em_management;Password=quatpg123;
   ServiceUrls__AltServiceUri: https://csi-iam-service/
   ServiceUrls__Tenant: csi.dev
   ServiceUrls__ConnectionString: pg
diff --git a/configmaps/econsent-service-configs.yml b/configmaps/econsent-service-configs.yml
index f345b4a..aa129ad 100644
--- a/configmaps/econsent-service-configs.yml
+++ b/configmaps/econsent-service-configs.yml
@@ -11,7 +11,7 @@ data:
   AppKeys__VidaPlusLoginUri: https://csi.dev.cloudsol.lk/auth/realms
   AppKeys__patientInformationGetCSI: http://csi-net-empiread/api/ConsentScreen/patients/
   AppKeys__patientInformationPostCSI: http://csi-pms-adt-request/consent/confirm
-  ConnectionStrings__Pg: Host=172.15.100.240;Port=5432;Database=quat;User Id=em_management;Password=devpg123;
+  ConnectionStrings__Pg: Host=172.15.100.52;Port=5432;Database=quat;User Id=em_management;Password=quatpg123;
   ServiceUrls__AltServiceUri: https://csi-iam-service/
   ServiceUrls__Tenant: csi.dev
   ServiceUrls__ConnectionString: pg
diff --git a/configmaps/hhc-service-configs.yaml b/configmaps/hhc-service-configs.yaml
index 70519c4..687d5e4 100644
--- a/configmaps/hhc-service-configs.yaml
+++ b/configmaps/hhc-service-configs.yaml
@@ -3,8 +3,8 @@ data:
   kafka__servers: "172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092"
   kafka__referral-status-topic: hhc-referral-status
   Provider: PostgreSQL
-  WriteCon: "Host=172.15.100.240;Port=5432;Database=quat;User Id=csi_hhc;Password=devpg123"
-  ReadCon: "Host=172.15.100.240;Port=5432;Database=quat;User Id=csi_hhc;Password=devpg123"
+  WriteCon: "Host=172.15.100.52;Port=5432;Database=quat;User Id=csi_hhc;Password=quatpg123"
+  ReadCon: "Host=172.15.100.52;Port=5432;Database=quat;User Id=csi_hhc;Password=quatpg123"
   Report__Mongo__ConnectionString: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&tlsAllowInvalidCertificates=true
   Report__Mongo__DbName: csi-net-reporting
   Report__Mongo__Collection: HHC
diff --git a/secrets/baseutil-service-secret.yml b/secrets/baseutil-service-secret.yml
index e49e15f..ee63c33 100644
--- a/secrets/baseutil-service-secret.yml
+++ b/secrets/baseutil-service-secret.yml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  db-base-utility-password: ZGV2cGcxMjM=
+  db-base-utility-password: cXVhdHBnMTIz
   db-base-utility-username: dnBfYmFzZXV0aWw=
 kind: Secret
 metadata:
diff --git a/secrets/ehr-database-secret.yml b/secrets/ehr-database-secret.yml
index 72bdd38..2148140 100644
--- a/secrets/ehr-database-secret.yml
+++ b/secrets/ehr-database-secret.yml
@@ -1,41 +1,41 @@
 apiVersion: v1
 data:
-  db-com-password: ZGV2cGcxMjM=
+  db-com-password: cXVhdHBnMTIz
   db-com-username: ZWhfY29tbW1vbg==
-  db-con-password: ZGV2cGcxMjM= 
+  db-con-password: cXVhdHBnMTIz 
   db-con-username: ZWhfY29uZmln
-  db-con-password-second: ZGV2cGcxMjM=
+  db-con-password-second: cXVhdHBnMTIz
   db-con-username-second: ZWhfY29uZmln
   db-database: UE9TVEdSRVNRTA==
-  db-icb-password: ZGV2cGcxMjM=
+  db-icb-password: cXVhdHBnMTIz
   db-icb-username: ZWhfaWNidW5kbGU=
-  db-icd-password: ZGV2cGcxMjM=
+  db-icd-password: cXVhdHBnMTIz
   db-icd-username: ZWhfaWNkYXNoYm9hcmQ=
-  db-ini-password: ZGV2cGcxMjM=
+  db-ini-password: cXVhdHBnMTIz
   db-ini-username: ZWhfaW5pdGlhbGFzc21udA==
-  db-ip-password: ZGV2cGcxMjM=
+  db-ip-password: cXVhdHBnMTIz
   db-ip-username: ZWhfaXA=
-  db-ldr-password: ZGV2cGcxMjM=
+  db-ldr-password: cXVhdHBnMTIz
   db-ldr-username: ZWhfbGRy
-  db-lis-password: ZGV2cGcxMjM=
+  db-lis-password: cXVhdHBnMTIz
   db-lis-username: ZWhfbGlz
-  db-opd-password: ZGV2cGcxMjM=
+  db-opd-password: cXVhdHBnMTIz
   db-opd-username: ZWhfb3Bk
-  db-or-anesthesia-password: ZGV2cGcxMjM=
+  db-or-anesthesia-password: cXVhdHBnMTIz
   db-or-anesthesia-username: ZWhfb3JhbmVzdGhlc2lh
-  db-or-book-password: ZGV2cGcxMjM=
+  db-or-book-password: cXVhdHBnMTIz
   db-or-book-username: ZWhfb3Jib29r
-  db-or-booking-password: ZGV2cGcxMjM=
+  db-or-booking-password: cXVhdHBnMTIz
   db-or-booking-username: ZWhfb3Jib29raW5n
-  db-pom-password: ZGV2cGcxMjM=
+  db-pom-password: cXVhdHBnMTIz
   db-pom-username: ZWhfcG9tcg==
-  db-rep-password: ZGV2cGcxMjM=
+  db-rep-password: cXVhdHBnMTIz
   db-rep-username: ZWgtcmVwb3J0
-  db-sch-password: ZGV2cGcxMjM=
+  db-sch-password: cXVhdHBnMTIz
   db-sch-username: ZWhfc2NoZWR1bGU=
-  db-tem-password: ZGV2cGcxMjM=
+  db-tem-password: cXVhdHBnMTIz
   db-tem-username: ZWhfdGVtcGxhdGU=
-  db-spe-password: ZGV2cGcxMjM=
+  db-spe-password: cXVhdHBnMTIz
   db-spe-username: ZWhfc3BlY2xjbGluaWM=
 kind: Secret
 metadata:
diff --git a/secrets/post-data-migration-secrets.yaml b/secrets/post-data-migration-secrets.yaml
index f0cb02f..6d97884 100644
--- a/secrets/post-data-migration-secrets.yaml
+++ b/secrets/post-data-migration-secrets.yaml
@@ -2,140 +2,140 @@ apiVersion: v1
 data:
   GITEA_UN: Z2l0ZWE=
   GITEA_PW: Z2l0ZWElNDBjc2k=
-  SC_IAM_PASSWORD: ZGV2cGcxMjM=
+  SC_IAM_PASSWORD: cXVhdHBnMTIz
   SC_IAM_USER: c2NfaWFt
   VP_BASEUTIL_USERNAME: dnBfYmFzZXV0aWw=
-  VP_BASEUTIL_PASSWORD: ZGV2cGcxMjM=
+  VP_BASEUTIL_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_baseutilityservicejava_USERNAME: dnBfYmFzZXV0aWw=
-  CSI_INIT_DB_baseutilityservicejava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_baseutilityservicejava_PASSWORD: cXVhdHBnMTIz
   BM_PROMOTION_USERNAME: YmxfcHJvbW90aW9u
   BM_PROMOTION_PASSWORD: ImJscEBobWd1YXQi
 
-  CSI_INIT_DB_rmsmasterdata_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_rmsmasterdata_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_rmsmasterdata_USERNAME: cm1fbWFzdGVyZGF0YQ==
   TENANT_DATA_DB_USERNAME: cm1fbWFzdGVyZGF0YQ==
-  TENANT_DATA_DB_PASSWORD: ZGV2cGcxMjM=
+  TENANT_DATA_DB_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_baseutilityservicejava_USERNAME: dnBfYmFzZXV0aWw=
-  CSI_INIT_DB_baseutilityservicejava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_baseutilityservicejava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_CONFIG_USERNAME: ZWhfY29uZmln
-  CSI_INIT_DB_CONFIG_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_CONFIG_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_bloodbankjava_USERNAME: QkJfQkxPT0RCQU5L 
-  CSI_INIT_DB_bloodbankjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_bloodbankjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_BB_TRANS_USERNAME: QkJfVFJBTlNGVVNJT04=
-  CSI_INIT_DB_BB_TRANS_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_BB_TRANS_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_labmgmtdotnet_USERNAME: bGJfbGFic2VydmljZQ==
-  CSI_INIT_DB_labmgmtdotnet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_labmgmtdotnet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_rmsmorgue_USERNAME: cm1fbW9yZ3Vl
-  CSI_INIT_DB_rmsmorgue_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_rmsmorgue_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_bmbillinginvoicejava_USERNAME: YmxfaW52b2ljZQ==
-  CSI_INIT_DB_bmbillinginvoicejava_PASSWORD: ZGV2cGcxMjM=  
+  CSI_INIT_DB_bmbillinginvoicejava_PASSWORD: cXVhdHBnMTIz  
   CSI_INIT_erfunctiondotnet_USERNAME: ZXJfZXJmdW4=
-  CSI_INIT_erfunctiondotnet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_erfunctiondotnet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_labmgmtdotnet_USERNAME: bGJfbGFic2VydmljZQ==
-  CSI_INIT_DB_labmgmtdotnet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_labmgmtdotnet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_csinethimservi_USERNAME: aG1faGltc2VydmljZQ==
-  CSI_INIT_DB_csinethimservi_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_csinethimservi_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_rmsmasterdata_USERNAME: cm1fbWFzdGVyZGF0YQ==
-  CSI_INIT_DB_rmsmasterdata_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_rmsmasterdata_PASSWORD: cXVhdHBnMTIz
   TENANT_DATA_DB_USERNAME: cm1fbWFzdGVyZGF0YQ==
-  TENANT_DATA_DB_PASSWORD: ZGV2cGcxMjM=
+  TENANT_DATA_DB_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_VP_BASEUTIL_USERNAME: dnBfYmFzZXV0aWw=
-  CSI_INIT_DB_VP_BASEUTIL_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_VP_BASEUTIL_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrconfigjava_USERNAME: ZWhfY29uZmln
-  CSI_INIT_DB_ehrconfigjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrconfigjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_bloodbankjava_USERNAME: YmJfYmxvb2RiYW5r
-  CSI_INIT_DB_bloodbankjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_bloodbankjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_bloodbanknet_USERNAME: YmJfYmxvb2RiYW5r
-  CSI_INIT_DB_bloodbanknet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_bloodbanknet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_bloodtransfusionjava_USERNAME: QkJfVFJBTlNGVVNJT04=
-  CSI_INIT_DB_bloodtransfusionjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_bloodtransfusionjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_erfunctiondotnet_USERNAME: ZXJfZXJmdW4=
-  CSI_INIT_DB_erfunctiondotnet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_erfunctiondotnet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_labmgmtdotnet_USERNAME: bGJfbGFic2VydmljZQ==
-  CSI_INIT_DB_labmgmtdotnet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_labmgmtdotnet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_csinethimservi_USERNAME: aG1faGltc2VydmljZQ==
-  CSI_INIT_DB_csinethimservi_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_csinethimservi_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_bmbillingapprovaljava_USERNAME: YmxfYXBwcm92YWw=
   CSI_INIT_DB_bmbillingapprovaljava_PASSWORD: J2htZ3VhdEBjc2kn
   CSI_INIT_DB_bmbillingjava_USERNAME: YmxfYmlsbGluZw==
-  CSI_INIT_DB_bmbillingjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_bmbillingjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_bmbillinginvoicejava_USERNAME: YmxfaW52b2ljZQ==
-  CSI_INIT_DB_bmbillinginvoicejava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_bmbillinginvoicejava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_csiiegeneral_USERNAME: aWVfaW50ZWdyYXRpb24=
-  CSI_INIT_DB_csiiegeneral_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_csiiegeneral_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_CSI_IE_INT_USERNAME: aWVfaW50ZWdyYXRpb24=
-  CSI_INIT_DB_CSI_IE_INT_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_CSI_IE_INT_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ieintegration2_USERNAME: aWVfaW50ZWdyYXRpb25paQ==
-  CSI_INIT_DB_ieintegration2_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ieintegration2_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_csiiemobile_USERNAME: aWVfbW9iaWxl
-  CSI_INIT_DB_csiiemobile_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_csiiemobile_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_IE_DATAMIG_USERNAME: aWVfZGF0YW1pZw==
-  CSI_INIT_DB_IE_DATAMIG_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_IE_DATAMIG_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_pmsadtrequest_USERNAME: YWRfcmVxdWVzdA==
-  CSI_INIT_DB_pmsadtrequest_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_pmsadtrequest_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_dsdental_USERNAME: ZWhfZGVudGFs
-  CSI_INIT_DB_dsdental_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_dsdental_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_rmsreservation_USERNAME: cm1fcmVzZXJ2YXRpb24=
-  CSI_INIT_DB_rmsreservation_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_rmsreservation_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_rmsresourceregistry_USERNAME: cm1fcmVzb3VyY2VyZWc=
-  CSI_INIT_DB_rmsresourceregistry_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_rmsresourceregistry_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_rmsmorgue_USERNAME: cm1fbW9yZ3Vl
-  CSI_INIT_DB_rmsmorgue_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_rmsmorgue_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_RF_EMPI_USERNAME: cmZfZW1waQ==
-  CSI_INIT_DB_RF_EMPI_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_RF_EMPI_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrcommonjava_USERNAME: ZWhfY29tbW1vbg==
-  CSI_INIT_DB_ehrcommonjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrcommonjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_EH_ICBUNDLE_USERNAME: ZWhfaWNidW5kbGU=
-  CSI_INIT_DB_EH_ICBUNDLE_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_EH_ICBUNDLE_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehricdashboardjava_USERNAME: ZWhfaWNkYXNoYm9hcmQ=
-  CSI_INIT_DB_ehricdashboardjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehricdashboardjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrintitialassessjava_USERNAME: ZWhfaW5pdGlhbGFzc21udA==
-  CSI_INIT_DB_ehrintitialassessjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrintitialassessjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehripjava_USERNAME: ZWhfaXA=
-  CSI_INIT_DB_ehripjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehripjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrldrjava_USERNAME: ZWhfbGRy
-  CSI_INIT_DB_ehrldrjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrldrjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrlistnerjava_USERNAME: ZWhfbGlz
-  CSI_INIT_DB_ehrlistnerjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrlistnerjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehropdjava_USERNAME: ZWhfb3Bk
-  CSI_INIT_DB_ehropdjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehropdjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehropdmasterdotnet_USERNAME: ZWhfbnBhdGllbnQ= 
-  CSI_INIT_DB_ehropdmasterdotnet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehropdmasterdotnet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehroranesthesiajava_USERNAME: ZWhfb3JhbmVzdGhlc2lh
-  CSI_INIT_DB_ehroranesthesiajava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehroranesthesiajava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrorbookjava_USERNAME: ZWhfb3Jib29r
-  CSI_INIT_DB_ehrorbookjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrorbookjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrorbookingjava_USERNAME: ZWhfb3Jib29raW5n
-  CSI_INIT_DB_ehrorbookingjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrorbookingjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrpomrjava_USERNAME: ZWhfcG9tcg==
-  CSI_INIT_DB_ehrpomrjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrpomrjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_EH_REPORT_USERNAME: ZWgtcmVwb3J0
-  CSI_INIT_DB_EH_REPORT_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_EH_REPORT_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_csi_bm_promotion_java_service_PASSWORD: YmxwQGhtZ3VhdA==
   CSI_INIT_DB_csi_bm_promotion_java_service_USERNAME: YmxfcHJvbW90aW9u
   CSI_INIT_DB_ehrschedulerjava_USERNAME: ZWhfc2NoZWR1bGU=
-  CSI_INIT_DB_ehrschedulerjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrschedulerjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrspecializedclinicjava_USERNAME: ZWhfc3BlY2xjbGluaWM=
-  CSI_INIT_DB_ehrspecializedclinicjava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrspecializedclinicjava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehrtemplatejava_USERNAME: ZWhfdGVtcGxhdGU=
-  CSI_INIT_DB_ehrtemplatejava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehrtemplatejava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_BILLING_COMMON_USERNAME: YmlsbGluZ19jb21tb24=
-  CSI_INIT_DB_BILLING_COMMON_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_BILLING_COMMON_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_PH_PHARMACY_USERNAME: cGhfcGhhcm1hY3k=
-  CSI_INIT_DB_PH_PHARMACY_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_PH_PHARMACY_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_phrbasejava_USERNAME: cGhfcGhhcm1hY3k=
-  CSI_INIT_DB_phrbasejava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_phrbasejava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehricbundlejava_USERNAME: ZWhfaWNidW5kbGU=
-  CSI_INIT_DB_ehricbundlejava_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehricbundlejava_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehripprescriptionjava_USERNAME: ZWhfcHJlc2NyaXB0aW9u
-  CSI_INIT_DB_ehripprescriptionjava_PASSWORD: ZGV2cGcxMjM=
-  CSI_INIT_DB_ehropdpatientdotnet_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_ehripprescriptionjava_PASSWORD: cXVhdHBnMTIz
+  CSI_INIT_DB_ehropdpatientdotnet_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_ehropdpatientdotnet_USERNAME: RUhfTlBBVElFTlQ=
-  CSI_INIT_DB_csi_empi_api_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_csi_empi_api_PASSWORD: cXVhdHBnMTIz
   CSI_INIT_DB_csi_empi_api_USERNAME: ZW1waQ==
   CSI_INIT_DB_renalnet_USERNAME: cmVfaGVtZGlhbHk=
-  CSI_INIT_DB_renalnet_PASSWORD: ZGV2cGcxMjM=
-  SC_IAM_PASSWORD: ZGV2cGcxMjM=
+  CSI_INIT_DB_renalnet_PASSWORD: cXVhdHBnMTIz
+  SC_IAM_PASSWORD: cXVhdHBnMTIz
   SC_IAM_USER: c2NfaWFt
 kind: Secret
 metadata:
diff --git a/secrets/service-adt-secret.yml b/secrets/service-adt-secret.yml
index c1b510d..8149f8c 100644
--- a/secrets/service-adt-secret.yml
+++ b/secrets/service-adt-secret.yml
@@ -1,16 +1,16 @@
 apiVersion: v1
 data:
-  CSI_DB_ADT_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_ADT_PASSWORD: cXVhdHBnMTIz
   CSI_DB_ADT_USERNAME: YWRfcmVxdWVzdA==
-  CSI_DB_DENTAL_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_DENTAL_PASSWORD: cXVhdHBnMTIz
   CSI_DB_DENTAL_USERNAME: ZWhfZGVudGFs
-  CSI_DB_MASTERDATA_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_MASTERDATA_PASSWORD: cXVhdHBnMTIz
   CSI_DB_MASTERDATA_USERNAME: cm1fbWFzdGVyZGF0YQ==
-  CSI_DB_RESERVATION_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_RESERVATION_PASSWORD: cXVhdHBnMTIz
   CSI_DB_RESERVATION_USERNAME: cm1fcmVzZXJ2YXRpb24=
-  CSI_DB_RESOURCE_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_RESOURCE_PASSWORD: cXVhdHBnMTIz
   CSI_DB_RESOURCE_USERNAME: cm1fcmVzb3VyY2VyZWc=
-  CSI_DB_MORGUE_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_MORGUE_PASSWORD: cXVhdHBnMTIz
   CSI_DB_MORGUE_USERNAME: cm1fbW9yZ3Vl
 kind: Secret
 metadata:
diff --git a/secrets/service-bloodbank-secret.yml b/secrets/service-bloodbank-secret.yml
index 42326eb..c163eb3 100644
--- a/secrets/service-bloodbank-secret.yml
+++ b/secrets/service-bloodbank-secret.yml
@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
-  bloodTransfusion-db-password: ZGV2cGcxMjM=
+  bloodTransfusion-db-password: cXVhdHBnMTIz
   bloodTransfusion-db-username: QkJfVFJBTlNGVVNJT04=
-  bloodbank-db-password: ZGV2cGcxMjM=
+  bloodbank-db-password: cXVhdHBnMTIz
   bloodbank-db-username: QkJfQkxPT0RCQU5L
   csi_jwt_secret: YXMzNFE2NzlUMDEyM0M1Njd1OTAwMjNNNTZGODloMTI=
 kind: Secret
diff --git a/secrets/service-bm-secret.yml b/secrets/service-bm-secret.yml
index 4bc9425..6df1ec2 100644
--- a/secrets/service-bm-secret.yml
+++ b/secrets/service-bm-secret.yml
@@ -1,12 +1,12 @@
 apiVersion: v1
 data:
-  CSI_DB_BM_APPROVAL_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_BM_APPROVAL_PASSWORD: cXVhdHBnMTIz
   CSI_DB_BM_APPROVAL_USERNAME: YmxfYXBwcm92YWw=
-  CSI_DB_BM_BILLING_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_BM_BILLING_PASSWORD: cXVhdHBnMTIz
   CSI_DB_BM_BILLING_USERNAME: YmxfYmlsbGluZw==
-  CSI_DB_BM_INVOICE_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_BM_INVOICE_PASSWORD: cXVhdHBnMTIz
   CSI_DB_BM_INVOICE_USERNAME: YmxfaW52b2ljZQ==
-  CSI_DB_BM_PROMOTION_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_BM_PROMOTION_PASSWORD: cXVhdHBnMTIz
   CSI_DB_BM_PROMOTION_USERNAME: YmxfcHJvbW90aW9u
 kind: Secret
 metadata:
diff --git a/secrets/service-cssd-secret.yaml b/secrets/service-cssd-secret.yaml
index 03489c1..5507f27 100644
--- a/secrets/service-cssd-secret.yaml
+++ b/secrets/service-cssd-secret.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  db-cssd-password: ZGV2cGcxMjM=
+  db-cssd-password: cXVhdHBnMTIz
   db-cssd-username: dnBfY3NzZA==
   db-database: dGVtcC1xdWF0LWRhdGFiYXNl
 kind: Secret
diff --git a/secrets/service-integration-secret.yml b/secrets/service-integration-secret.yml
index 7326697..5e8d997 100644
--- a/secrets/service-integration-secret.yml
+++ b/secrets/service-integration-secret.yml
@@ -1,12 +1,12 @@
 apiVersion: v1
 data:
-  CSI_DB_INT_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_INT_PASSWORD: cXVhdHBnMTIz
   CSI_DB_INT_USERNAME: aWVfaW50ZWdyYXRpb24=
-  CSI_DB_INT2_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_INT2_PASSWORD: cXVhdHBnMTIz
   CSI_DB_INT2_USERNAME: aWVfaW50ZWdyYXRpb25paQ==
-  CSI_IE_MOBILE_PASSWORD: ZGV2cGcxMjM=
+  CSI_IE_MOBILE_PASSWORD: cXVhdHBnMTIz
   CSI_IE_MOBILE_USERNAME: aWVfbW9iaWxl
-  CSI_IE_DM_PASSWORD: ZGV2cGcxMjM=
+  CSI_IE_DM_PASSWORD: cXVhdHBnMTIz
   CSI_IE_DM_USERNAME: aWVfZGF0YW1pZw==
 kind: Secret
 metadata:
diff --git a/secrets/service-jdbc-sink-secret.yaml b/secrets/service-jdbc-sink-secret.yaml
index a151e6c..cd57ed1 100644
--- a/secrets/service-jdbc-sink-secret.yaml
+++ b/secrets/service-jdbc-sink-secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 stringData:
   ORACLE_USER: UkZfRlJNX0JVSUxE
-  ORACLE_PASSWORD: ZGV2cGcxMjM=
+  ORACLE_PASSWORD: cXVhdHBnMTIz
 kind: Secret
 metadata:
   name: service-jdbc-sink-secret
diff --git a/secrets/service-pharmacy-secret.yml b/secrets/service-pharmacy-secret.yml
index 304fa19..e9f10ff 100644
--- a/secrets/service-pharmacy-secret.yml
+++ b/secrets/service-pharmacy-secret.yml
@@ -1,11 +1,11 @@
 apiVersion: v1
 data:
   csi_jwt_secret: YXMzNFE2NzlUMDEyM0M1Njd1OTAwMjNNNTZGODloMTI=
-  pharmacy-db-password: ZGV2cGcxMjM=
+  pharmacy-db-password: cXVhdHBnMTIz
   pharmacy-db-username: cGhfcGhhcm1hY3k=
   phrbase-client-id: cGhyYmFzZQo=
   phrbase-client-secret: M2E3NDkzYzUtNDk5NC00ZmI2LTg4NTQtODY0MThkZDY0OWQ4
-  prescription-db-password: ZGV2cGcxMjM=
+  prescription-db-password: cXVhdHBnMTIz
   prescription-db-username: ZWhfcHJlc2NyaXB0aW9u
 kind: Secret
 metadata:
diff --git a/secrets/service-reporting-secret.yml b/secrets/service-reporting-secret.yml
index fb5e988..626f281 100644
--- a/secrets/service-reporting-secret.yml
+++ b/secrets/service-reporting-secret.yml
@@ -1,11 +1,11 @@
 apiVersion: v1
 data:
-  METADB_PASSWORD: ZGV2cGcxMjM=
+  METADB_PASSWORD: cXVhdHBnMTIz
   METADB_USER: cmZfbWV0YQ==
-  WAREHOUSEDB_PASSWORD: ZGV2cGcxMjM=
+  WAREHOUSEDB_PASSWORD: cXVhdHBnMTIz
   WAREHOUSEDB_USER: cG9zdGdyZXM=     # postgres
   APP_DB_USER: YyMjeHN0cm0=          # c!$xstrm
-  APP_DB_PASSWORD: ZGV2cGcxMjM= 
+  APP_DB_PASSWORD: cXVhdHBnMTIz 
 kind: Secret
 metadata:
   name: service-reporting-secret
diff --git a/secrets/service-rules-secret.yml b/secrets/service-rules-secret.yml
index a4cdc49..c116aa7 100644
--- a/secrets/service-rules-secret.yml
+++ b/secrets/service-rules-secret.yml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  SPRING_DATASOURCE_PASSWORD: ZGV2cGcxMjM=
+  SPRING_DATASOURCE_PASSWORD: cXVhdHBnMTIz
   SPRING_DATASOURCE_USERNAME: RkJfUlVMRVM=
 kind: Secret
 metadata:
diff --git a/secrets/service-secret-dms.yml b/secrets/service-secret-dms.yml
index 05c411f..7248a15 100644
--- a/secrets/service-secret-dms.yml
+++ b/secrets/service-secret-dms.yml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  db_password: ZGV2cGcxMjM=
+  db_password: cXVhdHBnMTIz
   db_user: ZG1fbWFuYWdlbWVudA==
   minio_accessKey: YWNjZXNzMTIz
   minio_secretKey: c2VjcmV0MTIz
diff --git a/secrets/service-secret-document-management-service.yaml b/secrets/service-secret-document-management-service.yaml
index c1f5c61..7066cba 100644
--- a/secrets/service-secret-document-management-service.yaml
+++ b/secrets/service-secret-document-management-service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 data:
   SPRING_DATASOURCE_USERNAME: ZG1fbWFuYWdlbWVudA==
-  SPRING_DATASOURCE_PASSWORD: ZGV2cGcxMjM=
+  SPRING_DATASOURCE_PASSWORD: cXVhdHBnMTIz
 #  SPRING_LIQUIBASE_USER: ZG1fbWFuYWdlbWVudA==
-#  SPRING_LIQUIBASE_PASSWORD: ZGV2cGcxMjM=
+#  SPRING_LIQUIBASE_PASSWORD: cXVhdHBnMTIz
   MINIO_ACCESSKEY: YWNjZXNzMTIz
   MINIO_SECRETKEY: c2VjcmV0MTIz
 kind: Secret
diff --git a/secrets/service-secret-empi-api.yml b/secrets/service-secret-empi-api.yml
index 753c4fe..09ec3d5 100644
--- a/secrets/service-secret-empi-api.yml
+++ b/secrets/service-secret-empi-api.yml
@@ -6,4 +6,4 @@ metadata:
 type: Opaque
 data:
   DB_USERNAME: ZW1waQ==
-  DB_PASSWORD: ZGV2cGcxMjM=
+  DB_PASSWORD: cXVhdHBnMTIz
diff --git a/secrets/service-secret-rcm.yml b/secrets/service-secret-rcm.yml
index 851e683..08e156e 100644
--- a/secrets/service-secret-rcm.yml
+++ b/secrets/service-secret-rcm.yml
@@ -1,10 +1,10 @@
 apiVersion: v1
 data:
-  CSI_DB_RCM_CLAIM_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_RCM_CLAIM_PASSWORD: cXVhdHBnMTIz
   CSI_DB_RCM_CLAIM_USERNAME: YmlsbGluZ19jb21tb24=        # billing_common
-  CSI_DB_RCM_INTEGRATION_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_RCM_INTEGRATION_PASSWORD: cXVhdHBnMTIz
   CSI_DB_RCM_INTEGRATION_USERNAME: YmlsbGluZ19jb21tb24=
-  CSI_DB_RCM_MASTERDATA_PASSWORD: ZGV2cGcxMjM=
+  CSI_DB_RCM_MASTERDATA_PASSWORD: cXVhdHBnMTIz
   CSI_DB_RCM_MASTERDATA_USERNAME: YmlsbGluZ19jb21tb24=
 kind: Secret
 metadata:
diff --git a/secrets/service-secret-rf-uploader.yaml b/secrets/service-secret-rf-uploader.yaml
index 2fe16ff..2d11d3c 100644
--- a/secrets/service-secret-rf-uploader.yaml
+++ b/secrets/service-secret-rf-uploader.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   spring.datasource.username: cmZfZW1waQ==
-  spring.datasource.password: ZGV2cGcxMjM=
+  spring.datasource.password: cXVhdHBnMTIz
 kind: Secret
 metadata:
   name: service-secret-rf-uploader
diff --git a/secrets/service-stream-etl-secret.yml b/secrets/service-stream-etl-secret.yml
index 85b0588..0eb43e4 100644
--- a/secrets/service-stream-etl-secret.yml
+++ b/secrets/service-stream-etl-secret.yml
@@ -1,10 +1,10 @@
 apiVersion: v1
 data:
-  #RF_EMPI_PASSWORD: ZGV2cGcxMjM=
+  #RF_EMPI_PASSWORD: cXVhdHBnMTIz
   #RF_EMPI_USER: cmZfZW1waQ==
 
   DATASOURCE_USER: cmZfZW1waQ==
-  DATASOURCE_PASSWORD: ZGV2cGcxMjM=
+  DATASOURCE_PASSWORD: cXVhdHBnMTIz
 kind: Secret
 metadata:
   name: service-stream-etl-secret