diff --git a/Fineract-CN-Helm/fineract-cn-1.0.0-SNAPSHOT.tgz b/Fineract-CN-Helm/fineract-cn-1.0.0-SNAPSHOT.tgz
index 499f653..a33123d 100644
--- a/Fineract-CN-Helm/fineract-cn-1.0.0-SNAPSHOT.tgz
+++ b/Fineract-CN-Helm/fineract-cn-1.0.0-SNAPSHOT.tgz
Binary files differ
diff --git a/Fineract-CN-Helm/fineract-cn/templates/accounting.yml b/Fineract-CN-Helm/fineract-cn/templates/accounting.yml
index 09198cf..ea30347 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/accounting.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/accounting.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: accounting-ms
+          - name: kubernetes.service.name
+            value: accounting-service
           - name: server.port
             value: "2025"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/config.yml b/Fineract-CN-Helm/fineract-cn/templates/config.yml
index d2788ed..ac1c8b7 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/config.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/config.yml
@@ -19,16 +19,16 @@
   eureka.client.initialInstanceInfoReplicationIntervalSeconds: "25"
   eureka.client.instanceInfoReplicationIntervalSeconds: "20"
   eureka.instance.leaseRenewalIntervalInSeconds: "20"
-  eureka.registration.enabled: "true"
+  eureka.registration.enabled: "false"
   feign.hystrix.enabled: "false"
   postgresql.database: seshat #Might be absent for identity
-  ribbon.eureka.enabled: "true"
+  ribbon.eureka.enabled: "false"
   server.max-http-header-size: "16384"
   spring.cloud.config.enabled: "false"
   spring.cloud.discovery.enabled: "true"
-  keycloak.enabled: "true"
-  authentication.service.keycloak: "true"
-  authentication.service.anubis: "false"
+  keycloak.enabled: "false"
+  authentication.service.keycloak: "false"
+  authentication.service.anubis: "true"
   keycloak.auth-server-url: "https://localhost:8180/auth"
   keycloak.ssl-required: "external"
   keycloak.confidential-port: "443"
diff --git a/Fineract-CN-Helm/fineract-cn/templates/customer.yml b/Fineract-CN-Helm/fineract-cn/templates/customer.yml
index 1a3f6f3..db1a676 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/customer.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/customer.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: customer-ms
+          - name: kubernetes.service.name
+            value: customer-service
           - name: server.port
             value: "2024"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/deposit.yml b/Fineract-CN-Helm/fineract-cn/templates/deposit.yml
index a017322..39631cf 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/deposit.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/deposit.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: deposit-ms
+          - name: kubernetes.service.name
+            value: deposit-service
           - name: server.port
             value: "2027"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/group.yml b/Fineract-CN-Helm/fineract-cn/templates/group.yml
index fad4002..f2dd4ec 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/group.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/group.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: group-ms
+          - name: kubernetes.service.name
+            value: group-service
           - name: server.port
             value: "2032"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/identity.yml b/Fineract-CN-Helm/fineract-cn/templates/identity.yml
index 2dd6c1d..7915713 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/identity.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/identity.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: identity-ms
+          - name: kubernetes.service.name
+            value: identity-service
           - name: server.port
             value: "2021"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/notifications.yml b/Fineract-CN-Helm/fineract-cn/templates/notifications.yml
index 5baa45a..52b6f26 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/notifications.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/notifications.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: notifications-ms
+          - name: kubernetes.service.name
+            value: notifications-service
           - name: server.port
             value: "2033"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/office.yml b/Fineract-CN-Helm/fineract-cn/templates/office.yml
index b4db9a9..29fd46e 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/office.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/office.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: office-ms
+          - name: kubernetes.service.name
+            value: office-service
           - name: server.port
             value: "2023"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/payroll.yml b/Fineract-CN-Helm/fineract-cn/templates/payroll.yml
index 442e72e..6710418 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/payroll.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/payroll.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: payroll-ms
+          - name: kubernetes.service.name
+            value: payroll-service
           - name: server.port
             value: "2031"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/portfolio.yml b/Fineract-CN-Helm/fineract-cn/templates/portfolio.yml
index a024292..85e273a 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/portfolio.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/portfolio.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: portfolio-ms
+          - name: kubernetes.service.name
+            value: portfolio-service
           - name: server.port
             value: "2026"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/provisioner.yml b/Fineract-CN-Helm/fineract-cn/templates/provisioner.yml
index 47308f9..cb9793f 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/provisioner.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/provisioner.yml
@@ -45,8 +45,8 @@
           - configMapRef:
               name: provisioner-datasource-config
         env:
-          - name: eureka.instance.hostname
-            value: provisioner-ms
+          - name: kubernetes.service.name
+            value: provisioner-service
           - name: server.port
             value: "2020"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/reporting.yml b/Fineract-CN-Helm/fineract-cn/templates/reporting.yml
index 46babc3..21925ce 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/reporting.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/reporting.yml
@@ -43,8 +43,8 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: reporting-ms
+          - name: kubernetes.service.name
+            value: reporting-service
           - name: server.port
             value: "2029"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/fineract-cn/templates/rhythm.yml b/Fineract-CN-Helm/fineract-cn/templates/rhythm.yml
index 959b13d..a60358a 100644
--- a/Fineract-CN-Helm/fineract-cn/templates/rhythm.yml
+++ b/Fineract-CN-Helm/fineract-cn/templates/rhythm.yml
@@ -43,8 +43,12 @@
           - configMapRef:
               name: fineract-service-config
         env:
-          - name: eureka.instance.hostname
-            value: rhythm-ms
+          - name: kubernetes.rhythm.service.name
+            value: rhythm-service
+          - name: kubernetes.identity.service.name
+            value: identity-service
+          - name: kubernetes.identity.service.port
+            value: "2021"
           - name: server.port
             value: "2022"
           - name: spring.application.name
diff --git a/Fineract-CN-Helm/index.yaml b/Fineract-CN-Helm/index.yaml
index 6e65e80..0ec4de3 100644
--- a/Fineract-CN-Helm/index.yaml
+++ b/Fineract-CN-Helm/index.yaml
@@ -3,11 +3,11 @@
   fineract-cn:
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2022-05-14T23:08:13.754714438+05:30"
+    created: "2022-05-16T09:44:01.671739372+05:30"
     description: Fineract CN
-    digest: 01805680289b8747c07d78bb5294669f982bb8da87fed1f377a91cb781c88c89
+    digest: 2d8e74c692755909f0609bbe734905ed4e2a0742503d7e41c799c128abc169c3
     name: fineract-cn
     urls:
     - fineract-cn-1.0.0-SNAPSHOT.tgz
     version: 1.0.0-SNAPSHOT
-generated: "2022-05-14T23:08:13.740743937+05:30"
+generated: "2022-05-16T09:44:01.668375322+05:30"