diff --git a/Config-Server/configrepo/application-net-csi-uat.yml b/Config-Server/configrepo/application-net-csi-uat.yml
index 7df227d..5995efb 100755
--- a/Config-Server/configrepo/application-net-csi-uat.yml
+++ b/Config-Server/configrepo/application-net-csi-uat.yml
@@ -35,8 +35,8 @@ rabbitmq_server_vhost: &rabbitmq_server_vhost "~"
 Provider: "PostgreSQL"
 CommandTimoutInMins: 1.0
 database:
-  host: "172.15.100.17"
-  port: 5000
+  host: "172.15.100.170"
+  port: 5432
   serviceName: "postgres"
   transportConnectTimeout: 5
   connectTimeout: 5
diff --git a/configmaps/api-gateway-configs.yaml b/configmaps/api-gateway-configs.yaml
index f0dee4e..bfd923a 100644
--- a/configmaps/api-gateway-configs.yaml
+++ b/configmaps/api-gateway-configs.yaml
@@ -184,7 +184,7 @@ data:
             filters:
             - StripPrefix=1
             metadata:
-              connect-timeout: 5000
+              connect-timeout: 5432
               response-timeout: 1200000
               idle-timeout: 60000
           - id: medical-report-channel
@@ -242,7 +242,7 @@ data:
             filters:
             - StripPrefix=1
             metadata:
-              connect-timeout: 5000
+              connect-timeout: 5432
               response-timeout: 300000
               idle-timeout: 60000
           - id: csi-bm-prm
@@ -264,7 +264,7 @@ data:
             filters:
             - StripPrefix=1
             metadata:
-              connect-timeout: 5000
+              connect-timeout: 5432
               response-timeout: 300000
               idle-timeout: 60000
           - id: csi-ie-api
@@ -328,7 +328,7 @@ data:
             filters:
             - StripPrefix=1
             metadata:
-              connect-timeout: 5000
+              connect-timeout: 5432
               response-timeout: 300000
               idle-timeout: 60000
           - id: csi-ie-mobile2
@@ -338,7 +338,7 @@ data:
             filters:
             - StripPrefix=1
             metadata:
-              connect-timeout: 5000
+              connect-timeout: 5432
               response-timeout: 300000
               idle-timeout: 60000
           - id: csi-ie-pacsurl
@@ -582,7 +582,7 @@ data:
             filters:
             - StripPrefix=1
             metadata:
-              connect-timeout: 5000
+              connect-timeout: 5432
               response-timeout: 120000
               idle-timeout: 60000
           - id: csi-net-medispan
@@ -635,7 +635,7 @@ data:
             - StripPrefix=1
             metadata:
               response-timeout: 240000
-              connect-timeout: 50000
+              connect-timeout: 54320
           - id: csi-phr-cron
             uri: 'http://csi-phr-cron'
             predicates:
@@ -674,7 +674,7 @@ data:
             - StripPrefix=1
             metadata:
               response-timeout: 1200000
-              connect-timeout: 50000
+              connect-timeout: 54320
           - id: csi-rf-jdbc-sink-service
             uri: 'http://csi-rf-jdbc-sink-service'
             predicates:
diff --git a/configmaps/baseutil-database-configs.yml b/configmaps/baseutil-database-configs.yml
index 0514cad..db63448 100644
--- a/configmaps/baseutil-database-configs.yml
+++ b/configmaps/baseutil-database-configs.yml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  db-base-utility-url: jdbc:postgresql://172.15.100.17:5000/postgres
+  db-base-utility-url: jdbc:postgresql://172.15.100.170:5432/postgres
   db-dialect:  org.hibernate.dialect.PostgreSQLDialect
   db-driver: org.postgresql.Driver
   SPRING_JPA_HIBERNATE_DDL-AUTO: update
diff --git a/configmaps/econsent-service-configs-new.yml b/configmaps/econsent-service-configs-new.yml
index b58b648..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.52;Port=5000;Database=quat;User Id=em_management;Password=quatpg123;
+  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 d5e0caf..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.52;Port=5000;Database=quat;User Id=em_management;Password=quatpg123;
+  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/ehr-database-configs.yml b/configmaps/ehr-database-configs.yml
index 076965f..387077d 100644
--- a/configmaps/ehr-database-configs.yml
+++ b/configmaps/ehr-database-configs.yml
@@ -1,12 +1,12 @@
 apiVersion: v1
 data:
-  database-url: jdbc:postgresql://172.15.100.17:5000/postgres
-  database-url-second: jdbc:postgresql://172.15.100.17:5000/postgres
+  database-url: jdbc:postgresql://172.15.100.170:5432/postgres
+  database-url-second: jdbc:postgresql://172.15.100.170:5432/postgres
   db-dialect: org.hibernate.dialect.PostgreSQLDialect
   db-driver: org.postgresql.Driver
   db-or-anesthesia-schema: EH_ORANESTHESIA
-  db-spe-url: jdbc:postgresql://172.15.100.17:5000/postgres
-  db-ip-url: jdbc:postgresql://172.15.100.17:5000/postgres
+  db-spe-url: jdbc:postgresql://172.15.100.170:5432/postgres
+  db-ip-url: jdbc:postgresql://172.15.100.170:5432/postgres
   EHR_WORKFLOW_MONGO_URI: mongodb://172.15.100.24:27017/task_list
 kind: ConfigMap
 metadata:
diff --git a/configmaps/hhc-service-configs.yaml b/configmaps/hhc-service-configs.yaml
index b1e6720..1cd5e1c 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.52;Port=5000;Database=quat;User Id=csi_hhc;Password=quatpg123"
-  ReadCon: "Host=172.15.100.52;Port=5000;Database=quat;User Id=csi_hhc;Password=quatpg123"
+  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://172.15.100.24:27017/roles-permissions-01
   Report__Mongo__DbName: csi-net-reporting
   Report__Mongo__Collection: HHC
diff --git a/configmaps/iam-service-configs.yml b/configmaps/iam-service-configs.yml
index aa2b39e..44ade50 100644
--- a/configmaps/iam-service-configs.yml
+++ b/configmaps/iam-service-configs.yml
@@ -7,7 +7,7 @@ data:
   REPORTING_PORT: "5672"
   KEYCLOAK_HOSTNAME: csi.dev.cloudsol.lk
   REPORTING_QUEUE_NAME: csi-reporting
-  DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.17:5000/postgres
+  DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.170:5432/postgres
 kind: ConfigMap
 metadata:
   name: iam-service-configs
diff --git a/configmaps/init-database-configs.yaml b/configmaps/init-database-configs.yaml
index 8a5e3a9..81827e6 100644
--- a/configmaps/init-database-configs.yaml
+++ b/configmaps/init-database-configs.yaml
@@ -7,7 +7,7 @@ data:
   MASTER_DATA_X_USER: "1002"
   MASTER_DATA_DISABLED: "true"
   MONGO_DB_URL: mongodb://172.15.100.24:27017/csi-morgue?readPreference=nearest
-  RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   SCREEN_PERMISSION_API_END_POINT: http://service-base-ui-registry/ui-registry/save
   FEATURE_TOGGLE_API_END_POINT: 'http://csi-java-base-utility/base/util/tenant'
   BUSINESS_PERMISSION_API_END_POINT: 'http://csi-iam-service/auth/realms/master/business-permission/add'
diff --git a/configmaps/keycloak-service-configs.yml b/configmaps/keycloak-service-configs.yml
index 0d066f2..faff27b 100644
--- a/configmaps/keycloak-service-configs.yml
+++ b/configmaps/keycloak-service-configs.yml
@@ -6,7 +6,7 @@ metadata:
 data:
   QUARKUS_SSL_NATIVE: "false"
   QUARKUS_SSL_TRUST_ALL: "true"
-  KC_DB_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  KC_DB_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   KC_DB: postgres
   KC_CACHE_CONFIG_FILE: "cache-ispn.xml"
   KC_HOSTNAME: quat.cloudsolutions.lk
diff --git a/configmaps/security-database-configs.yml b/configmaps/security-database-configs.yml
index 35f0fb2..1d0d71e 100644
--- a/configmaps/security-database-configs.yml
+++ b/configmaps/security-database-configs.yml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  database-url: jdbc:postgresql://172.15.100.17:5000/postgres?currentSchema=sc_security
+  database-url: jdbc:postgresql://172.15.100.170:5432/postgres?currentSchema=sc_security
   db-dialect: org.hibernate.dialect.PostgreSQLDialect
   db-driver: org.postgresql.Driver
   permission-mongodb-uri: mongodb://172.15.100.24:27017/roles-permissions-01?&readPreference=nearest
diff --git a/configmaps/service-config-bloodbank.yml b/configmaps/service-config-bloodbank.yml
index c47a597..3397ccb 100644
--- a/configmaps/service-config-bloodbank.yml
+++ b/configmaps/service-config-bloodbank.yml
@@ -2,9 +2,9 @@ apiVersion: v1
 data:
   active_profile: java-dev
   bloodTransfusion-db-platform: org.hibernate.dialect.PostgreSQLDialect
-  bloodTransfusion-db-url: jdbc:postgresql://172.15.100.17:5000/postgres?currentSchema=bb_transfusion
+  bloodTransfusion-db-url: jdbc:postgresql://172.15.100.170:5432/postgres?currentSchema=bb_transfusion
   bloodbank-db-platform: org.hibernate.dialect.PostgreSQLDialect
-  bloodbank-db-url: jdbc:postgresql://172.15.100.17:5000/postgres?currentSchema=bb_bloodbank
+  bloodbank-db-url: jdbc:postgresql://172.15.100.170:5432/postgres?currentSchema=bb_bloodbank
   configserver: http://config-server
   eureka_server: http://eureka:8761/eureka/
   rootDomainName: cloudsol.lk 
diff --git a/configmaps/service-config-pharmacy.yml b/configmaps/service-config-pharmacy.yml
index b8bf563..6145eba 100644
--- a/configmaps/service-config-pharmacy.yml
+++ b/configmaps/service-config-pharmacy.yml
@@ -8,8 +8,8 @@ data:
   discharge-summary-clear-notification: adt-discharge-summary-clear-notification.t
   eureka_server: http://eureka:8761/eureka/
   pharmacy-db-platform: org.hibernate.dialect.PostgreSQLDialect
-  pharmacy-db-url: jdbc:postgresql://172.15.100.17:5000/postgres
-  prescription-db-url: jdbc:postgresql://172.15.100.17:5000/postgres
+  pharmacy-db-url: jdbc:postgresql://172.15.100.170:5432/postgres
+  prescription-db-url: jdbc:postgresql://172.15.100.170:5432/postgres
   prescription-db-platform: org.hibernate.dialect.PostgreSQLDialect
   mongodb-phr-cron-uri: mongodb://172.15.100.24:27017/cron
   apm_server: http://172.100.10.57.:8200,http://172.100.10.57:8200
diff --git a/configmaps/service-configs-adt.yml b/configmaps/service-configs-adt.yml
index d15d325..3f76b3f 100644
--- a/configmaps/service-configs-adt.yml
+++ b/configmaps/service-configs-adt.yml
@@ -1,11 +1,11 @@
 apiVersion: v1
 data:
-  CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_DENTAL_URL:  jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_RESOURCE_URL:  jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_DENTAL_URL:  jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_RESOURCE_URL:  jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver
   SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.PostgreSQLDialect
   CSI_RMS_ADTREQUEST_MONGOURI: mongodb://172.15.100.24:27017/adt-request?readPreference=nearest&maxStalenessSeconds=300
@@ -18,7 +18,6 @@ data:
   SPRING_JPA_HIBERNATE_DDL_AUTO: none
 kind: ConfigMap
 metadata:
-  annotations:
   name: service-configs-adt
   namespace: csi-uat
   annotations:
diff --git a/configmaps/service-configs-bm-promotional.yaml b/configmaps/service-configs-bm-promotional.yaml
index 72955d0..359028c 100644
--- a/configmaps/service-configs-bm-promotional.yaml
+++ b/configmaps/service-configs-bm-promotional.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   CSI_DB_SERVER: postgres
   #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle10gDialect
   configserver: http://config-server
diff --git a/configmaps/service-configs-bm.yml b/configmaps/service-configs-bm.yml
index bb425e1..2db88a0 100644
--- a/configmaps/service-configs-bm.yml
+++ b/configmaps/service-configs-bm.yml
@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
-  CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   CSI_DB_PORT: "1521"
   CSI_DB_SERVER: postgress
   SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver
diff --git a/configmaps/service-configs-cssd.yaml b/configmaps/service-configs-cssd.yaml
index 897ae8a..7f4723d 100644
--- a/configmaps/service-configs-cssd.yaml
+++ b/configmaps/service-configs-cssd.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
-  SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  database-url: jdbc:postgresql://172.15.100.17:5000/postgres
+  SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  database-url: jdbc:postgresql://172.15.100.170:5432/postgres
   CSI_DB_SERVER: POSTGRESQL
   SPRING_JPA_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
   #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle12cDialect
diff --git a/configmaps/service-configs-dms.yml b/configmaps/service-configs-dms.yml
index bed033c..1d3b5cf 100644
--- a/configmaps/service-configs-dms.yml
+++ b/configmaps/service-configs-dms.yml
@@ -11,7 +11,7 @@ data:
   db_driver: org.postgresql.Driver
   db_profile: slick.jdbc.PostgresProfile
   db_driver: org.postgresql.Driver
-  db_url: jdbc:postgresql://172.15.100.17:5000/postgres
+  db_url: jdbc:postgresql://172.15.100.170:5432/postgres
   minio_endpoint: http://172.15.100.68:7480
   mongo_connection_string: mongodb://172.15.100.24:27017/
 kind: ConfigMap
diff --git a/configmaps/service-configs-document-management-service.yml b/configmaps/service-configs-document-management-service.yml
index 521db4e..de114ec 100644
--- a/configmaps/service-configs-document-management-service.yml
+++ b/configmaps/service-configs-document-management-service.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver
-  SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   SPRING_JPA_PROPERTIES_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
 #  SPRING_LIQUIBASE_CHANGE-LOG: classpath:db/changelog/postgres/changelog-master.xml
   MINIO_ENDPOINT: http://172.15.100.68:7480
diff --git a/configmaps/service-configs-empi-api.yaml b/configmaps/service-configs-empi-api.yaml
index b809433..07e2dd4 100644
--- a/configmaps/service-configs-empi-api.yaml
+++ b/configmaps/service-configs-empi-api.yaml
@@ -6,7 +6,7 @@ data:
   active_profile: java-dev
   JPA_DIALECT: org.hibernate.dialect.PostgreSQLDialect
   DB_SCHEMA: EMPI
-  DB_JDBC_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  DB_JDBC_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   DB_DRIVER_CLASS_NAME: org.postgresql.Driver
   #HIBERNATE_DDL_AUTO: "false"
   KAFKA_PRODUCER_BOOTSTRAP_SERVER_URLS:  172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092
diff --git a/configmaps/service-configs-integration.yml b/configmaps/service-configs-integration.yml
index 877524f..da7205e 100644
--- a/configmaps/service-configs-integration.yml
+++ b/configmaps/service-configs-integration.yml
@@ -2,9 +2,9 @@ apiVersion: v1
 data:
   dbVendor: postgres      
   CSI_DB_DRIVER: org.postgresql.Driver
-  CSI_DB_INT_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.17:5000/postgres
-  CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  CSI_DB_INT_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.170:5432/postgres
+  CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   CSI_DB_PLATFORM: org.hibernate.dialect.PostgreSQLDialect
   CSI_DB_INT_PLATFORM: org.hibernate.dialect.PostgreSQLDialect
   CSI_DB_MOBILE_SEQUENCETEMPLATE: "SELECT ##sequence_name##.NEXTVAL FROM dual"
diff --git a/configmaps/service-configs-jdbc-sink.yaml b/configmaps/service-configs-jdbc-sink.yaml
index adc20d6..abd32e9 100644
--- a/configmaps/service-configs-jdbc-sink.yaml
+++ b/configmaps/service-configs-jdbc-sink.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 data:
   METADATA_TOPIC: form-metadata-queue
   DATA_TOPIC: form-data-queue
-  ORACLE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  ORACLE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   BOOTSTRAP_SERVERS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092
 kind: ConfigMap
 metadata:
diff --git a/configmaps/service-configs-reporting.yml b/configmaps/service-configs-reporting.yml
index 4dc2259..5b0f7ad 100644
--- a/configmaps/service-configs-reporting.yml
+++ b/configmaps/service-configs-reporting.yml
@@ -2,16 +2,16 @@ apiVersion: v1
 data:
   METADB_DRIVER: org.postgresql.Driver
   METADB_PROFILE: slick.jdbc.PostgresProfile
-  METADB_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  METADB_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   WAREHOUSEDB_DB_DRIVER: org.postgresql.Driver
   WAREHOUSEDB_DRIVER: slick.driver.PostgresqlDriver
   WAREHOUSEDB_PROFILE: slick.jdbc.PostgresProfile
-  WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   METADB_NUM_THREADS : "10"
   METADB_MAX_CONNECTIONS : "10"
   APP_DB_DRIVER: org.postgresql.Driver
   APP_DB_PROFILE: slick.jdbc.PostgresProfile
-  APP_DB_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  APP_DB_URL: jdbc:postgresql://172.15.100.170:5432/postgres
   # active_hospital_filter: "true"
   # hospital_id_columns: HOSPITAL_ID,HOSPITALID
   # tenant_id_columns: HOSPITAL_GROUP_ID,HOSPITALGROUPID,TENANT_ID,TENANTID
diff --git a/configmaps/service-configs-rf-uploader.yml b/configmaps/service-configs-rf-uploader.yml
index 741db63..c481748 100644
--- a/configmaps/service-configs-rf-uploader.yml
+++ b/configmaps/service-configs-rf-uploader.yml
@@ -3,7 +3,7 @@ data:
   spring.env.url: http://csi-reporting-service
   spring.env.path: /csi-api/csi-reporting-service
   spring.datasource.driver-class-name: org.postgresql.Driver
-  spring.datasource.url: jdbc:postgresql://172.15.100.17:5000/postgres
+  spring.datasource.url: jdbc:postgresql://172.15.100.170:5432/postgres
 kind: ConfigMap
 metadata:
   annotations:
diff --git a/configmaps/service-configs-stream-etl.yml b/configmaps/service-configs-stream-etl.yml
index 8e33166..3d32ed8 100644
--- a/configmaps/service-configs-stream-etl.yml
+++ b/configmaps/service-configs-stream-etl.yml
@@ -10,7 +10,7 @@ data:
   MONGO_CONNECTION_STRING: mongodb://172.15.100.24:27017/
   SLICK_DATASOURCE_PROFILE: slick.jdbc.PostgresProfile$
   DATASOURCE_DRIVER: org.postgresql.Driver
-  DATASOURCE_URL: jdbc:postgresql://172.15.100.17:5000/postgres
+  DATASOURCE_URL: jdbc:postgresql://172.15.100.170:5432/postgres
       
 kind: ConfigMap
 metadata:
diff --git a/configmaps/service-configs.yml b/configmaps/service-configs.yml
index 28395c6..f3b489d 100644
--- a/configmaps/service-configs.yml
+++ b/configmaps/service-configs.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 data:
   LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true'
   CICD_AUTORECONECT_ADMIN: ?autoReconnect=true
-  CICD_URI_ADMIN: jdbc:postgresql://postgres:5000/
+  CICD_URI_ADMIN: jdbc:postgresql://postgres:5432/
   CSI_DATEFORMAT_FORMAT: yyyy/MM/dd HH:mm:ss
   CSI_JPA_EVENT_ISREPORT: "true"
   CSI_LOGS_KAFKA_BOOTSTRAPADDRESS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092