diff --git a/config-as-code/helm/charts/core-services/pgr-services/values.yaml b/config-as-code/helm/charts/core-services/pgr-services/values.yaml
index 334178ab1..64499d429 100644
--- a/config-as-code/helm/charts/core-services/pgr-services/values.yaml
+++ b/config-as-code/helm/charts/core-services/pgr-services/values.yaml
@@ -177,9 +177,9 @@ env: |
   - name: EGOV_USR_EVENTS_REOPEN_CODE
     value: "REOPEN" 
   - name: ENABLE_STATE_LEVEL_SEARCH
-    value: true
+    value: "true"
   - name: ENABLE_USERTYPE_EMPLOYEE
-    value: true
+    value: "true"
   - name: PGR_STATELEVEL_TENANTID
     valueFrom:
       configMapKeyRef:
diff --git a/config-as-code/helm/charts/municipal-services/pgr-services/Chart.yaml b/config-as-code/helm/charts/municipal-services/pgr-services/Chart.yaml
deleted file mode 100644
index bcfab059f..000000000
--- a/config-as-code/helm/charts/municipal-services/pgr-services/Chart.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: v2
-name: pgr-services
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-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.
-version: 0.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.
-appVersion: 1.16.0
-
-dependencies:
-- name: common
-  version: 0.0.5
-  repository: file://../../common
diff --git a/config-as-code/helm/charts/municipal-services/pgr-services/templates/deployment.yaml b/config-as-code/helm/charts/municipal-services/pgr-services/templates/deployment.yaml
deleted file mode 100644
index 3455c0005..000000000
--- a/config-as-code/helm/charts/municipal-services/pgr-services/templates/deployment.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# deployment.yaml
-{{- template "common.deployment" . -}}
\ No newline at end of file
diff --git a/config-as-code/helm/charts/municipal-services/pgr-services/templates/ingress.yaml b/config-as-code/helm/charts/municipal-services/pgr-services/templates/ingress.yaml
deleted file mode 100644
index 9a573c0d7..000000000
--- a/config-as-code/helm/charts/municipal-services/pgr-services/templates/ingress.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# ingress.yaml
-{{- template "common.ingress" . -}}
\ No newline at end of file
diff --git a/config-as-code/helm/charts/municipal-services/pgr-services/templates/service.yaml b/config-as-code/helm/charts/municipal-services/pgr-services/templates/service.yaml
deleted file mode 100644
index 735644576..000000000
--- a/config-as-code/helm/charts/municipal-services/pgr-services/templates/service.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# service.yaml
-{{- template "common.service" . -}}
\ No newline at end of file
diff --git a/config-as-code/helm/charts/municipal-services/pgr-services/values.yaml b/config-as-code/helm/charts/municipal-services/pgr-services/values.yaml
deleted file mode 100644
index 33aeadd80..000000000
--- a/config-as-code/helm/charts/municipal-services/pgr-services/values.yaml
+++ /dev/null
@@ -1,194 +0,0 @@
-# Common Labels
-labels:
-  app: "pgr-services"
-  group: "rainmaker"
-
-# Ingress Configs
-ingress:
-  enabled: true
-  zuul: true
-  context: "pgr-services"
-
-# Init Containers Configs
-initContainers:
-  dbMigration:
-    enabled: true
-    schemaTable: "pgr_services_schema"
-    image:
-      repository: "pgr-services-db"
-
-# Container Configs
-image:
-  repository: "pgr-services"
-replicas: "1"
-healthChecks:
-  enabled: true
-  livenessProbePath: "/pgr-services/health"
-  readinessProbePath: "/pgr-services/health"
-appType: "java-spring"
-tracing-enabled: true
-notification-sms-enabled: "true"
-notification-email-enabled: "false"
-new-complaint-enabled: "true"
-reassign-complaint-enabled: "true"
-reopen-complaint-enabled: "true"
-comment-by-employee-notif-enabled: "false"
-notification-allowed-status: "open,assigned,rejected,resolved"
-heap: "-Xmx192m -Xms192m"
-java-args: "-Dspring.profiles.active=monitoring"
-
-# Additional Container Envs
-env: |
-  - name: SPRING_KAFKA_CONSUMER_GROUP_ID
-    value: egov-pgr-services
-  - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER
-    value: org.apache.kafka.common.serialization.StringSerializer
-  {{- if index .Values "global" "serializers-timezone-in-ist" }}
-  - name: SPRING_KAFKA_PRODUCER_VALUE_SERIALIZER
-    value: org.egov.tracer.kafka.serializer.ISTTimeZoneJsonSerializer
-  {{- end }}
-  - name: EGOV_IDGEN_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-idgen
-  - name: EGOV_URL_SHORTNER_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-url-shortening      
-  - name: EGOV_WORKFLOW_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-workflow-v2
-  - name: EGOV_MDMS_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-mdms-service
-  - name: EGOV_MDMS_SEARCH_ENDPOINT
-    value: "/mdms-v2/v1/_search"
-  - name: EGOV_MDMS_PATH
-    value: "/mdms-v2/v1/_search"
-  - name: MDMS_PATH
-    value: "/mdms-v2/v1/_search"
-  - name: EGOV_LOCALIZATION_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-localization
-  - name: EGOV_INFRA_SEARCHER_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-searcher
-  - name: EGOV_COMMON_MASTERS_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-common-masters
-  - name: EGOV_FILESTORE_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-filestore
-  - name: EGOV_UI_APP_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-config
-        key: egov-services-fqdn-name
-  - name: EGOV_USER_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-user
-  - name: EGOV_MDMS_SEARCH_ENDPOINT
-    value: "/mdms-v2/v1/_search"
-  - name: PGR_KAFKA_CREATE_TOPIC
-    value: "save-pgr-request"
-  - name: PGR_KAFKA_UPDATE_TOPIC
-    value: "update-pgr-request"
-  - name: KAFKA_TOPICS_NOTIFICATION_SMS
-    value: "egov.core.notification.sms"
-  - name: PERSISTER_SAVE_TRANSITION_WF_TOPIC
-    value: "save-wf-transitions"
-  - name: PGR_KAFKA_MIGRATION_TOPIC
-    value: "pgr-migration"
-  - name: PGR_KAFKA_MIGRATION_PERSISTOR_TOPIC
-    value: "save-pgr-request-batch"
-  - name: PERSISTER_SAVE_TRANSITION_WF_MIGRATION_TOPIC
-    value: "save-wf-transitions-batch"
-  - name: NOTIFICATION_SMS_ENABLED
-    value: {{ index .Values "notification-sms-enabled" | quote }}
-  - name: NOTIFICATION_EMAIL_ENABLED
-    value: {{ index .Values "notification-email-enabled" | quote }}
-  - name: NEW_COMPLAINT_ENABLED
-    value: {{ index .Values "new-complaint-enabled" | quote }}
-  - name: REASSIGN_COMPLAINT_ENABLED
-    value: {{ index .Values "reassign-complaint-enabled" | quote }}
-  - name: REOPEN_COMPLAINT_ENABLED
-    value: {{ index .Values "reopen-complaint-enabled" | quote }}
-  - name: COMMENT_BY_EMPLOYEE_NOTIF_ENABLED
-    value: {{ index .Values "comment-by-employee-notif-enabled" | quote }}
-  - name: EGOV_PGR_APP_PLAYSTORE_LINK
-    value: "https://goo.gl/ArDyQ1"
-  - name: NOTIFICATION_ALLOWED_ON_STATUS
-    value: {{ index .Values "notification-allowed-status" | quote }}
-  - name: EGOV_HRMS_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-hrms
-  {{- if index .Values "global" "tracer-errors-provideexceptionindetails" }}
-  - name: TRACER_ERRORS_PROVIDEEXCEPTIONINDETAILS
-    valueFrom:
-      configMapKeyRef:
-        name: egov-config
-        key: tracer-errors-provideexceptionindetails
-  {{- end }}
-  - name: JAVA_OPTS
-    value: {{ index .Values "heap" | quote }}
-  - name: JAVA_ARGS
-    value: {{ index .Values "java-args" | quote }}
-  - name: JAVA_ENABLE_DEBUG
-    value: {{ index .Values "java-enable-debug" | quote }}
-  - name: SERVER_PORT
-    value: "8080"
-  - name: SECURITY_BASIC_ENABLED
-    value: "false"  
-  - name: MANAGEMENT_SECURITY_ENABLED
-    value: "false" 
-  - name: EGOV_LOCATION_HOST
-    valueFrom:
-      configMapKeyRef:
-        name: egov-service-host
-        key: egov-location
-  - name: EGOV_USR_EVENTS_NOTIFICATION_ENABLED
-    value: "true"
-  - name: EGOV_USR_EVENTS_CREATE_TOPIC
-    value: "persist-user-events-async"
-  - name: EGOV_USR_EVENTS_RATE_LINK
-    value: "/citizen/otpLogin?mobileNo=$mobile&redirectTo=feedback/$servicerequestid"
-  - name: EGOV_USR_EVENTS_REOPEN_LINK
-    value: "/citizen/otpLogin?mobileNo=$mobile&redirectTo=reopen-complaint/$servicerequestid"
-  - name: EGOV_USR_EVENTS_RATE_CODE
-    value: "RATE"
-  - name: EGOV_USR_EVENTS_REOPEN_CODE
-    value: "REOPEN" 
-  - name: PGR_STATELEVEL_TENANTID
-    valueFrom:
-      configMapKeyRef:
-        name: egov-config
-        key: egov-state-level-tenant-id
-  {{- if index .Values "tracing-enabled" }}
-  - name: TRACER_OPENTRACING_ENABLED
-    value: "true" 
-  {{- end }}
-  {{- if index .Values "time-before-closing-complaint" }}
-  - name: PGR_COMPLAIN_IDLE_TIME
-    value: {{ index .Values "time-before-closing-complaint" | quote }} 
-  {{- end }}
-
-
-  
diff --git a/config-as-code/product-release-charts/Health/dependancy_chart-health-demo-v1.5.yaml b/config-as-code/product-release-charts/Health/dependancy_chart-health-demo-v1.5.yaml
new file mode 100644
index 000000000..2dfd7783b
--- /dev/null
+++ b/config-as-code/product-release-charts/Health/dependancy_chart-health-demo-v1.5.yaml
@@ -0,0 +1,102 @@
+
+version: v1.5
+modules:
+  - name: backbone
+    services:
+      - kafka-kraft
+      - kafka-connect
+      - kafka-connect-restart-tasks
+      - elasticsearch-data
+      - elasticsearch-master
+      - kibana
+  - name: authn-authz
+    services:
+      - redis
+      - ingress-nginx
+      - cert-manager
+      - zuul:v1.3.1-96b24b0d72-39
+  - name: core
+    dependencies:
+      - "backbone"
+      - "authn-authz"
+      - "frontend"
+    services:
+      - egovio/egov-accesscontrol:v1.1.3-72f8a8f87b-24
+      - egovio/egov-enc-service:v1.1.2-72f8a8f87b-9
+      - egovio/egov-localization:v1.1.3-72f8a8f87b-6
+      - egovio/egov-idgen:v1.2.3-72f8a8f87b-7
+      - egovio/egov-filestore:v1.2.4-72f8a8f87b-10
+      - egovio/egov-indexer:indexer-17-searchBody-1799f17903-57
+      - egovio/egov-notification-mail:health-digit-master-6865af2823-2
+      - egovio/egov-notification-sms:v1.1.3-48a03ad7bb-10
+      - egovio/egov-otp:v1.2.2-72f8a8f87b-12
+      - egovio/egov-persister:v1.1.5-3371bc2-5
+      ## - egovio/egov-url-shortening:v1.1.2-1715164454-3 not used in health now
+      - egovio/egov-user:health-digit-master-e27b970-31
+      - egovio/user-otp:health-digit-master-6865af2823-3
+      - egovio/egov-workflow-v2-db:DIGIT-2.9-LTS-237578ce80-13
+      - egovio/audit-service:audit-heatlh-40b1a4018a-11
+      - egovio/error-handler:master-impel-dump-5022b7acff-1
+      - egovio/playground:1.0
+      - egovio/mdms-v2-db:MDMS-v2-2.9LTS-fc6b868dce-47
+      - egovio/boundary-service-db:boundary-hierarchy-def-modified-2.9-lts-629baf086b-15
+  - name: business
+    dependencies:
+      - "core"
+    services:
+      - egovio/egov-hrms-db:v1.2.7-00a7accbda-19
+  - name: frontend
+    dependencies:
+      - "business"
+    services:
+      - egovio/digit-ui:health-dashboard-digit-ui-422a6751ec-658
+  - name: m_pgr             #PGR
+    dependencies:
+      - "core"
+      - "business"
+    services:
+      - egovio/pgr-services-db:v1.1.7-00a7accbda-19
+  - name: dss   #dss
+    dependencies:
+      - "frontend"
+      - "core"
+      - "business"
+    services:
+      - egovio/dashboard-analytics:master-impel-f705ac483a-48
+      - egovio/dashboard-ingest:v1.1.4-72f8a8f87b-10
+      - egovio/dss-dashboard:v1.8.0-0d70d60e63-53
+  - name: Other
+    dependencies:
+      - "core"
+      - "business"
+    services:
+      ## - egovio/egov-user-event:v1.2.0-c1e1e8ce24-21 not used currently in health
+  - name: m_health
+    dependencies:
+      - "backbone"
+      - "authn-authz"
+      - "core"
+      - "business"
+      - "dss"
+      - "Other"
+      - "frontend"
+      - "m_hcmconsole"
+    services:
+      - egovio/facility-db:v1.1.2-00a7accbda-14
+      - egovio/product-db:v1.1.0-00a7accbda-31
+      - egovio/individual-db:v1.1.5-8208b6fc8f-10
+      - egovio/transformer:stock-facility-type-update-488b321c10-226
+      - egovio/stock-db:v1.1.3-8208b6fc8f-29
+      - egovio/household-db:v1.1.3-8208b6fc8f-28
+      - egovio/project-db:v1.1.5-8208b6fc8f-12
+      - egovio/referralmanagement-db:v1.0.3-8208b6fc8f-40
+      - egovio/service-request-db:v1.0.0-00a7accbda-16
+      - egovio/health-attendance-db:v1.0.2-30824c427-11
+  - name: m_hcmconsole
+    dependencies:
+      - "backbone"
+      - "authn-authz"
+      - "core"
+    services:
+      - egovio/project-factory-db:project-factory-kafka-fix-598415c0de-17
+      - egovio/workbench-ui:v0.2.0-a9546b5242-542