diff --git a/.github/workflows/deploy-opencrvs.yml b/.github/workflows/deploy-opencrvs.yml
index d3a07dfc..a082b666 100644
--- a/.github/workflows/deploy-opencrvs.yml
+++ b/.github/workflows/deploy-opencrvs.yml
@@ -14,11 +14,11 @@ on:
       core-image-tag:
         description: "Tag of the core image"
         required: true
-        default: "v1.9.1"
+        default: "v1.9.3"
       countryconfig-image-tag:
         description: "Tag of the countryconfig image"
         required: true
-        default: "v1.9.1"
+        default: "v1.9.3"
       environment:
         description: "Target environment"
         required: true
diff --git a/.github/workflows/k8s-reset-data.yml b/.github/workflows/k8s-reset-data.yml
index af8f2904..7322facf 100644
--- a/.github/workflows/k8s-reset-data.yml
+++ b/.github/workflows/k8s-reset-data.yml
@@ -82,7 +82,7 @@ jobs:
       matrix:
         job-name:
           - data-cleanup
-          - postgres-on-update-core
+          - postgres-on-deploy
           - data-migration
           - postgres-on-update-analytics
     steps:
diff --git a/charts/opencrvs-services/Chart.yaml b/charts/opencrvs-services/Chart.yaml
index 87bba85c..f9176e11 100644
--- a/charts/opencrvs-services/Chart.yaml
+++ b/charts/opencrvs-services/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: opencrvs-services
 description: OpenCRVS Services
 type: application
-version: 0.1.23
-appVersion: 1.9.0
+version: 0.1.24
+appVersion: 1.9.3
diff --git a/charts/opencrvs-services/README.md b/charts/opencrvs-services/README.md
index 5356ad4b..9a70b87d 100644
--- a/charts/opencrvs-services/README.md
+++ b/charts/opencrvs-services/README.md
@@ -780,3 +780,19 @@ In this example:
 - `KIBANA_SYSTEM`, `METRICBEAT`, and `APM` will use the specified usernames (`kibana_system`, `beats_system`, `apm_system`) with random passwords.
 
 The generated credentials can be accessed from the `elasticsearch-opencrvs-users` secret.
+
+# Additional information
+
+## Helm chart hooks
+
+Helm chart has following pre-install/upgrade hooks:
+- elasticsearch-on-deploy: create elasticsearch users and configure permissions, see `elasticsearch` configuration options for more details how to configure users and permissions
+- influxdb-on-deploy: create database
+- mongo-on-deploy: create databases and users with correct permissions, see `mongodb` configuration options for more details how to configure users and permissions
+- postgres-on-deploy: create database, schemas and users with correct permissions 
+
+Helm chart has following post-install/upgrade hooks:
+- data-migration: apply data migrations to postgres, mongodb, influxdb
+- data-migration-analytics: apply data migrations to postgres, this hook use Countryconfig assets docker image, see documentation on how to create own analytics dashboards.
+- data-seed: initial data seed, runs only on post-install
+- elasticsearch-reindex: reindex data after deployment
diff --git a/charts/opencrvs-services/files/setup-analytics.sh b/charts/opencrvs-services/files/setup-analytics.sh
deleted file mode 100644
index 09af3a09..00000000
--- a/charts/opencrvs-services/files/setup-analytics.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Configuration
-: "${POSTGRES_HOST:=localhost}"
-: "${POSTGRES_PORT:=5432}"
-: "${POSTGRES_PASSWORD:?Must set POSTGRES_PASSWORD}"
-: "${POSTGRES_USER:?Must set POSTGRES_USER}"
-: "${ANALYTICS_POSTGRES_USER:?Must set ANALYTICS_POSTGRES_USER}"
-: "${KEEP_ALIVE_SECONDS:=0}" # Prevent Swarm from marking this task as failed due to early exit
-: "${TARGET_DB:=events}"
-
-TARGET_DB=${TARGET_DB//-/_}
-
-echo "Waiting for PostgreSQL to be ready at ${POSTGRES_HOST}:${POSTGRES_PORT}..."
-until PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" \
-  -U "$POSTGRES_USER" -d postgres -c '\q' 2>/dev/null; do
-  sleep 2
-done
-
-# Schema + tables + grants
-PGPASSWORD="$POSTGRES_PASSWORD" psql -v ON_ERROR_STOP=1 -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" \
-  -U "$POSTGRES_USER" -d "$TARGET_DB" <<EOSQL
-
-CREATE SCHEMA IF NOT EXISTS analytics;
-
-CREATE TABLE IF NOT EXISTS analytics.locations (
-  id TEXT PRIMARY KEY,
-  name text NOT NULL,
-  parent_id TEXT REFERENCES analytics.locations(id),
-  location_type TEXT NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS analytics.event_actions (
-  event_type text NOT NULL,
-  action_type TEXT NOT NULL,
-  annotation jsonb,
-  assigned_to text,
-  created_at timestamp with time zone NOT NULL DEFAULT now(),
-  created_at_location TEXT,
-  created_by text NOT NULL,
-  created_by_role text NOT NULL,
-  created_by_signature text,
-  created_by_user_type TEXT NOT NULL,
-  declared_at timestamp with time zone,
-  registered_at timestamp with time zone,
-  declaration jsonb NOT NULL DEFAULT '{}'::jsonb,
-  event_id uuid NOT NULL,
-  id uuid DEFAULT gen_random_uuid() PRIMARY KEY,
-  original_action_id uuid,
-  registration_number text UNIQUE,
-  request_id text,
-  status TEXT NOT NULL,
-  transaction_id text NOT NULL,
-  content jsonb,
-  UNIQUE (id, event_id)
-);
-
-ALTER TABLE analytics.event_actions ADD COLUMN IF NOT EXISTS custom_action_type TEXT;
-
-CREATE TABLE IF NOT EXISTS analytics.location_levels (
-  id text PRIMARY KEY,
-  level int NOT NULL,
-  name text NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS analytics.location_statistics (
-  name text,
-  reference_id text NOT NULL,
-  year int NOT NULL,
-  crude_birth_rate NUMERIC(4,1) NOT NULL,
-  male_population int NOT NULL,
-  female_population int NOT NULL,
-  total_population int NOT NULL,
-  UNIQUE (reference_id, year)
-);
-
-GRANT USAGE ON SCHEMA analytics TO "$ANALYTICS_POSTGRES_USER";
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA analytics TO "$ANALYTICS_POSTGRES_USER";
-EOSQL
-
-echo "✅ Analytics schema initialized for database '$TARGET_DB'"
\ No newline at end of file
diff --git a/charts/opencrvs-services/templates/dashboards-deployment.yaml b/charts/opencrvs-services/templates/dashboards-deployment.yaml
index 7d945cd3..57e2b422 100644
--- a/charts/opencrvs-services/templates/dashboards-deployment.yaml
+++ b/charts/opencrvs-services/templates/dashboards-deployment.yaml
@@ -58,7 +58,7 @@ spec:
             - sh
             - -c
             - >
-              cp -R /assets/* /data-assets/ &&
+              cp -R /assets/metabase/* /data-assets/ &&
               chmod +x /data-assets/*.sh || true
           volumeMounts:
             - name: assets
diff --git a/charts/opencrvs-services/templates/postgres-on-update-analytics-job.yaml b/charts/opencrvs-services/templates/data-migration-analytics-job.yaml
similarity index 72%
rename from charts/opencrvs-services/templates/postgres-on-update-analytics-job.yaml
rename to charts/opencrvs-services/templates/data-migration-analytics-job.yaml
index 34b0476a..8bc84691 100644
--- a/charts/opencrvs-services/templates/postgres-on-update-analytics-job.yaml
+++ b/charts/opencrvs-services/templates/data-migration-analytics-job.yaml
@@ -1,4 +1,8 @@
 ---
+# TODO: REVIEW: Refactor job move to countryconfig assets
+#       - create dedicated Dockerfile for a job in countryconfig
+#       - package migration assets
+#       - delete setup-analytics.sh from helm chart
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -6,18 +10,29 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "3"
   labels:
-    app: postgres-on-update-analytics
-  name: postgres-on-update-analytics
+    app: data-migration-analytics
+  name: data-migration-analytics
 spec:
   template:
     metadata:
       labels:
-        app: postgres-on-update-analytics
+        app: data-migration-analytics
     spec:
+      initContainers:
+        - name: copy-assets
+          image: "{{ .Values.countryconfig.image.name }}:{{ .Values.countryconfig.image.tag }}-assets"
+          command:
+            - sh
+            - -c
+            - >
+              cp -R /assets/postgres/* /data-assets/ &&
+              chmod +x /data-assets/*.sh || true
+          volumeMounts:
+            - name: assets
+              mountPath: /data-assets
       containers:
-        - name: postgres-on-update-analytics
-          command: ["bash", "-c", "/scripts/setup-analytics.sh"]
-          # command: ["bash", "-c", "/scripts/on-deploy.sh;"]
+        - name: data-migration-analytics
+          command: ["bash", "-c", "/data-assets/setup-analytics.sh"]
           image: postgres:17
           env:
             - name: POSTGRES_HOST
@@ -73,11 +88,9 @@ spec:
                   key: EVENTS_ANALYTICS_POSTGRES_PASSWORD
           {{- include "render-env-vars" (dict "service_name" "postgres_on_deploy" "Values" .Values) }}
           volumeMounts:
-            - mountPath: /scripts
-              name: postgres-on-update-script
+            - name: assets
+              mountPath: /data-assets
       volumes:
-        - name: postgres-on-update-script
-          configMap:
-            name: postgres-on-update-script
-            defaultMode: 0755
+        - name: assets
+          emptyDir: {}
       restartPolicy: "OnFailure"
diff --git a/charts/opencrvs-services/templates/elasticsearch-on-update-configmap.yaml b/charts/opencrvs-services/templates/elasticsearch-on-deploy-configmap.yaml
similarity index 100%
rename from charts/opencrvs-services/templates/elasticsearch-on-update-configmap.yaml
rename to charts/opencrvs-services/templates/elasticsearch-on-deploy-configmap.yaml
diff --git a/charts/opencrvs-services/templates/elasticsearch-on-update.yaml b/charts/opencrvs-services/templates/elasticsearch-on-deploy.yaml
similarity index 100%
rename from charts/opencrvs-services/templates/elasticsearch-on-update.yaml
rename to charts/opencrvs-services/templates/elasticsearch-on-deploy.yaml
diff --git a/charts/opencrvs-services/templates/mongo-on-update-configmap.yaml b/charts/opencrvs-services/templates/mongo-on-deploy-configmap.yaml
similarity index 90%
rename from charts/opencrvs-services/templates/mongo-on-update-configmap.yaml
rename to charts/opencrvs-services/templates/mongo-on-deploy-configmap.yaml
index a7eee55a..bd46f20d 100644
--- a/charts/opencrvs-services/templates/mongo-on-update-configmap.yaml
+++ b/charts/opencrvs-services/templates/mongo-on-deploy-configmap.yaml
@@ -10,5 +10,5 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "0"
-  name: mongo-on-update-script
+  name: mongo-on-deploy-script
 {{- end }}
diff --git a/charts/opencrvs-services/templates/mongo-on-update.yaml b/charts/opencrvs-services/templates/mongo-on-deploy.yaml
similarity index 94%
rename from charts/opencrvs-services/templates/mongo-on-update.yaml
rename to charts/opencrvs-services/templates/mongo-on-deploy.yaml
index 34dbb09b..510db82c 100644
--- a/charts/opencrvs-services/templates/mongo-on-update.yaml
+++ b/charts/opencrvs-services/templates/mongo-on-deploy.yaml
@@ -57,11 +57,11 @@ spec:
           {{- end }}
           volumeMounts:
             - mountPath: /on-deploy.sh
-              name: mongo-on-update-script
+              name: mongo-on-deploy-script
               subPath: on-deploy.sh
       volumes:
-        - name: mongo-on-update-script
+        - name: mongo-on-deploy-script
           configMap:
-            name: mongo-on-update-script
+            name: mongo-on-deploy-script
       restartPolicy: "OnFailure"
   {{- end }}
diff --git a/charts/opencrvs-services/templates/postgres-on-update-configmap.yaml b/charts/opencrvs-services/templates/postgres-on-deploy-configmap.yaml
similarity index 82%
rename from charts/opencrvs-services/templates/postgres-on-update-configmap.yaml
rename to charts/opencrvs-services/templates/postgres-on-deploy-configmap.yaml
index eef6b913..443485cc 100644
--- a/charts/opencrvs-services/templates/postgres-on-update-configmap.yaml
+++ b/charts/opencrvs-services/templates/postgres-on-deploy-configmap.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 data:
   on-deploy.sh: |
     {{- .Files.Get "files/postgres-on-deploy.sh" | indent 8 }}
+  # TODO: Move to dedicated configmap
   setup-analytics.sh: |
     {{- .Files.Get "files/setup-analytics.sh" | indent 8 }}
 kind: ConfigMap
@@ -12,4 +13,4 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "0"
-  name: postgres-on-update-script
+  name: postgres-on-deploy-script
diff --git a/charts/opencrvs-services/templates/postgres-on-update-core-job.yaml b/charts/opencrvs-services/templates/postgres-on-deploy-job.yaml
similarity index 90%
rename from charts/opencrvs-services/templates/postgres-on-update-core-job.yaml
rename to charts/opencrvs-services/templates/postgres-on-deploy-job.yaml
index ab976240..ef2d094d 100644
--- a/charts/opencrvs-services/templates/postgres-on-update-core-job.yaml
+++ b/charts/opencrvs-services/templates/postgres-on-deploy-job.yaml
@@ -6,16 +6,16 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "1"
   labels:
-    app: postgres-on-update-core
-  name: postgres-on-update-core
+    app: postgres-on-deploy
+  name: postgres-on-deploy
 spec:
   template:
     metadata:
       labels:
-        app: postgres-on-update-core
+        app: postgres-on-deploy
     spec:
       containers:
-        - name: postgres-on-update-core
+        - name: postgres-on-deploy
           command: ["bash", "-c", "/scripts/on-deploy.sh"]
           image: postgres:17
           env:
@@ -73,10 +73,10 @@ spec:
           {{- include "render-env-vars" (dict "service_name" "postgres_on_deploy" "Values" .Values) }}
           volumeMounts:
             - mountPath: /scripts
-              name: postgres-on-update-script
+              name: postgres-on-deploy-script
       volumes:
-        - name: postgres-on-update-script
+        - name: postgres-on-deploy-script
           configMap:
-            name: postgres-on-update-script
+            name: postgres-on-deploy-script
             defaultMode: 0755
       restartPolicy: "OnFailure"