diff --git a/CHANGES.md b/CHANGES.md
index 91e0a40ce3..b222bf9892 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## v4.2.1
+
+- #3551: Pagination Bar sometimes might generate `...` button with invalid page number
+
+## v4.2.0
+
+- #3545: Upgraded OpenSearch to v2.15.0
+
+## v4.1.0
+
+- #3487: Update to use ASGS 2021 and latest LGAs (2023) boundaries
+- Added `indexed` field to region index & Bump region index version to `27`
+  - Migration instruction can be found from [the migration doc](./docs/docs/migration/4.1.0.md)
+- Adjusted & improved region config entry skip logic
+- Improved the region loader performance
+- Fixed: region loader failed to convert number type id property into a string
+
+## v4.0.1
+
+- Add helm chart configuration option allows users to disable gateway auto-gzip response feature
+- #3541 Update default region files url to [Github repo release](https://github.com/magda-io/magda-regions)
+- #3543 Make the region mapping served by search api configurable
+
 ## v4.0.0
 
 - Use OpenSearch (v2.14.0) as main search engine
diff --git a/README.md b/README.md
index 1d967bfa6a..334e20d2ae 100755
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ If you just want to install a local testing version, installing Magda using [Hel
 # create a namespace "magda" in your cluster
 kubectl create namespace magda
 
-# install Magda version v2.2.0 to namespace "magda", turn off openfass function and expose the service via loadBalancer
+# install Magda version v4.0.0 to namespace "magda", turn off openfass function and expose the service via loadBalancer
 helm upgrade --namespace magda --install --version 4.0.0 --timeout 9999s --set magda-core.gateway.service.type=LoadBalancer magda oci://ghcr.io/magda-io/charts/magda
 ```
 
diff --git a/deploy/helm/internal-charts/admin-api/Chart.yaml b/deploy/helm/internal-charts/admin-api/Chart.yaml
index d8edfa800f..c60a9db297 100644
--- a/deploy/helm/internal-charts/admin-api/Chart.yaml
+++ b/deploy/helm/internal-charts/admin-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: admin-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/admin-api/README.md b/deploy/helm/internal-charts/admin-api/README.md
index bf9061fb28..e281fd4430 100644
--- a/deploy/helm/internal-charts/admin-api/README.md
+++ b/deploy/helm/internal-charts/admin-api/README.md
@@ -1,6 +1,6 @@
 # admin-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/apidocs-server/Chart.yaml b/deploy/helm/internal-charts/apidocs-server/Chart.yaml
index de84262097..434ff276e2 100644
--- a/deploy/helm/internal-charts/apidocs-server/Chart.yaml
+++ b/deploy/helm/internal-charts/apidocs-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: apidocs-server
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/apidocs-server/README.md b/deploy/helm/internal-charts/apidocs-server/README.md
index cd87313e66..bf498f28ad 100644
--- a/deploy/helm/internal-charts/apidocs-server/README.md
+++ b/deploy/helm/internal-charts/apidocs-server/README.md
@@ -1,6 +1,6 @@
 # apidocs-server
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/authorization-api/Chart.yaml b/deploy/helm/internal-charts/authorization-api/Chart.yaml
index 6651c1c2a3..6a604710e3 100644
--- a/deploy/helm/internal-charts/authorization-api/Chart.yaml
+++ b/deploy/helm/internal-charts/authorization-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: authorization-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/authorization-api/README.md b/deploy/helm/internal-charts/authorization-api/README.md
index 926758cbe6..6c3db8000c 100644
--- a/deploy/helm/internal-charts/authorization-api/README.md
+++ b/deploy/helm/internal-charts/authorization-api/README.md
@@ -1,6 +1,6 @@
 # authorization-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/authorization-db/Chart.lock b/deploy/helm/internal-charts/authorization-db/Chart.lock
index 2179940be9..7459b87289 100644
--- a/deploy/helm/internal-charts/authorization-db/Chart.lock
+++ b/deploy/helm/internal-charts/authorization-db/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: magda-postgres
   repository: file://../magda-postgres
-  version: 4.0.0
-digest: sha256:a129eca790a32e608d21af2f1dd31d1fb4bcd623eacba28f5d73d5725332c743
-generated: "2024-05-24T06:16:18.532685523Z"
+  version: 4.2.1
+digest: sha256:3396d487955d5e56f0af53a08b754bf2a46a5197b64007e778c9ca3226ae469e
+generated: "2024-07-02T10:25:15.604266444Z"
diff --git a/deploy/helm/internal-charts/authorization-db/Chart.yaml b/deploy/helm/internal-charts/authorization-db/Chart.yaml
index 487f271ec2..ca3152906c 100644
--- a/deploy/helm/internal-charts/authorization-db/Chart.yaml
+++ b/deploy/helm/internal-charts/authorization-db/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: authorization-db
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
-    version: "4.0.0"
+    version: "4.2.1"
     repository: "file://../magda-postgres"
     condition: global.useInK8sDbInstance.authorization-db
diff --git a/deploy/helm/internal-charts/authorization-db/README.md b/deploy/helm/internal-charts/authorization-db/README.md
index f00b8e65fd..0e832023d1 100644
--- a/deploy/helm/internal-charts/authorization-db/README.md
+++ b/deploy/helm/internal-charts/authorization-db/README.md
@@ -1,6 +1,6 @@
 # authorization-db
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -10,7 +10,7 @@ Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-postgres | magda-postgres | 4.0.0 |
+| file://../magda-postgres | magda-postgres | 4.2.1 |
 
 ## Values
 
diff --git a/deploy/helm/internal-charts/cloud-sql-proxy/Chart.yaml b/deploy/helm/internal-charts/cloud-sql-proxy/Chart.yaml
index 8dd26ae193..a33f0b4998 100644
--- a/deploy/helm/internal-charts/cloud-sql-proxy/Chart.yaml
+++ b/deploy/helm/internal-charts/cloud-sql-proxy/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: cloud-sql-proxy
-version: 4.0.0
+version: 4.2.1
 appVersion: "1.11"
 kubeVersion: ">= 1.14.0-0"
 annotations:
diff --git a/deploy/helm/internal-charts/cloud-sql-proxy/README.md b/deploy/helm/internal-charts/cloud-sql-proxy/README.md
index c7e3f16124..74d1e58b1f 100644
--- a/deploy/helm/internal-charts/cloud-sql-proxy/README.md
+++ b/deploy/helm/internal-charts/cloud-sql-proxy/README.md
@@ -1,6 +1,6 @@
 # cloud-sql-proxy
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![AppVersion: 1.11](https://img.shields.io/badge/AppVersion-1.11-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square) ![AppVersion: 1.11](https://img.shields.io/badge/AppVersion-1.11-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/combined-db/Chart.lock b/deploy/helm/internal-charts/combined-db/Chart.lock
index 50fc9bd6bd..3612b581d9 100644
--- a/deploy/helm/internal-charts/combined-db/Chart.lock
+++ b/deploy/helm/internal-charts/combined-db/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: magda-postgres
   repository: file://../magda-postgres
-  version: 4.0.0
-digest: sha256:56d86a1c8dbeda88ac9c76fea9d43626e737b0b15505949c9fc9450ec274de9d
-generated: "2024-05-24T06:16:18.622218899Z"
+  version: 4.2.1
+digest: sha256:68bb76962afd28d471fe2e2059561d9fe82c271426caa13ef5f690e9f104084a
+generated: "2024-07-02T10:25:15.690760576Z"
diff --git a/deploy/helm/internal-charts/combined-db/Chart.yaml b/deploy/helm/internal-charts/combined-db/Chart.yaml
index d1914a24a6..69115702ba 100644
--- a/deploy/helm/internal-charts/combined-db/Chart.yaml
+++ b/deploy/helm/internal-charts/combined-db/Chart.yaml
@@ -4,12 +4,12 @@ description: |
   Unless you attempt to run logical DBs over seperate physical DBs (via `global.useInK8sDbInstance.xxx`), 
   you should always enable this module (even when you use cloud based DB service e.g. AWS RDS or Google Cloud SQL).
 name: combined-db
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
-    version: "4.0.0"
+    version: "4.2.1"
     repository: "file://../magda-postgres"
     condition: global.useCombinedDb
diff --git a/deploy/helm/internal-charts/combined-db/README.md b/deploy/helm/internal-charts/combined-db/README.md
index 252233a291..a776a70895 100644
--- a/deploy/helm/internal-charts/combined-db/README.md
+++ b/deploy/helm/internal-charts/combined-db/README.md
@@ -1,6 +1,6 @@
 # combined-db
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 The combined database target module for Magda.
 Unless you attempt to run logical DBs over seperate physical DBs (via `global.useInK8sDbInstance.xxx`),
@@ -12,7 +12,7 @@ Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-postgres | magda-postgres | 4.0.0 |
+| file://../magda-postgres | magda-postgres | 4.2.1 |
 
 ## Values
 
diff --git a/deploy/helm/internal-charts/content-api/Chart.yaml b/deploy/helm/internal-charts/content-api/Chart.yaml
index 9ce971a03f..62a2a649c1 100644
--- a/deploy/helm/internal-charts/content-api/Chart.yaml
+++ b/deploy/helm/internal-charts/content-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: content-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/content-api/README.md b/deploy/helm/internal-charts/content-api/README.md
index f77942fc05..c1d3a88787 100644
--- a/deploy/helm/internal-charts/content-api/README.md
+++ b/deploy/helm/internal-charts/content-api/README.md
@@ -1,6 +1,6 @@
 # content-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/content-db/Chart.lock b/deploy/helm/internal-charts/content-db/Chart.lock
index 06c0b2b02a..5bf932692e 100644
--- a/deploy/helm/internal-charts/content-db/Chart.lock
+++ b/deploy/helm/internal-charts/content-db/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: magda-postgres
   repository: file://../magda-postgres
-  version: 4.0.0
-digest: sha256:bf453298de85ee5e6b2e1097280bfd523ac38298cfd70c5ac840d8101a2164b1
-generated: "2024-05-24T06:16:18.709702767Z"
+  version: 4.2.1
+digest: sha256:a8e92bb58c251c44ee19fca501551c2bb662f3dc100a77b8bcb9f3a0e8532570
+generated: "2024-07-02T10:25:15.777009223Z"
diff --git a/deploy/helm/internal-charts/content-db/Chart.yaml b/deploy/helm/internal-charts/content-db/Chart.yaml
index eb9bdc51ce..74a4d45e93 100644
--- a/deploy/helm/internal-charts/content-db/Chart.yaml
+++ b/deploy/helm/internal-charts/content-db/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: content-db
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
-    version: "4.0.0"
+    version: "4.2.1"
     repository: "file://../magda-postgres"
     condition: global.useInK8sDbInstance.content-db
diff --git a/deploy/helm/internal-charts/content-db/README.md b/deploy/helm/internal-charts/content-db/README.md
index 26463592fd..200fecdb41 100644
--- a/deploy/helm/internal-charts/content-db/README.md
+++ b/deploy/helm/internal-charts/content-db/README.md
@@ -1,6 +1,6 @@
 # content-db
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -10,7 +10,7 @@ Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-postgres | magda-postgres | 4.0.0 |
+| file://../magda-postgres | magda-postgres | 4.2.1 |
 
 ## Values
 
diff --git a/deploy/helm/internal-charts/correspondence-api/Chart.yaml b/deploy/helm/internal-charts/correspondence-api/Chart.yaml
index f3dbafff10..4b76f93540 100644
--- a/deploy/helm/internal-charts/correspondence-api/Chart.yaml
+++ b/deploy/helm/internal-charts/correspondence-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: correspondence-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/correspondence-api/README.md b/deploy/helm/internal-charts/correspondence-api/README.md
index d48d1eb4f5..2f68b63f06 100644
--- a/deploy/helm/internal-charts/correspondence-api/README.md
+++ b/deploy/helm/internal-charts/correspondence-api/README.md
@@ -1,6 +1,6 @@
 # correspondence-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/elasticsearch/Chart.yaml b/deploy/helm/internal-charts/elasticsearch/Chart.yaml
index 5c16aea3de..adfadc2e7c 100644
--- a/deploy/helm/internal-charts/elasticsearch/Chart.yaml
+++ b/deploy/helm/internal-charts/elasticsearch/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: elasticsearch
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/elasticsearch/README.md b/deploy/helm/internal-charts/elasticsearch/README.md
index d0ffc01bcf..86cbd43f66 100644
--- a/deploy/helm/internal-charts/elasticsearch/README.md
+++ b/deploy/helm/internal-charts/elasticsearch/README.md
@@ -1,6 +1,6 @@
 # elasticsearch
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/gateway/Chart.yaml b/deploy/helm/internal-charts/gateway/Chart.yaml
index 8ffefda6b7..094b98c686 100644
--- a/deploy/helm/internal-charts/gateway/Chart.yaml
+++ b/deploy/helm/internal-charts/gateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 description: The Gateway Component of Magda that routes incoming requets to
   other magda components.
 name: gateway
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/gateway/README.md b/deploy/helm/internal-charts/gateway/README.md
index b096ad40b8..ec2ed33172 100644
--- a/deploy/helm/internal-charts/gateway/README.md
+++ b/deploy/helm/internal-charts/gateway/README.md
@@ -1,6 +1,6 @@
 # gateway
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 The Gateway Component of Magda that routes incoming requets to other magda components.
 
@@ -43,6 +43,7 @@ Kubernetes: `>= 1.14.0-0`
 | defaultWebRouteConfig.methods | list | `["GET"]` | array of string. "all" means all methods will be proxied  |
 | defaultWebRouteConfig.redirectTrailingSlash | bool | `false` | make /xxx auto redirect to /xxxx/ |
 | defaultWebRouteConfig.to | string | `""` | the default web router proxy target. Optional. If set, the default web route set via `web` option will be ignored. |
+| disableGzip | bool | `false` | By default, response will be auto-gizpped depends on MIME type. Set this to true to disable it. |
 | enableAuthEndpoint | bool | `true` | whether or not enable auth endpoint. You can turn it off if you don't need to log into any account. |
 | enableCkanRedirection | bool | `false` | wether or not enable CKAN redirection. when it's on, any incoming ckan alike URL will be redirected to the CKAN instance URL  that is specified by config option `ckanRedirectionDomain` and `ckanRedirectionPath`. |
 | enableHttpsRedirection | bool | `false` | whether or not redirect incoming request using HTTP protocol to HTTPs |
diff --git a/deploy/helm/internal-charts/gateway/templates/deployment.yaml b/deploy/helm/internal-charts/gateway/templates/deployment.yaml
index 135bb56d31..21fb586900 100644
--- a/deploy/helm/internal-charts/gateway/templates/deployment.yaml
+++ b/deploy/helm/internal-charts/gateway/templates/deployment.yaml
@@ -59,6 +59,9 @@ spec:
 {{- if .Values.enableCkanRedirection }}
             "--enableCkanRedirection", {{ .Values.enableCkanRedirection | quote }},
 {{- end }}
+{{- if .Values.disableGzip }}
+            "--disableGzip", {{ .Values.disableGzip | quote }},
+{{- end }}
 {{- if not (kindIs "invalid" .Values.registryQueryCacheStdTTL) }}
             "--registryQueryCacheStdTTL", {{ .Values.registryQueryCacheStdTTL | quote }},
 {{- end }}
diff --git a/deploy/helm/internal-charts/gateway/values.yaml b/deploy/helm/internal-charts/gateway/values.yaml
index e4f7478197..dcb9948c0c 100644
--- a/deploy/helm/internal-charts/gateway/values.yaml
+++ b/deploy/helm/internal-charts/gateway/values.yaml
@@ -53,6 +53,9 @@ ckanRedirectionPath:
 # -- whether or not redirect incoming request using HTTP protocol to HTTPs
 enableHttpsRedirection: false
 
+# -- By default, response will be auto-gizpped depends on MIME type. Set this to true to disable it.
+disableGzip: false
+
 # -- a list of authentication plugin config item. 
 # Each authentication plugin config item can contain the following fields:
 # <ul>
diff --git a/deploy/helm/internal-charts/indexer/Chart.yaml b/deploy/helm/internal-charts/indexer/Chart.yaml
index ee6116e83e..b98be96b59 100644
--- a/deploy/helm/internal-charts/indexer/Chart.yaml
+++ b/deploy/helm/internal-charts/indexer/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-description: A Helm chart for Kubernetes
+description: A Helm chart for Magda's Indexer service.
 name: indexer
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.21.0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/indexer/README.md b/deploy/helm/internal-charts/indexer/README.md
index 8c01ca180f..60fa1da91f 100644
--- a/deploy/helm/internal-charts/indexer/README.md
+++ b/deploy/helm/internal-charts/indexer/README.md
@@ -1,8 +1,14 @@
 # indexer
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
-A Helm chart for Kubernetes
+A Helm chart for Magda's Indexer service.
+
+The default config will pull region mapping files from [the `magda-region-mappings` repo release download area](https://github.com/magda-io/magda-regions/releases).
+
+For production deployment, you might want to host those region mapping files yourself in a more reliable way (e.g. put into a storage bucket).
+
+To config region mapping files, please refer to the this repo: https://github.com/magda-io/magda-regions
 
 ## Requirements
 
@@ -31,6 +37,3 @@ Kubernetes: `>= 1.21.0`
 | resources.limits.cpu | string | `"250m"` |  |
 | resources.requests.cpu | string | `"100m"` |  |
 | resources.requests.memory | string | `"250Mi"` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/deploy/helm/internal-charts/indexer/README.md.gotmpl b/deploy/helm/internal-charts/indexer/README.md.gotmpl
new file mode 100644
index 0000000000..ec648dc671
--- /dev/null
+++ b/deploy/helm/internal-charts/indexer/README.md.gotmpl
@@ -0,0 +1,24 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+The default config will pull region mapping files from [the `magda-region-mappings` repo release download area](https://github.com/magda-io/magda-regions/releases).
+
+For production deployment, you might want to host those region mapping files yourself in a more reliable way (e.g. put into a storage bucket).
+
+To config region mapping files, please refer to the this repo: https://github.com/magda-io/magda-regions
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesHeader" . }}
+
+{{ template "chart.valuesTable" . }}
diff --git a/deploy/helm/internal-charts/ingress/Chart.yaml b/deploy/helm/internal-charts/ingress/Chart.yaml
index aab41c4b46..537a3377cc 100644
--- a/deploy/helm/internal-charts/ingress/Chart.yaml
+++ b/deploy/helm/internal-charts/ingress/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: ingress
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.19.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/ingress/README.md b/deploy/helm/internal-charts/ingress/README.md
index 0c168e1fd2..ee9f2d6932 100644
--- a/deploy/helm/internal-charts/ingress/README.md
+++ b/deploy/helm/internal-charts/ingress/README.md
@@ -1,6 +1,6 @@
 # ingress
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/magda-postgres/Chart.yaml b/deploy/helm/internal-charts/magda-postgres/Chart.yaml
index 65baec7420..d27383f8c6 100644
--- a/deploy/helm/internal-charts/magda-postgres/Chart.yaml
+++ b/deploy/helm/internal-charts/magda-postgres/Chart.yaml
@@ -3,7 +3,7 @@ name: magda-postgres
 description: "A helm wrapper chart that provides in-kubernetes postgreSQL for Magda."
 type: application
 kubeVersion: ">= 1.21.0"
-version: "4.0.0"
+version: "4.2.1"
 annotations:
   magdaModuleType: "core"
 dependencies:
diff --git a/deploy/helm/internal-charts/magda-postgres/README.md b/deploy/helm/internal-charts/magda-postgres/README.md
index ce6866be91..996db2e377 100644
--- a/deploy/helm/internal-charts/magda-postgres/README.md
+++ b/deploy/helm/internal-charts/magda-postgres/README.md
@@ -1,6 +1,6 @@
 # magda-postgres
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A helm wrapper chart that provides in-kubernetes postgreSQL for Magda.
 
@@ -53,7 +53,7 @@ More config postgreSQL related options, please refer to: https://github.com/bitn
 | postgresql.fullnameOverride | string | `"default-db-postgresql"` | Set `fullnameOverride` & `nameOverride` to fixed value so it's easier to manage the naming pattern. And point k8s service to DB instance. |
 | postgresql.image.registry | string | `"ghcr.io"` |  |
 | postgresql.image.repository | string | `"magda-io/magda-postgres"` |  |
-| postgresql.image.tag | string | `"4.0.0"` | the default docker image tag/version used by the postgresql chart.  When dump the magda version using `yarn set-version` (at magda repo root), this default version will be auto-replaced with the new chart version number. |
+| postgresql.image.tag | string | `"4.2.1"` | the default docker image tag/version used by the postgresql chart.  When dump the magda version using `yarn set-version` (at magda repo root), this default version will be auto-replaced with the new chart version number. |
 | postgresql.livenessProbe.enabled | bool | `false` | `customLivenessProbe` will only be used when `enabled`=`false` Otherwise, default livenessProbe will be used. |
 | postgresql.nameOverride | string | `"default-db-postgresql"` | Set `fullnameOverride` & `nameOverride` to fixed value so it's easier to manage the naming pattern. And point k8s service to DB instance. |
 | postgresql.persistence.size | string | `"50Gi"` | set the persistence volume size of the postgresql statefulset |
diff --git a/deploy/helm/internal-charts/magda-postgres/values.yaml b/deploy/helm/internal-charts/magda-postgres/values.yaml
index d901d49dd3..a67f077ac6 100644
--- a/deploy/helm/internal-charts/magda-postgres/values.yaml
+++ b/deploy/helm/internal-charts/magda-postgres/values.yaml
@@ -21,7 +21,7 @@ postgresql:
   image:
     # -- the default docker image tag/version used by the postgresql chart. 
     # When dump the magda version using `yarn set-version` (at magda repo root), this default version will be auto-replaced with the new chart version number.
-    tag: "4.0.0"
+    tag: "4.2.1"
     repository: "magda-io/magda-postgres"
     registry: "ghcr.io"
 
diff --git a/deploy/helm/internal-charts/opensearch-dashboards/Chart.yaml b/deploy/helm/internal-charts/opensearch-dashboards/Chart.yaml
index a8192df6bc..d3796eb5dd 100644
--- a/deploy/helm/internal-charts/opensearch-dashboards/Chart.yaml
+++ b/deploy/helm/internal-charts/opensearch-dashboards/Chart.yaml
@@ -3,7 +3,7 @@ description: A Helm chart for OpenSearch dashboards. To make the service
   accessible externally, please refer to [this
   doc](https://github.com/magda-io/magda/blob/main/docs/docs/how-to-expose-opensearch-dashboards.md)
 name: opensearch-dashboards
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.23.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/opensearch-dashboards/README.md b/deploy/helm/internal-charts/opensearch-dashboards/README.md
index f82f414af3..697bb66da9 100644
--- a/deploy/helm/internal-charts/opensearch-dashboards/README.md
+++ b/deploy/helm/internal-charts/opensearch-dashboards/README.md
@@ -1,6 +1,6 @@
 # opensearch-dashboards
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for OpenSearch dashboards. To make the service accessible externally, please refer to [this doc](https://github.com/magda-io/magda/blob/main/docs/docs/how-to-expose-opensearch-dashboards.md)
 
diff --git a/deploy/helm/internal-charts/opensearch/Chart.yaml b/deploy/helm/internal-charts/opensearch/Chart.yaml
index 5826718ec9..ad8c16aa92 100644
--- a/deploy/helm/internal-charts/opensearch/Chart.yaml
+++ b/deploy/helm/internal-charts/opensearch/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Magda's OpenSearch Cluster
 name: opensearch
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.23.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/opensearch/README.md b/deploy/helm/internal-charts/opensearch/README.md
index 2ab65d9189..dd2e97c544 100644
--- a/deploy/helm/internal-charts/opensearch/README.md
+++ b/deploy/helm/internal-charts/opensearch/README.md
@@ -1,6 +1,6 @@
 # opensearch
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Magda's OpenSearch Cluster
 
diff --git a/deploy/helm/internal-charts/priorities/Chart.yaml b/deploy/helm/internal-charts/priorities/Chart.yaml
index a82ee7cb79..d98188640a 100644
--- a/deploy/helm/internal-charts/priorities/Chart.yaml
+++ b/deploy/helm/internal-charts/priorities/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: priorities
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/rds-dev-proxy/Chart.yaml b/deploy/helm/internal-charts/rds-dev-proxy/Chart.yaml
index c98a51f299..b83b6260fb 100644
--- a/deploy/helm/internal-charts/rds-dev-proxy/Chart.yaml
+++ b/deploy/helm/internal-charts/rds-dev-proxy/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: rds-dev-proxy
 description: A RDS proxy for dev / debugging purpose
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/rds-dev-proxy/README.md b/deploy/helm/internal-charts/rds-dev-proxy/README.md
index 58a6e89522..2cabd95f68 100644
--- a/deploy/helm/internal-charts/rds-dev-proxy/README.md
+++ b/deploy/helm/internal-charts/rds-dev-proxy/README.md
@@ -1,6 +1,6 @@
 # rds-dev-proxy
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A RDS proxy for dev / debugging purpose
 
diff --git a/deploy/helm/internal-charts/registry-api/Chart.yaml b/deploy/helm/internal-charts/registry-api/Chart.yaml
index 1fcaa3d756..e041bb7a83 100644
--- a/deploy/helm/internal-charts/registry-api/Chart.yaml
+++ b/deploy/helm/internal-charts/registry-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: registry-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/registry-api/README.md b/deploy/helm/internal-charts/registry-api/README.md
index 9f69ae205a..6c63974a1a 100644
--- a/deploy/helm/internal-charts/registry-api/README.md
+++ b/deploy/helm/internal-charts/registry-api/README.md
@@ -1,6 +1,6 @@
 # registry-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/registry-db/Chart.lock b/deploy/helm/internal-charts/registry-db/Chart.lock
index f7486fb823..432b773a62 100644
--- a/deploy/helm/internal-charts/registry-db/Chart.lock
+++ b/deploy/helm/internal-charts/registry-db/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: magda-postgres
   repository: file://../magda-postgres
-  version: 4.0.0
-digest: sha256:8d8923c38cb0aa22d719fc9b49848a5d313b095c784687b94606e8a80bbc824b
-generated: "2024-05-24T06:16:19.331211139Z"
+  version: 4.2.1
+digest: sha256:c74cab327a14e07d3ee5ff0210fa2f19ebe8dc3a22997f2adc3ffe21b5d420bf
+generated: "2024-07-02T10:25:16.737437215Z"
diff --git a/deploy/helm/internal-charts/registry-db/Chart.yaml b/deploy/helm/internal-charts/registry-db/Chart.yaml
index ff66e88a09..44a1eec04d 100644
--- a/deploy/helm/internal-charts/registry-db/Chart.yaml
+++ b/deploy/helm/internal-charts/registry-db/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: registry-db
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.21.0"
 annotations:
   magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
-    version: "4.0.0"
+    version: "4.2.1"
     repository: "file://../magda-postgres"
     condition: global.useInK8sDbInstance.registry-db
diff --git a/deploy/helm/internal-charts/registry-db/README.md b/deploy/helm/internal-charts/registry-db/README.md
index 2850dcb786..2946bdabab 100644
--- a/deploy/helm/internal-charts/registry-db/README.md
+++ b/deploy/helm/internal-charts/registry-db/README.md
@@ -1,6 +1,6 @@
 # registry-db
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -10,7 +10,7 @@ Kubernetes: `>= 1.21.0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-postgres | magda-postgres | 4.0.0 |
+| file://../magda-postgres | magda-postgres | 4.2.1 |
 
 ## Values
 
diff --git a/deploy/helm/internal-charts/search-api-node/Chart.yaml b/deploy/helm/internal-charts/search-api-node/Chart.yaml
index 06c632cec8..f4c8d7abb9 100644
--- a/deploy/helm/internal-charts/search-api-node/Chart.yaml
+++ b/deploy/helm/internal-charts/search-api-node/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 kubeVersion: ">= 1.14.0-0"
 description: A Helm chart for Kubernetes
 name: search-api-node
-version: 4.0.0
+version: 4.2.1
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/search-api-node/README.md b/deploy/helm/internal-charts/search-api-node/README.md
index dea915696a..16cee43243 100644
--- a/deploy/helm/internal-charts/search-api-node/README.md
+++ b/deploy/helm/internal-charts/search-api-node/README.md
@@ -1,6 +1,6 @@
 # search-api-node
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/search-api/Chart.yaml b/deploy/helm/internal-charts/search-api/Chart.yaml
index 518e5103a0..65eb853c5a 100644
--- a/deploy/helm/internal-charts/search-api/Chart.yaml
+++ b/deploy/helm/internal-charts/search-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: search-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/search-api/README.md b/deploy/helm/internal-charts/search-api/README.md
index 07556ece5d..422565290d 100644
--- a/deploy/helm/internal-charts/search-api/README.md
+++ b/deploy/helm/internal-charts/search-api/README.md
@@ -1,6 +1,6 @@
 # search-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/session-db/Chart.lock b/deploy/helm/internal-charts/session-db/Chart.lock
index ffd62a907b..db6ce7386e 100644
--- a/deploy/helm/internal-charts/session-db/Chart.lock
+++ b/deploy/helm/internal-charts/session-db/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: magda-postgres
   repository: file://../magda-postgres
-  version: 4.0.0
-digest: sha256:9e9ca7535155234aeab828b3a9ec62635da8a438a185fe7b605084e159711d7e
-generated: "2024-05-24T06:16:19.451868353Z"
+  version: 4.2.1
+digest: sha256:d4eb5b03cb44580b306e4cac6e188e10400f676683c99f73d447f0c5a290e2d0
+generated: "2024-07-02T10:25:16.859948628Z"
diff --git a/deploy/helm/internal-charts/session-db/Chart.yaml b/deploy/helm/internal-charts/session-db/Chart.yaml
index 5a7198a6cd..c872774008 100644
--- a/deploy/helm/internal-charts/session-db/Chart.yaml
+++ b/deploy/helm/internal-charts/session-db/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: session-db
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
-    version: "4.0.0"
+    version: "4.2.1"
     repository: "file://../magda-postgres"
     condition: global.useInK8sDbInstance.session-db
diff --git a/deploy/helm/internal-charts/session-db/README.md b/deploy/helm/internal-charts/session-db/README.md
index 3e4ded033c..6c9f437d6c 100644
--- a/deploy/helm/internal-charts/session-db/README.md
+++ b/deploy/helm/internal-charts/session-db/README.md
@@ -1,6 +1,6 @@
 # session-db
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -10,7 +10,7 @@ Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-postgres | magda-postgres | 4.0.0 |
+| file://../magda-postgres | magda-postgres | 4.2.1 |
 
 ## Values
 
diff --git a/deploy/helm/internal-charts/storage-api/Chart.yaml b/deploy/helm/internal-charts/storage-api/Chart.yaml
index b8adde438b..bec234fc55 100644
--- a/deploy/helm/internal-charts/storage-api/Chart.yaml
+++ b/deploy/helm/internal-charts/storage-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: storage-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/storage-api/README.md b/deploy/helm/internal-charts/storage-api/README.md
index 503c96737c..0c33fce4ca 100644
--- a/deploy/helm/internal-charts/storage-api/README.md
+++ b/deploy/helm/internal-charts/storage-api/README.md
@@ -1,6 +1,6 @@
 # storage-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/tenant-api/Chart.yaml b/deploy/helm/internal-charts/tenant-api/Chart.yaml
index 5af88ae25f..dc1f6d01fa 100644
--- a/deploy/helm/internal-charts/tenant-api/Chart.yaml
+++ b/deploy/helm/internal-charts/tenant-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: tenant-api
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/tenant-api/README.md b/deploy/helm/internal-charts/tenant-api/README.md
index 88d7492033..2cb5133b03 100644
--- a/deploy/helm/internal-charts/tenant-api/README.md
+++ b/deploy/helm/internal-charts/tenant-api/README.md
@@ -1,6 +1,6 @@
 # tenant-api
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/internal-charts/tenant-db/Chart.lock b/deploy/helm/internal-charts/tenant-db/Chart.lock
index 7f4147f2f7..43316e76ce 100644
--- a/deploy/helm/internal-charts/tenant-db/Chart.lock
+++ b/deploy/helm/internal-charts/tenant-db/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: magda-postgres
   repository: file://../magda-postgres
-  version: 4.0.0
-digest: sha256:e21f0a181e789b97c92c1f35962c7c3d183ecf97666189c79efc3b4442556573
-generated: "2024-05-24T06:16:19.756921794Z"
+  version: 4.2.1
+digest: sha256:1f8f2589ce3b200df3cf5709732d305d8811ddad00961f43ca108e13797e3524
+generated: "2024-07-02T10:25:17.72775633Z"
diff --git a/deploy/helm/internal-charts/tenant-db/Chart.yaml b/deploy/helm/internal-charts/tenant-db/Chart.yaml
index 975d40ad66..43b67b2339 100644
--- a/deploy/helm/internal-charts/tenant-db/Chart.yaml
+++ b/deploy/helm/internal-charts/tenant-db/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: tenant-db
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
-    version: "4.0.0"
+    version: "4.2.1"
     repository: "file://../magda-postgres"
     condition: global.useInK8sDbInstance.tenant-db
diff --git a/deploy/helm/internal-charts/tenant-db/README.md b/deploy/helm/internal-charts/tenant-db/README.md
index 029e326dba..71f3ba71cd 100644
--- a/deploy/helm/internal-charts/tenant-db/README.md
+++ b/deploy/helm/internal-charts/tenant-db/README.md
@@ -1,6 +1,6 @@
 # tenant-db
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -10,7 +10,7 @@ Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-postgres | magda-postgres | 4.0.0 |
+| file://../magda-postgres | magda-postgres | 4.2.1 |
 
 ## Values
 
diff --git a/deploy/helm/internal-charts/web-server/Chart.yaml b/deploy/helm/internal-charts/web-server/Chart.yaml
index aa2d631699..1d3955403a 100644
--- a/deploy/helm/internal-charts/web-server/Chart.yaml
+++ b/deploy/helm/internal-charts/web-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: web-server
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/web-server/README.md b/deploy/helm/internal-charts/web-server/README.md
index 8eb5631d10..64c997841c 100644
--- a/deploy/helm/internal-charts/web-server/README.md
+++ b/deploy/helm/internal-charts/web-server/README.md
@@ -1,6 +1,6 @@
 # web-server
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/deploy/helm/local-auth-test-deployment/Chart.lock b/deploy/helm/local-auth-test-deployment/Chart.lock
index eebbaa4f5f..ace30fa00e 100644
--- a/deploy/helm/local-auth-test-deployment/Chart.lock
+++ b/deploy/helm/local-auth-test-deployment/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: magda-core
   repository: file://../magda-core
-  version: 4.0.0
-digest: sha256:7b445af8ff88887469546047ca66053ff26da0b838ede28b8a3c4cbbc6a8731a
-generated: "2024-05-24T06:16:26.553673676Z"
+  version: 4.2.1
+digest: sha256:4bc1434158ab42fd923bc05aabd2532879d7ea975e84ee982454fc25458276f1
+generated: "2024-07-02T10:25:33.613638208Z"
diff --git a/deploy/helm/local-auth-test-deployment/Chart.yaml b/deploy/helm/local-auth-test-deployment/Chart.yaml
index 1236bdef9a..4e15621d3c 100644
--- a/deploy/helm/local-auth-test-deployment/Chart.yaml
+++ b/deploy/helm/local-auth-test-deployment/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
 name: "magda-local-auth-test-deployment"
 description: ""
-version: "4.0.0"
+version: "4.2.1"
 kubeVersion: ">= 1.14.0-0"
 dependencies:
   - name: magda-core
-    version: 4.0.0
+    version: 4.2.1
     repository: "file://../magda-core"
diff --git a/deploy/helm/local-auth-test-deployment/readme.md b/deploy/helm/local-auth-test-deployment/readme.md
index 112bc764ea..e2d75ddbc3 100644
--- a/deploy/helm/local-auth-test-deployment/readme.md
+++ b/deploy/helm/local-auth-test-deployment/readme.md
@@ -1,6 +1,6 @@
 # magda-local-auth-test-deployment
 
-![Version: 3.0.4](https://img.shields.io/badge/Version-3.0.4-informational?style=flat-square)
+![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
 
 ## Requirements
 
@@ -8,7 +8,7 @@ Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-core | magda-core | 3.0.4 |
+| file://../magda-core | magda-core | 4.0.0 |
 
 ## Values
 
diff --git a/deploy/helm/local-deployment/Chart.lock b/deploy/helm/local-deployment/Chart.lock
index bb1db309b1..3af3a5926f 100644
--- a/deploy/helm/local-deployment/Chart.lock
+++ b/deploy/helm/local-deployment/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: magda
   repository: file://../magda
-  version: 4.0.0
+  version: 4.2.1
 - name: magda-auth-google
   repository: oci://ghcr.io/magda-io/charts
   version: 2.0.1
@@ -107,5 +107,5 @@ dependencies:
 - name: magda-project-open-data-connector
   repository: oci://ghcr.io/magda-io/charts
   version: 2.0.0
-digest: sha256:3aca2bb8cf38ba65c02d73ace591ffa9f7cfd4d52c5eb7dc31e9f379105f9617
-generated: "2024-05-24T06:16:21.972018847Z"
+digest: sha256:58a74f3f3894848b7f6006804fc5d3743eeab89bd02934cb7065c3685ee1444f
+generated: "2024-07-02T10:25:22.981940209Z"
diff --git a/deploy/helm/local-deployment/Chart.yaml b/deploy/helm/local-deployment/Chart.yaml
index 4ea4a800b6..0851f7dd74 100644
--- a/deploy/helm/local-deployment/Chart.yaml
+++ b/deploy/helm/local-deployment/Chart.yaml
@@ -1,11 +1,11 @@
 apiVersion: v2
 name: "magda-local-deployment"
 description: ""
-version: "4.0.0"
+version: "4.2.1"
 kubeVersion: ">= 1.14.0-0"
 dependencies:
   - name: magda
-    version: 4.0.0
+    version: 4.2.1
     repository: "file://../magda"
 
   - name: magda-auth-google
diff --git a/deploy/helm/local-deployment/readme.md b/deploy/helm/local-deployment/readme.md
index 7dcb5880a0..aabc7b4e19 100644
--- a/deploy/helm/local-deployment/readme.md
+++ b/deploy/helm/local-deployment/readme.md
@@ -1,6 +1,6 @@
 # magda-local-deployment
 
-![Version: 3.0.4](https://img.shields.io/badge/Version-3.0.4-informational?style=flat-square)
+![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
 
 ## Requirements
 
@@ -8,7 +8,7 @@ Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| oci://ghcr.io/magda-io/charts | magda | 4.0.0-alpha.5 |
+| file://../magda | magda | 4.0.0 |
 | oci://ghcr.io/magda-io/charts | magda-auth-arcgis | 2.0.1 |
 | oci://ghcr.io/magda-io/charts | magda-auth-facebook | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | magda-auth-google | 2.0.1 |
diff --git a/deploy/helm/magda-common/Chart.yaml b/deploy/helm/magda-common/Chart.yaml
index 071ee4adbf..9a695c06ca 100644
--- a/deploy/helm/magda-common/Chart.yaml
+++ b/deploy/helm/magda-common/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   A Library Helm Chart for sharing common Magda logic between charts. 
   This chart is not deployable by itself.
 type: library
-version: 4.0.0
+version: 4.2.1
 kubeVersion: ">= 1.14.0-0"
 annotations:
   magdaModuleType: "core"
diff --git a/deploy/helm/magda-common/README.md b/deploy/helm/magda-common/README.md
index 6a69933c78..ccc0446367 100644
--- a/deploy/helm/magda-common/README.md
+++ b/deploy/helm/magda-common/README.md
@@ -1,6 +1,6 @@
 # magda-common
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 A Library Helm Chart for sharing common Magda logic between charts.
 This chart is not deployable by itself.
diff --git a/deploy/helm/magda-core/Chart.lock b/deploy/helm/magda-core/Chart.lock
index 45ebab4122..42ab866759 100644
--- a/deploy/helm/magda-core/Chart.lock
+++ b/deploy/helm/magda-core/Chart.lock
@@ -1,87 +1,87 @@
 dependencies:
 - name: magda-common
   repository: file://../magda-common
-  version: 4.0.0
+  version: 4.2.1
 - name: apidocs-server
   repository: file://../internal-charts/apidocs-server
-  version: 4.0.0
+  version: 4.2.1
 - name: authorization-api
   repository: file://../internal-charts/authorization-api
-  version: 4.0.0
+  version: 4.2.1
 - name: authorization-db
   repository: file://../internal-charts/authorization-db
-  version: 4.0.0
+  version: 4.2.1
 - name: cloud-sql-proxy
   repository: file://../internal-charts/cloud-sql-proxy
-  version: 4.0.0
+  version: 4.2.1
 - name: combined-db
   repository: file://../internal-charts/combined-db
-  version: 4.0.0
+  version: 4.2.1
 - name: content-api
   repository: file://../internal-charts/content-api
-  version: 4.0.0
+  version: 4.2.1
 - name: content-db
   repository: file://../internal-charts/content-db
-  version: 4.0.0
+  version: 4.2.1
 - name: correspondence-api
   repository: file://../internal-charts/correspondence-api
-  version: 4.0.0
+  version: 4.2.1
 - name: elasticsearch
   repository: file://../internal-charts/elasticsearch
-  version: 4.0.0
+  version: 4.2.1
 - name: opensearch
   repository: file://../internal-charts/opensearch
-  version: 4.0.0
+  version: 4.2.1
 - name: opensearch-dashboards
   repository: file://../internal-charts/opensearch-dashboards
-  version: 4.0.0
+  version: 4.2.1
 - name: gateway
   repository: file://../internal-charts/gateway
-  version: 4.0.0
+  version: 4.2.1
 - name: indexer
   repository: file://../internal-charts/indexer
-  version: 4.0.0
+  version: 4.2.1
 - name: magda-preview-map
   repository: oci://ghcr.io/magda-io/charts
   version: 1.1.3
 - name: registry-api
   repository: file://../internal-charts/registry-api
-  version: 4.0.0
+  version: 4.2.1
 - name: registry-db
   repository: file://../internal-charts/registry-db
-  version: 4.0.0
+  version: 4.2.1
 - name: search-api
   repository: file://../internal-charts/search-api
-  version: 4.0.0
+  version: 4.2.1
 - name: search-api-node
   repository: file://../internal-charts/search-api-node
-  version: 4.0.0
+  version: 4.2.1
 - name: session-db
   repository: file://../internal-charts/session-db
-  version: 4.0.0
+  version: 4.2.1
 - name: web-server
   repository: file://../internal-charts/web-server
-  version: 4.0.0
+  version: 4.2.1
 - name: admin-api
   repository: file://../internal-charts/admin-api
-  version: 4.0.0
+  version: 4.2.1
 - name: storage-api
   repository: file://../internal-charts/storage-api
-  version: 4.0.0
+  version: 4.2.1
 - name: tenant-api
   repository: file://../internal-charts/tenant-api
-  version: 4.0.0
+  version: 4.2.1
 - name: tenant-db
   repository: file://../internal-charts/tenant-db
-  version: 4.0.0
+  version: 4.2.1
 - name: priorities
   repository: file://../internal-charts/priorities
-  version: 4.0.0
+  version: 4.2.1
 - name: ingress
   repository: file://../internal-charts/ingress
-  version: 4.0.0
+  version: 4.2.1
 - name: rds-dev-proxy
   repository: file://../internal-charts/rds-dev-proxy
-  version: 4.0.0
-digest: sha256:a7c838f4c339fa5877ecc3d55b540ca4f9bd3278c770a029e7cbb16f88d2db47
-generated: "2024-05-24T06:16:19.888947686Z"
+  version: 4.2.1
+digest: sha256:db4d9887e9fae2705cfb49e6480b02bcf59f2be02eed30e879304d60522d690f
+generated: "2024-07-02T10:25:17.851534909Z"
diff --git a/deploy/helm/magda-core/Chart.yaml b/deploy/helm/magda-core/Chart.yaml
index b538e5acda..010db945db 100644
--- a/deploy/helm/magda-core/Chart.yaml
+++ b/deploy/helm/magda-core/Chart.yaml
@@ -3,88 +3,88 @@ name: "magda-core"
 description: "A complete solution for managing, publishing and discovering
   government data, private and open. This chart includes all core magda
   modules."
-version: "4.0.0"
+version: "4.2.1"
 home: "https://github.com/magda-io/magda"
 sources: [ "https://github.com/magda-io/magda" ]
 annotations:
   magdaModuleType: "core"
 dependencies:
   - name: magda-common
-    version: "4.0.0"
+    version: "4.2.1"
     repository: "file://../magda-common"
   - name: apidocs-server
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/apidocs-server
     tags:
       - all
       - apidocs-server
   - name: authorization-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/authorization-api
     tags:
       - all
       - authorization-api
   - name: authorization-db
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/authorization-db
     tags:
       - all
       - authorization-db
   - name: cloud-sql-proxy
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/cloud-sql-proxy
     tags:
       - all
       - cloud-sql-proxy
   - name: combined-db
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/combined-db
     tags:
       - all
       - combined-db
   - name: content-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/content-api
     tags:
       - all
       - content-api
   - name: content-db
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/content-db
     tags:
       - all
       - content-db
   - name: correspondence-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/correspondence-api
     tags:
       # To enable correspondence-api, please manually set `tags.correspondence-api` to true
       - correspondence-api
   - name: elasticsearch
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/elasticsearch
     tags:
       - elasticsearch
   - name: opensearch
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/opensearch
     tags:
       - all
       - opensearch
   - name: opensearch-dashboards
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/opensearch-dashboards
     tags:
       - all
       - opensearch-dashboards
   - name: gateway
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/gateway
     tags:
       - all
       - gateway
   - name: indexer
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/indexer
     tags:
       - all
@@ -97,61 +97,61 @@ dependencies:
       - all
       - preview-map
   - name: registry-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/registry-api
     tags:
       - all
       - registry-api
   - name: registry-db
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/registry-db
     tags:
       - all
       - registry-db
   - name: search-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/search-api
     tags:
       - all
       - search-api
   - name: search-api-node
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/search-api-node
     tags:
       - search-api-node
   - name: session-db
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/session-db
     tags:
       - all
       - session-db
   - name: web-server
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/web-server
     tags:
       - all
       - web-server
   - name: admin-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/admin-api
     tags:
       - all
       - admin-api
   - name: storage-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/storage-api
     tags:
       - all
       - storage-api
   - name: tenant-api
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/tenant-api
     condition: global.enableMultiTenants
     tags:
       - all
       - tenant-api
   - name: tenant-db
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/tenant-db
     condition: global.enableMultiTenants
     tags:
@@ -159,17 +159,17 @@ dependencies:
       - tenant-db
   # K8s misc
   - name: priorities
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/priorities
     tags:
       - priorities
   - name: ingress
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/ingress
     tags:
       - ingress
   - name: rds-dev-proxy
-    version: 4.0.0
+    version: 4.2.1
     repository: file://../internal-charts/rds-dev-proxy
     tags:
       - rds-dev-proxy
diff --git a/deploy/helm/magda-core/README.md b/deploy/helm/magda-core/README.md
index 8e9b882671..b6584dc941 100644
--- a/deploy/helm/magda-core/README.md
+++ b/deploy/helm/magda-core/README.md
@@ -1,6 +1,6 @@
 # magda-core
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A complete solution for managing, publishing and discovering government data, private and open. This chart includes all core magda modules.
 
@@ -14,33 +14,33 @@ A complete solution for managing, publishing and discovering government data, pr
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../internal-charts/admin-api | admin-api | 4.0.0 |
-| file://../internal-charts/apidocs-server | apidocs-server | 4.0.0 |
-| file://../internal-charts/authorization-api | authorization-api | 4.0.0 |
-| file://../internal-charts/authorization-db | authorization-db | 4.0.0 |
-| file://../internal-charts/cloud-sql-proxy | cloud-sql-proxy | 4.0.0 |
-| file://../internal-charts/combined-db | combined-db | 4.0.0 |
-| file://../internal-charts/content-api | content-api | 4.0.0 |
-| file://../internal-charts/content-db | content-db | 4.0.0 |
-| file://../internal-charts/correspondence-api | correspondence-api | 4.0.0 |
-| file://../internal-charts/elasticsearch | elasticsearch | 4.0.0 |
-| file://../internal-charts/gateway | gateway | 4.0.0 |
-| file://../internal-charts/indexer | indexer | 4.0.0 |
-| file://../internal-charts/ingress | ingress | 4.0.0 |
-| file://../internal-charts/opensearch-dashboards | opensearch-dashboards | 4.0.0 |
-| file://../internal-charts/opensearch | opensearch | 4.0.0 |
-| file://../internal-charts/priorities | priorities | 4.0.0 |
-| file://../internal-charts/rds-dev-proxy | rds-dev-proxy | 4.0.0 |
-| file://../internal-charts/registry-api | registry-api | 4.0.0 |
-| file://../internal-charts/registry-db | registry-db | 4.0.0 |
-| file://../internal-charts/search-api-node | search-api-node | 4.0.0 |
-| file://../internal-charts/search-api | search-api | 4.0.0 |
-| file://../internal-charts/session-db | session-db | 4.0.0 |
-| file://../internal-charts/storage-api | storage-api | 4.0.0 |
-| file://../internal-charts/tenant-api | tenant-api | 4.0.0 |
-| file://../internal-charts/tenant-db | tenant-db | 4.0.0 |
-| file://../internal-charts/web-server | web-server | 4.0.0 |
-| file://../magda-common | magda-common | 4.0.0 |
+| file://../internal-charts/admin-api | admin-api | 4.2.1 |
+| file://../internal-charts/apidocs-server | apidocs-server | 4.2.1 |
+| file://../internal-charts/authorization-api | authorization-api | 4.2.1 |
+| file://../internal-charts/authorization-db | authorization-db | 4.2.1 |
+| file://../internal-charts/cloud-sql-proxy | cloud-sql-proxy | 4.2.1 |
+| file://../internal-charts/combined-db | combined-db | 4.2.1 |
+| file://../internal-charts/content-api | content-api | 4.2.1 |
+| file://../internal-charts/content-db | content-db | 4.2.1 |
+| file://../internal-charts/correspondence-api | correspondence-api | 4.2.1 |
+| file://../internal-charts/elasticsearch | elasticsearch | 4.2.1 |
+| file://../internal-charts/gateway | gateway | 4.2.1 |
+| file://../internal-charts/indexer | indexer | 4.2.1 |
+| file://../internal-charts/ingress | ingress | 4.2.1 |
+| file://../internal-charts/opensearch-dashboards | opensearch-dashboards | 4.2.1 |
+| file://../internal-charts/opensearch | opensearch | 4.2.1 |
+| file://../internal-charts/priorities | priorities | 4.2.1 |
+| file://../internal-charts/rds-dev-proxy | rds-dev-proxy | 4.2.1 |
+| file://../internal-charts/registry-api | registry-api | 4.2.1 |
+| file://../internal-charts/registry-db | registry-db | 4.2.1 |
+| file://../internal-charts/search-api-node | search-api-node | 4.2.1 |
+| file://../internal-charts/search-api | search-api | 4.2.1 |
+| file://../internal-charts/session-db | session-db | 4.2.1 |
+| file://../internal-charts/storage-api | storage-api | 4.2.1 |
+| file://../internal-charts/tenant-api | tenant-api | 4.2.1 |
+| file://../internal-charts/tenant-db | tenant-db | 4.2.1 |
+| file://../internal-charts/web-server | web-server | 4.2.1 |
+| file://../magda-common | magda-common | 4.2.1 |
 | oci://ghcr.io/magda-io/charts | preview-map(magda-preview-map) | 1.1.3 |
 
 ## Values
diff --git a/deploy/helm/magda/Chart.lock b/deploy/helm/magda/Chart.lock
index 01b79d828b..4acfe97203 100644
--- a/deploy/helm/magda/Chart.lock
+++ b/deploy/helm/magda/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: magda-core
   repository: file://../magda-core
-  version: 4.0.0
+  version: 4.2.1
 - name: openfaas
   repository: oci://ghcr.io/magda-io/charts
   version: 5.5.5-magda.3
@@ -29,5 +29,5 @@ dependencies:
 - name: magda-function-esri-url-processor
   repository: oci://ghcr.io/magda-io/charts
   version: 2.0.0
-digest: sha256:ec64176efa228200ce524b0cc0907b68194e6baa1d4e5d003513b34cd3f7eb6e
-generated: "2024-05-24T06:16:20.300462426Z"
+digest: sha256:2662e69d7de411aaf8207932d0377cd2742358d78bedc3bd7270e958577bc3d6
+generated: "2024-07-02T10:25:18.683401022Z"
diff --git a/deploy/helm/magda/Chart.yaml b/deploy/helm/magda/Chart.yaml
index 8ab287bca4..25f1c66afa 100644
--- a/deploy/helm/magda/Chart.yaml
+++ b/deploy/helm/magda/Chart.yaml
@@ -3,12 +3,12 @@ name: "magda"
 description: "A complete solution for managing, publishing and discovering
   government data, private and open. This chart includes the magda default
   deployment."
-version: "4.0.0"
+version: "4.2.1"
 home: "https://github.com/magda-io/magda"
 sources: [ "https://github.com/magda-io/magda" ]
 dependencies:
   - name: magda-core
-    version: "4.0.0"
+    version: "4.2.1"
     repository: file://../magda-core
 
   - name: openfaas
diff --git a/deploy/helm/magda/README.md b/deploy/helm/magda/README.md
index ef72d3ab9d..0dd35f679f 100644
--- a/deploy/helm/magda/README.md
+++ b/deploy/helm/magda/README.md
@@ -1,6 +1,6 @@
 # magda
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square)
+![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)
 
 A complete solution for managing, publishing and discovering government data, private and open. This chart includes the magda default deployment.
 
@@ -14,7 +14,7 @@ A complete solution for managing, publishing and discovering government data, pr
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-core | magda-core | 4.0.0 |
+| file://../magda-core | magda-core | 4.2.1 |
 | oci://ghcr.io/magda-io/charts | ckan-connector-functions(magda-ckan-connector) | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | magda-function-esri-url-processor | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | magda-function-history-report | 2.0.0 |
diff --git a/deploy/package.json b/deploy/package.json
index 60d0c8d15b..6494b2739a 100644
--- a/deploy/package.json
+++ b/deploy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/deploy",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "MAGDA deployment configuration.",
   "scripts": {
     "create-connector-configmap": "kubectl delete configmap connector-config --ignore-not-found && kubectl create configmap connector-config --from-file ./connector-config/",
@@ -24,7 +24,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "fs-extra": "^11.2.0",
     "klaw-sync": "^2.1.0",
     "tmp": "0.0.31",
diff --git a/docs/docs/index.md b/docs/docs/index.md
index 878e3d4c21..a61dfe5350 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -22,5 +22,6 @@
 - [How to recover with continuous archive backup](./how-to-recover-with-continuous-archive-backup.md)
 - [Ports used when running locally](./local-ports.md)
 - [Windows Setup Instructions](./windows-instructions.md)
+- [Regions Config](./region-files.md)
 
 More documentation, please check [here](https://github.com/magda-io/magda/tree/master/docs/docs)
diff --git a/docs/docs/migration/4.0.0.md b/docs/docs/migration/4.0.0.md
index 0d88caf50c..fd7c8806bc 100644
--- a/docs/docs/migration/4.0.0.md
+++ b/docs/docs/migration/4.0.0.md
@@ -24,11 +24,17 @@ To achieve that:
 - For production deployment, make sure the [opensearch](../../../deploy/helm/internal-charts/opensearch/README.md) chart is configured with sufficient resource and proper node numbers and roles.
 - Set [search-api](https://github.com/magda-io/magda/tree/main/deploy/helm/internal-charts/search-api) Helm Chart config fields:
   - `appConfig.elasticSearch.serverUrl` to `http://elasticsearch:9200`
-    - This ensure all search requests will still go to existing elasticsearch engine after helm deployment
+    - This ensure all search requests will still go to the existing elasticsearch engine after helm deployment
+  - `image.tag` to `3.0.4`
+    - Here, we assume your current MAGDA deployment version is the last v3 version: `v3.0.4`
+- Set [elasticsearch](https://github.com/magda-io/magda/tree/main/deploy/helm/internal-charts/elasticsearch) Helm Chart config fields:
+  - `image.tag` to `3.0.4`
+    - Here, we assume your current MAGDA deployment version is the last v3 version: `v3.0.4`
 - Update the `magda` or `magda-core` chart version number in your deployment and use helm to upgrade your deployment
 - Monitor the progress of index building. You can access `https://<host>/api/v0/reindex/in-progress` API to check the progress. By default, admin role is required.
 - Once the index building is completed, you can
-  - remove the `appConfig.elasticSearch.serverUrl` config value
+  - remove the `appConfig.elasticSearch.serverUrl` config value of `search-api` chart
+  - remove the `image.tag` config value of `search-api` & `elasticsearch` charts
   - remove `tags.elasticsearch` config value
   - Use helm to upgrade your deployment one more time.
     - This will ensure
diff --git a/docs/docs/migration/4.1.0.md b/docs/docs/migration/4.1.0.md
new file mode 100644
index 0000000000..efc499c7b3
--- /dev/null
+++ b/docs/docs/migration/4.1.0.md
@@ -0,0 +1,217 @@
+## v4.1.0
+
+## Search Engine Region Index Upgrade
+
+We upgrade region index mapping version to `27` and upgrade region data to use ASGS 2021 and latest LGAs (2023) boundaries. During the upgrade, indexer will auto-recreate the region index. Depends on your database size, this might take some time (5-30 mins depends on resources allocated).
+
+> To build your own region files & MVT tile service, please refer to this repo: https://github.com/magda-io/magda-regions
+
+To avoid serving incomplete region data during the re-indexing process, you can manually set the region index version that search API uses to the existing versions via [helm chart options](https://github.com/magda-io/magda/blob/944ae887842b98c51698d567435003be2e9dbefd/deploy/helm/internal-charts/search-api/values.yaml#L29).
+
+Moreover, we also need to set the region mapping served from search API [Get Region Types
+](https://dev.magda.io/api/v0/apidocs/index.html#api-Search-GetV0SearchRegionTypes) endpoint to ensure it matches the old region index version we set.
+
+e.g. you can set the following in your helm deployment values file / config to make search api still queries the previous region index version (`26`) while indexer's creating the new indexes:
+
+```
+search-api:
+  # set region index version used to previous version: 26
+  regionsIndexVersion: 26
+  appConfig:
+    # Set to previous region mapping for regions in index version 26 or older
+    # You can find region mapping from the repo here: https://github.com/magda-io/magda/blob/main/magda-search-api/src/main/resources/regionMapping.json
+    regionMapping:
+      regionWmsMap:
+        STE:
+          layerName: FID_STE_2011_AUST
+          server: https://tiles.magda.io/FID_STE_2011_AUST/{z}/{x}/{y}.pbf
+          regionProp: STE_CODE11
+          aliases:
+          - ste_code
+          - ste_code_2011
+          - ste
+          digits: 1
+          description: States and Territories (STE)
+          regionIdsFile: data/regionids/region_map-FID_STE_2011_AUST_STE_CODE11.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81694140799998
+          - -43.74050960300003
+          - 159.10921900799997
+          - -9.142175976999999
+          nameProp: STE_NAME11
+        SA4:
+          layerName: FID_SA4_2011_AUST
+          server: https://tiles.magda.io/FID_SA4_2011_AUST/{z}/{x}/{y}.pbf
+          regionProp: SA4_CODE11
+          aliases:
+          - sa4_code_2011
+          - sa4_code
+          - sa4
+          digits: 3
+          description: Statistical Area Level 4 (SA4)
+          regionIdsFile: data/regionids/region_map-FID_SA4_2011_AUST_SA4_CODE11.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81694140799998
+          - -43.74050960300003
+          - 159.10921900799997
+          - -9.142175976999999
+          nameProp: SA4_NAME11
+        SA3:
+          layerName: FID_SA3_2011_AUST
+          server: https://tiles.magda.io/FID_SA3_2011_AUST/{z}/{x}/{y}.pbf
+          regionProp: SA3_CODE11
+          aliases:
+          - sa3_code_2011
+          - sa3_code
+          - sa3
+          digits: 5
+          description: Statistical Area Level 3 (SA3)
+          regionIdsFile: data/regionids/region_map-FID_SA3_2011_AUST_SA3_CODE11.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81694140799998
+          - -43.74050960300003
+          - 159.10921900799997
+          - -9.142175976999999
+          nameProp: SA3_NAME11
+        SA2:
+          layerName: FID_SA2_2011_AUST
+          server: https://tiles.magda.io/FID_SA2_2011_AUST/{z}/{x}/{y}.pbf
+          regionProp: SA2_MAIN11
+          aliases:
+          - sa2_code_2011
+          - sa2_code
+          - sa2
+          digits: 9
+          description: Statistical Area Level 2 (SA2)
+          regionIdsFile: data/regionids/region_map-FID_SA2_2011_AUST_SA2_MAIN11.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81694140799998
+          - -43.74050960300003
+          - 159.10921900799997
+          - -9.142175976999999
+          nameProp: SA2_NAME11
+        SA1:
+          layerName: FID_SA1_2011_AUST
+          server: https://tiles.magda.io/FID_SA1_2011_AUST/{z}/{x}/{y}.pbf
+          regionProp: SA1_MAIN11
+          aliases:
+          - sa1_code_2011
+          - sa1_maincode_2011
+          - sa1_code
+          - sa1
+          digits: 11
+          description: Statistical Area Level 1 (SA1)
+          regionIdsFile: data/regionids/region_map-FID_SA1_2011_AUST_SA1_MAIN11.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81694140799998
+          - -43.74050960300003
+          - 159.10921900799997
+          - -9.142175976999999
+          nameProp: SA2_NAME11
+        LGA:
+          layerName: FID_LGA_2015_AUST
+          server: https://tiles.magda.io/FID_LGA_2015_AUST/{z}/{x}/{y}.pbf
+          regionProp: LGA_CODE15
+          aliases:
+          - lga_code_2015
+          - lga_code
+          - lga
+          - lga_code_2014
+          - lga_code_2012
+          - lga_code_2010
+          digits: 5
+          description: Local Government Area (LGA)
+          regionIdsFile: data/regionids/region_map-FID_LGA_2015_AUST_LGA_CODE15.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81694140799998
+          - -43.740509602999985
+          - 159.10921900799997
+          - -9.142175976999999
+          nameProp: LGA_NAME15
+        POA:
+          layerName: FID_POA_2011_AUST
+          server: https://tiles.magda.io/FID_POA_2011_AUST/{z}/{x}/{y}.pbf
+          regionProp: POA_CODE
+          aliases:
+          - poa_2011
+          - postcode_2011
+          - poa
+          - poa_code
+          - poa_code_2011
+          - postcode
+          - postcode_2015
+          digits: 4
+          dataReplacements:
+          - - "^(?=\\d\\d\\d$)"
+            - '0'
+          description: Postal Area (POA)
+          regionIdsFile: data/regionids/region_map-FID_POA_2011_AUST_POA_CODE.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81694140799998
+          - -43.59821500299999
+          - 159.10921900799997
+          - -9.142175976999999
+          nameProp: POA_NAME
+        COM_ELB_ID_2016:
+          layerName: FID_COM20160509_ELB
+          server: https://tiles.magda.io/FID_COM20160509_ELB/{z}/{x}/{y}.pbf
+          regionProp: DIV_ID
+          aliases:
+          - divisionid
+          - com_elb_id_2016
+          - com_elb_id
+          - com_elb
+          digits: 3
+          description: Commonwealth Electoral District
+          regionIdsFile: data/regionids/region_map-FID_COM20160509_ELB_DIV_ID.json
+          serverType: MVT
+          serverSubdomains: []
+          serverMinZoom: 0
+          serverMaxNativeZoom: 12
+          serverMaxZoom: 28
+          bbox:
+          - 96.81676599999997
+          - -43.740509999999986
+          - 159.1092189999999
+          - -9.142175999999996
+          nameProp: SORTNAME
+```
+
+Once indexer fully completes the new region index creation / indexing, you can remove the above config from deployment config and deploy again to make search API uses the latest version index.
+
+You can check the indexing progress via Indexer module logs.
diff --git a/docs/docs/region-files.md b/docs/docs/region-files.md
new file mode 100644
index 0000000000..d26b32a081
--- /dev/null
+++ b/docs/docs/region-files.md
@@ -0,0 +1,9 @@
+### Region Mapping Files
+
+Magda allow users to supply a list of region mapping files that contains a list of regions available as region search filter options. The region mapping files will be fetched via HTTP protocol by Magda's [indexer](https://github.com/magda-io/magda/tree/main/deploy/helm/internal-charts/indexer) module when it's required to create region index in search engine (e.g. for the first deployment).
+
+The default config will pull region mapping files from [the `magda-region-mappings` repo release download area](https://github.com/magda-io/magda-regions/releases).
+
+For production deployment, you might want to host those region mapping files yourself in a more reliable way (e.g. put into a storage bucket).
+
+To config indexer to use different region mapping files or if you want to host region mapping files in your own facility, please check this repo for more details: https://github.com/magda-io/magda-regions
diff --git a/lerna.json b/lerna.json
index d5a13825f4..fb518c33df 100644
--- a/lerna.json
+++ b/lerna.json
@@ -8,7 +8,7 @@
     "scripts/",
     "packages/*"
   ],
-  "version": "4.0.0",
+  "version": "4.2.1",
   "hoist": [
     "urijs",
     "@types/urijs",
diff --git a/magda-admin-api/package.json b/magda-admin-api/package.json
index 526a215bd1..6a142339f7 100644
--- a/magda-admin-api/package.json
+++ b/magda-admin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/admin-api",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": "./dist/index.js",
   "engines": {
@@ -21,7 +21,7 @@
   "dependencies": {
     "@kubernetes/client-node": "^0.16.3",
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "c8": "^9.0.0",
     "cross-fetch": "^4.0.0",
     "express": "^4.17.2",
@@ -31,7 +31,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/config": "0.0.32",
     "@types/express": "^4.17.21",
diff --git a/magda-apidocs-server/package.json b/magda-apidocs-server/package.json
index 103ccc81c3..f8ee3baafa 100644
--- a/magda-apidocs-server/package.json
+++ b/magda-apidocs-server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/apidocs-server",
   "description": "The MAGDA in-browser api documentation.",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "scripts": {
@@ -11,7 +11,7 @@
     "retag-and-push": "retag-and-push"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "config": {
     "docker": {
diff --git a/magda-authorization-api/package.json b/magda-authorization-api/package.json
index db9071aedb..08a4eb2da5 100644
--- a/magda-authorization-api/package.json
+++ b/magda-authorization-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/authorization-api",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
     "@magda/tsmonad": "^0.9.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "bcrypt": "^5.1.1",
     "express": "^4.17.2",
     "http-terminator": "^3.2.0",
@@ -42,7 +42,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/bcrypt": "^5.0.2",
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.0",
diff --git a/magda-builder-docker/package.json b/magda-builder-docker/package.json
index 8070d3fc93..c30ed2129b 100644
--- a/magda-builder-docker/package.json
+++ b/magda-builder-docker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/builder-docker",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Builder image for nodejs magda projects",
   "scripts": {
     "docker-build-prod": "create-docker-context-for-node-component --build --push",
@@ -16,8 +16,8 @@
     }
   },
   "devDependencies": {
-    "@magda/builder-nodejs": "^4.0.0",
-    "@magda/scripts": "^4.0.0"
+    "@magda/builder-nodejs": "^4.2.1",
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-builder-nodejs/package.json b/magda-builder-nodejs/package.json
index 5859413107..3181f6fb22 100644
--- a/magda-builder-nodejs/package.json
+++ b/magda-builder-nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/builder-nodejs",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Builder image for nodejs magda projects",
   "scripts": {
     "docker-build-prod": "create-docker-context-for-node-component --build --push",
@@ -16,7 +16,7 @@
     }
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-builder-scala/package.json b/magda-builder-scala/package.json
index cd13682e19..0a6c8cf2ba 100644
--- a/magda-builder-scala/package.json
+++ b/magda-builder-scala/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/builder-scala",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Builder image for scala magda projects",
   "scripts": {
     "docker-build-prod": "create-docker-context-for-node-component --build --push",
@@ -16,8 +16,8 @@
     }
   },
   "devDependencies": {
-    "@magda/builder-docker": "^4.0.0",
-    "@magda/scripts": "^4.0.0"
+    "@magda/builder-docker": "^4.2.1",
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-content-api/package.json b/magda-content-api/package.json
index faed71770c..c583cfa256 100644
--- a/magda-content-api/package.json
+++ b/magda-content-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/content-api",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": "./dist/index.js",
@@ -20,10 +20,10 @@
     "retag-and-push": "retag-and-push"
   },
   "dependencies": {
-    "@magda/content-schemas": "^4.0.0",
+    "@magda/content-schemas": "^4.2.1",
     "@magda/esm-utils": "^1.0.1",
     "@magda/tsmonad": "^0.9.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "djv": "^2.1.4",
     "express": "^4.17.2",
     "http-terminator": "^3.2.0",
@@ -36,7 +36,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/express": "^4.17.21",
     "@types/lodash": "^4.14.96",
diff --git a/magda-content-schemas/package.json b/magda-content-schemas/package.json
index a2759db579..3bd349a951 100644
--- a/magda-content-schemas/package.json
+++ b/magda-content-schemas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/content-schemas",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": {
diff --git a/magda-correspondence-api/package.json b/magda-correspondence-api/package.json
index 54c581a750..9dbaa2f2f2 100755
--- a/magda-correspondence-api/package.json
+++ b/magda-correspondence-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/correspondence-api",
   "description": "MAGDA correspondence API",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": "./dist/index.js",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "email-validator": "^2.0.3",
     "express": "^4.17.2",
     "fs-extra": "^11.2.0",
@@ -41,7 +41,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/email-validator": "^1.0.6",
     "@types/express": "^4.17.21",
diff --git a/magda-db-migrator/package.json b/magda-db-migrator/package.json
index df8fdad1d2..5ed513d35f 100644
--- a/magda-db-migrator/package.json
+++ b/magda-db-migrator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/db-migrator",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "A base Docker image for PostgreSQL with Flyway for schema migrations.",
   "scripts": {
     "docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto",
@@ -17,7 +17,7 @@
     }
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-elastic-search/Dockerfile b/magda-elastic-search/Dockerfile
index e3c471ec5b..f1d8c22504 100644
--- a/magda-elastic-search/Dockerfile
+++ b/magda-elastic-search/Dockerfile
@@ -1,4 +1,6 @@
 FROM --platform=linux/amd64 docker.elastic.co/elasticsearch/elasticsearch:6.8.22 as stage-amd64
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
 RUN yum -y install sudo zip
 # Delete all x-pack modules
 RUN find modules -type d -name "x-pack-*" -exec rm -r {} +
diff --git a/magda-elastic-search/package.json b/magda-elastic-search/package.json
index 26321b7941..c748b131a9 100644
--- a/magda-elastic-search/package.json
+++ b/magda-elastic-search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/elastic-search",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "MAGDA's custom elasticsearch docker image.",
   "scripts": {
     "dev": "docker-compose up",
@@ -19,49 +19,49 @@
     },
     "regionSources": {
       "COUNTRY": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/country.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/country.geojson",
         "idField": "id",
         "nameField": "name",
         "order": 9
       },
       "OFFSHORE_TERRITORIES": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/off-shore-territories.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/off-shore-territories.geojson",
         "idField": "id",
         "nameField": "name",
         "order": 11
       },
       "SA4": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA4.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA4.geojson",
         "idField": "SA4_CODE11",
         "nameField": "SA4_NAME11",
         "order": 30
       },
       "SA3": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA3.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA3.geojson",
         "idField": "SA3_CODE11",
         "nameField": "SA3_NAME11",
         "order": 40
       },
       "SA2": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA2.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA2.geojson",
         "idField": "SA2_MAIN11",
         "nameField": "SA2_NAME11",
         "order": 50
       },
       "LGA": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/LGA.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/LGA.geojson",
         "idField": "LGA_CODE15",
         "nameField": "LGA_NAME15",
         "order": 20
       },
       "COM_ELB_ID_2016": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/COM_ELB_ID_2016.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/COM_ELB_ID_2016.geojson",
         "idField": "DIV_ID",
         "nameField": "SORTNAME",
         "order": 80
       },
       "STE": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/STE.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/STE.geojson",
         "idField": "STE_CODE11",
         "nameField": "STE_NAME11",
         "shortNameField": "STE_ABBREV",
@@ -70,7 +70,7 @@
     }
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-elastic-search/regionSynonyms.txt b/magda-elastic-search/regionSynonyms.txt
index 120a004b04..0161e3de94 100644
--- a/magda-elastic-search/regionSynonyms.txt
+++ b/magda-elastic-search/regionSynonyms.txt
@@ -1,14 +1,14 @@
 
 
 # Region Type: COUNTRY
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/country.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/country.geojson
 
 australia (mainland), australia => country/1
 australian offshore remote territories => country/2
 
 
 # Region Type: OFFSHORE_TERRITORIES
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/off-shore-territories.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/off-shore-territories.geojson
 
 norfolk island => offshore_territories/21
 christmas island => offshore_territories/22
@@ -21,7 +21,7 @@ heard island and mcdonald islands => offshore_territories/28
 
 
 # Region Type: SA4
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/SA4.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA4.geojson
 
 capital region => sa4/101
 central coast => sa4/102
@@ -132,7 +132,7 @@ special purpose codes sa4 (ot), special purpose codes sa4 => sa4/999
 
 
 # Region Type: SA3
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/SA3.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA3.geojson
 
 goulburn - yass => sa3/10101
 queanbeyan => sa3/10102
@@ -488,7 +488,7 @@ special purpose codes sa3 (ot), special purpose codes sa3 => sa3/99999
 
 
 # Region Type: SA2
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/SA2.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA2.geojson
 
 goulburn => sa2/101011001
 goulburn region => sa2/101011002
@@ -2707,7 +2707,7 @@ no usual address (ot), no usual address => sa2/999999499
 
 
 # Region Type: LGA
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/LGA.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/LGA.geojson
 
 albury (c), albury => lga/10050
 armidale dumaresq (a), armidale dumaresq => lga/10110
@@ -3293,7 +3293,7 @@ no usual address (ot), no usual address => lga/99499
 
 
 # Region Type: COM_ELB_ID_2016
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/COM_ELB_ID_2016.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/COM_ELB_ID_2016.geojson
 
 lingiari => com_elb_id_2016/306
 solomon => com_elb_id_2016/307
@@ -3448,7 +3448,7 @@ tangney => com_elb_id_2016/248
 
 
 # Region Type: STE
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/STE.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/STE.geojson
 
 new south wales, nsw => ste/1
 victoria, vic => ste/2
diff --git a/magda-gateway/package.json b/magda-gateway/package.json
index 6a751b572f..632f94464a 100644
--- a/magda-gateway/package.json
+++ b/magda-gateway/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/gateway",
   "description": "The public gateway to all of MAGDA, including the API and web front end.",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/tenant-api": "^4.0.0",
+    "@magda/tenant-api": "^4.2.1",
     "@magda/tsmonad": "^0.9.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "compression": "^1.7.2",
     "connect-pg-simple": "^6.2.1",
     "cookie-parser": "^1.4.5",
@@ -55,7 +55,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/compression": "^0.0.36",
     "@types/cookie": "^0.3.3",
diff --git a/magda-gateway/src/buildApp.ts b/magda-gateway/src/buildApp.ts
index 094988df06..dbbb49be39 100644
--- a/magda-gateway/src/buildApp.ts
+++ b/magda-gateway/src/buildApp.ts
@@ -81,6 +81,7 @@ export type Config = {
     skipAuth?: boolean;
     registryQueryCacheMaxKeys: number;
     registryQueryCacheStdTTL: number;
+    disableGzip?: boolean;
 };
 
 export default function buildApp(app: express.Application, config: Config) {
@@ -148,7 +149,10 @@ export default function buildApp(app: express.Application, config: Config) {
     app.use(createHttpsRedirectionMiddleware(config.enableHttpsRedirection));
 
     // GZIP responses where appropriate
-    app.use(compression());
+    if (!config?.disableGzip) {
+        app.use(compression());
+        console.log("Automatic GZIP compression enabled.");
+    }
 
     // Set sensible secure headers
     app.disable("x-powered-by");
diff --git a/magda-gateway/src/index.ts b/magda-gateway/src/index.ts
index 2a90eabe38..5ab2bb1224 100755
--- a/magda-gateway/src/index.ts
+++ b/magda-gateway/src/index.ts
@@ -175,6 +175,12 @@ const argv = addJwtSecretFromEnvVar(
             type: "boolean",
             default: false
         })
+        .option("disableGzip", {
+            describe:
+                "By default, response will be auto-gizpped depends on MIME type. Set this to true to disable it.",
+            type: "boolean",
+            default: false
+        })
         .option("userId", {
             describe:
                 "The user id to use when making authenticated requests to the registry",
diff --git a/magda-indexer/package.json b/magda-indexer/package.json
index 425999e9d7..c108e55a42 100644
--- a/magda-indexer/package.json
+++ b/magda-indexer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/indexer",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Indexes the registry for searching.",
   "scripts": {
     "build": "yarn run compile",
diff --git a/magda-int-test-ts/indexer-setup.conf b/magda-int-test-ts/indexer-setup.conf
index 685a62dc79..8914b9b58c 100644
--- a/magda-int-test-ts/indexer-setup.conf
+++ b/magda-int-test-ts/indexer-setup.conf
@@ -7,7 +7,7 @@ registry.registerForWebhooks = false
 # only enable / use one region file for speeding up the initialisation
 regionSources = {
     COUNTRY {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/country.geojson"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/country.ndjson"
         idField = "id"
         nameField = "name"
         order = 9
diff --git a/magda-int-test-ts/package.json b/magda-int-test-ts/package.json
index 3037ad346f..9a95536bb2 100644
--- a/magda-int-test-ts/package.json
+++ b/magda-int-test-ts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/int-test-ts",
   "description": "Integration test cases in typescript",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": "./dist/index.js",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "commander": "^11.1.0",
     "dockerode": "^3.3.1",
     "dockerode-compose": "^1.4.0",
diff --git a/magda-int-test/package.json b/magda-int-test/package.json
index c9e6990f47..afc0d75302 100644
--- a/magda-int-test/package.json
+++ b/magda-int-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/int-test",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Integration tests",
   "scripts": {
     "build": "yarn run compile",
diff --git a/magda-migrator-authorization-db/package.json b/magda-migrator-authorization-db/package.json
index c11c154da5..6e26da4a91 100644
--- a/magda-migrator-authorization-db/package.json
+++ b/magda-migrator-authorization-db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/migrator-authorization-db",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "The MAGDA database for storing users and other authorization data.",
   "license": "Apache-2.0",
   "scripts": {
@@ -16,8 +16,8 @@
     }
   },
   "devDependencies": {
-    "@magda/db-migrator": "^4.0.0",
-    "@magda/scripts": "^4.0.0"
+    "@magda/db-migrator": "^4.2.1",
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-migrator-content-db/package.json b/magda-migrator-content-db/package.json
index b49fe58b21..18f34ef6e6 100644
--- a/magda-migrator-content-db/package.json
+++ b/magda-migrator-content-db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/migrator-content-db",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "The MAGDA database for storing content data.",
   "license": "Apache-2.0",
   "scripts": {
@@ -16,8 +16,8 @@
     }
   },
   "devDependencies": {
-    "@magda/db-migrator": "^4.0.0",
-    "@magda/scripts": "^4.0.0"
+    "@magda/db-migrator": "^4.2.1",
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-migrator-registry-aspects/package.json b/magda-migrator-registry-aspects/package.json
index 47b9c4a307..237e4e42b7 100644
--- a/magda-migrator-registry-aspects/package.json
+++ b/magda-migrator-registry-aspects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/migrator-registry-aspects",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Setting up built-in registry aspect definitions.",
   "license": "Apache-2.0",
   "type": "module",
@@ -29,8 +29,8 @@
     "userId": "00000000-0000-4000-8000-000000000000"
   },
   "dependencies": {
-    "@magda/registry-aspects": "^4.0.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/registry-aspects": "^4.2.1",
+    "@magda/typescript-common": "^4.2.1",
     "fs-extra": "^11.2.0",
     "yargs": "^12.0.5"
   },
diff --git a/magda-migrator-registry-db/package.json b/magda-migrator-registry-db/package.json
index 7eab5ba0e4..674f8f7662 100644
--- a/magda-migrator-registry-db/package.json
+++ b/magda-migrator-registry-db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/migrator-registry-db",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "The registry's PostgreSQL database.",
   "scripts": {
     "dev": "echo \"No dev mode available, use helm instead.\"",
@@ -17,8 +17,8 @@
     }
   },
   "devDependencies": {
-    "@magda/db-migrator": "^4.0.0",
-    "@magda/scripts": "^4.0.0"
+    "@magda/db-migrator": "^4.2.1",
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-migrator-session-db/package.json b/magda-migrator-session-db/package.json
index edd570d4d3..8a1b48088d 100644
--- a/magda-migrator-session-db/package.json
+++ b/magda-migrator-session-db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/migrator-session-db",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "The database storing session information.",
   "scripts": {
     "dev": "echo \"No dev mode available, use helm instead.\"",
@@ -16,8 +16,8 @@
     }
   },
   "devDependencies": {
-    "@magda/db-migrator": "^4.0.0",
-    "@magda/scripts": "^4.0.0"
+    "@magda/db-migrator": "^4.2.1",
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-migrator-tenant-db/package.json b/magda-migrator-tenant-db/package.json
index ce2e38e38b..9cf52d5282 100644
--- a/magda-migrator-tenant-db/package.json
+++ b/magda-migrator-tenant-db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/migrator-tenant-db",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "The MAGDA database for storing tenant data.",
   "license": "Apache-2.0",
   "scripts": {
@@ -16,8 +16,8 @@
     }
   },
   "devDependencies": {
-    "@magda/db-migrator": "^4.0.0",
-    "@magda/scripts": "^4.0.0"
+    "@magda/db-migrator": "^4.2.1",
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-minion-framework/package.json b/magda-minion-framework/package.json
index 0f08fba0cf..7797b2be6d 100644
--- a/magda-minion-framework/package.json
+++ b/magda-minion-framework/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/minion-framework",
   "description": "MAGDA Minion Framework",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -22,7 +22,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/express": "^4.17.21",
     "@types/lodash": "^4.14.68",
@@ -45,8 +45,8 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/registry-aspects": "^4.0.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/registry-aspects": "^4.2.1",
+    "@magda/typescript-common": "^4.2.1",
     "cross-fetch": "^4.0.0",
     "express": "^4.17.2",
     "lodash": "^4.17.4",
diff --git a/magda-opa/package.json b/magda-opa/package.json
index 097fb89513..2879fe13a8 100644
--- a/magda-opa/package.json
+++ b/magda-opa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/opa",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "MAGDA's Open Policy Agent docker image with built-in policies.",
   "scripts": {
     "dev": "docker-compose up",
@@ -19,6 +19,6 @@
     }
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   }
 }
diff --git a/magda-opensearch-dashboards/Dockerfile b/magda-opensearch-dashboards/Dockerfile
index 1cca2b5a76..e792d777a3 100644
--- a/magda-opensearch-dashboards/Dockerfile
+++ b/magda-opensearch-dashboards/Dockerfile
@@ -1,3 +1,3 @@
-FROM opensearchproject/opensearch-dashboards:2.14.0
+FROM opensearchproject/opensearch-dashboards:2.15.0
 RUN /usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin remove securityDashboards
 COPY --chown=opensearch-dashboards:opensearch-dashboards component/opensearch_dashboards.yml /usr/share/opensearch-dashboards/config/
\ No newline at end of file
diff --git a/magda-opensearch-dashboards/docker-compose.yml b/magda-opensearch-dashboards/docker-compose.yml
index 10dfe648c3..6964334890 100644
--- a/magda-opensearch-dashboards/docker-compose.yml
+++ b/magda-opensearch-dashboards/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   test-opensearch-dashboards:
-    image: opensearchproject/opensearch-dashboards:2.14.0
+    image: opensearchproject/opensearch-dashboards:2.15.0
     ports:
       - 5601:5601 # Map host port 5601 to container port 5601
     expose:
diff --git a/magda-opensearch-dashboards/package.json b/magda-opensearch-dashboards/package.json
index 6ded1420e8..48604d5320 100644
--- a/magda-opensearch-dashboards/package.json
+++ b/magda-opensearch-dashboards/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/opensearch-dashboards",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "MAGDA's custom OpenSearch dashboards docker image.",
   "scripts": {
     "dev": "docker-compose up",
@@ -18,7 +18,7 @@
     }
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-opensearch/Dockerfile b/magda-opensearch/Dockerfile
index 8bec9f1320..8a63bdd29f 100644
--- a/magda-opensearch/Dockerfile
+++ b/magda-opensearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM opensearchproject/opensearch:2.14.0
+FROM opensearchproject/opensearch:2.15.0
 RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch-security --purge
 COPY --chown=opensearch:opensearch component/wn_s.pl /usr/share/opensearch/config/analysis/
 COPY --chown=opensearch:opensearch component/regionSynonyms.txt /usr/share/opensearch/config/analysis/
diff --git a/magda-opensearch/docker-compose.yml b/magda-opensearch/docker-compose.yml
index 4a9fa04b44..cd751a4bff 100644
--- a/magda-opensearch/docker-compose.yml
+++ b/magda-opensearch/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   test-opensearch:
-    image: opensearchproject/opensearch:2.14.0
+    image: opensearchproject/opensearch:2.15.0
     ports:
       - 9200:9200
       - 9300:9300
diff --git a/magda-opensearch/package.json b/magda-opensearch/package.json
index dd526864b1..be7697c8f4 100644
--- a/magda-opensearch/package.json
+++ b/magda-opensearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/opensearch",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "MAGDA's custom OpenSearch docker image.",
   "scripts": {
     "dev": "docker-compose up",
@@ -19,49 +19,49 @@
     },
     "regionSources": {
       "COUNTRY": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/country.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/country.geojson",
         "idField": "id",
         "nameField": "name",
         "order": 9
       },
       "OFFSHORE_TERRITORIES": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/off-shore-territories.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/off-shore-territories.geojson",
         "idField": "id",
         "nameField": "name",
         "order": 11
       },
       "SA4": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA4.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA4.geojson",
         "idField": "SA4_CODE11",
         "nameField": "SA4_NAME11",
         "order": 30
       },
       "SA3": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA3.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA3.geojson",
         "idField": "SA3_CODE11",
         "nameField": "SA3_NAME11",
         "order": 40
       },
       "SA2": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA2.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA2.geojson",
         "idField": "SA2_MAIN11",
         "nameField": "SA2_NAME11",
         "order": 50
       },
       "LGA": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/LGA.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/LGA.geojson",
         "idField": "LGA_CODE15",
         "nameField": "LGA_NAME15",
         "order": 20
       },
       "COM_ELB_ID_2016": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/COM_ELB_ID_2016.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/COM_ELB_ID_2016.geojson",
         "idField": "DIV_ID",
         "nameField": "SORTNAME",
         "order": 80
       },
       "STE": {
-        "url": "https://s3-ap-southeast-2.amazonaws.com/magda-files/STE.geojson",
+        "url": "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/STE.geojson",
         "idField": "STE_CODE11",
         "nameField": "STE_NAME11",
         "shortNameField": "STE_ABBREV",
@@ -70,7 +70,7 @@
     }
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-opensearch/regionSynonyms.txt b/magda-opensearch/regionSynonyms.txt
index 120a004b04..0161e3de94 100644
--- a/magda-opensearch/regionSynonyms.txt
+++ b/magda-opensearch/regionSynonyms.txt
@@ -1,14 +1,14 @@
 
 
 # Region Type: COUNTRY
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/country.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/country.geojson
 
 australia (mainland), australia => country/1
 australian offshore remote territories => country/2
 
 
 # Region Type: OFFSHORE_TERRITORIES
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/off-shore-territories.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/off-shore-territories.geojson
 
 norfolk island => offshore_territories/21
 christmas island => offshore_territories/22
@@ -21,7 +21,7 @@ heard island and mcdonald islands => offshore_territories/28
 
 
 # Region Type: SA4
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/SA4.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA4.geojson
 
 capital region => sa4/101
 central coast => sa4/102
@@ -132,7 +132,7 @@ special purpose codes sa4 (ot), special purpose codes sa4 => sa4/999
 
 
 # Region Type: SA3
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/SA3.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA3.geojson
 
 goulburn - yass => sa3/10101
 queanbeyan => sa3/10102
@@ -488,7 +488,7 @@ special purpose codes sa3 (ot), special purpose codes sa3 => sa3/99999
 
 
 # Region Type: SA2
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/SA2.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA2.geojson
 
 goulburn => sa2/101011001
 goulburn region => sa2/101011002
@@ -2707,7 +2707,7 @@ no usual address (ot), no usual address => sa2/999999499
 
 
 # Region Type: LGA
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/LGA.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/LGA.geojson
 
 albury (c), albury => lga/10050
 armidale dumaresq (a), armidale dumaresq => lga/10110
@@ -3293,7 +3293,7 @@ no usual address (ot), no usual address => lga/99499
 
 
 # Region Type: COM_ELB_ID_2016
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/COM_ELB_ID_2016.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/COM_ELB_ID_2016.geojson
 
 lingiari => com_elb_id_2016/306
 solomon => com_elb_id_2016/307
@@ -3448,7 +3448,7 @@ tangney => com_elb_id_2016/248
 
 
 # Region Type: STE
-# From: https://s3-ap-southeast-2.amazonaws.com/magda-files/STE.geojson
+# From: https://github.com/magda-io/magda-regions/releases/download/v1.0.0/STE.geojson
 
 new south wales, nsw => ste/1
 victoria, vic => ste/2
diff --git a/magda-postgres/package.json b/magda-postgres/package.json
index 19600da171..68ab3a20a2 100644
--- a/magda-postgres/package.json
+++ b/magda-postgres/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/postgres",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "A base Docker image for PostgreSQL with Flyway for schema migrations.",
   "scripts": {
     "dev": "docker-compose up",
@@ -19,7 +19,7 @@
     }
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "magda": {
     "categories": {
diff --git a/magda-registry-api/package.json b/magda-registry-api/package.json
index aa17af0673..166460bc53 100644
--- a/magda-registry-api/package.json
+++ b/magda-registry-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/registry-api",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "The registry API.",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/magda-registry-aspects/package.json b/magda-registry-aspects/package.json
index 41e9577683..714a5c0de7 100644
--- a/magda-registry-aspects/package.json
+++ b/magda-registry-aspects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/registry-aspects",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Common aspects for use with the registry.",
   "type": "module",
   "exports": {
diff --git a/magda-scala-common/package.json b/magda-scala-common/package.json
index b022ebaf6c..727771e339 100644
--- a/magda-scala-common/package.json
+++ b/magda-scala-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/scala-common",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Common Scala code shared between components.",
   "scripts": {
     "test": "cd .. && sbt common/test",
diff --git a/magda-scala-common/src/main/resources/common.conf b/magda-scala-common/src/main/resources/common.conf
index 387bc7c914..02f86ba9d4 100755
--- a/magda-scala-common/src/main/resources/common.conf
+++ b/magda-scala-common/src/main/resources/common.conf
@@ -47,7 +47,7 @@ elasticSearch {
 
     indices {
         regions {
-            version = 26
+            version = 27
         }
 
         datasets {
@@ -88,84 +88,94 @@ logging {
     level = "INFO"
 }
 
-
+# default region mapping files.
+# See repo here: https://github.com/magda-io/magda-regions
 regionSources = {
+    # Australia (Mainland) and all offshore territories as a whole
     COUNTRY {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/country.geojson"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/country.ndjson"
         idField = "id"
         nameField = "name"
         order = 9
     }
+    # Regions for each of Australia offshore territories
     OFFSHORE_TERRITORIES {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/custom/off-shore-territories.geojson"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/off-shore-territories.ndjson"
         idField = "id"
         nameField = "name"
         lv1Id = "2"
         order = 11
     }
+    # ABS Statistical Area Level 4
     SA4 {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA4.geojson"
-        idField = "SA4_CODE11"
-        nameField = "SA4_NAME11"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA4_2021.ndjson"
+        idField = "SA4_CODE_2021"
+        nameField = "SA4_NAME_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
+        lv2IdField = "STATE_CODE_2021"
         order = 30
     }
+    # ABS Statistical Area Level 3
     SA3 {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA3.geojson"
-        idField = "SA3_CODE11"
-        nameField = "SA3_NAME11"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA3_2021.ndjson"
+        idField = "SA3_CODE_2021"
+        nameField = "SA3_NAME_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
-        lv3IdField = "SA4_CODE11"
+        lv2IdField = "STATE_CODE_2021"
+        lv3IdField = "SA4_CODE_2021"
         order = 40
     }
+    # ABS Statistical Area Level 2
     SA2 {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA2.geojson"
-        idField = "SA2_MAIN11"
-        nameField = "SA2_NAME11"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA2_2021.ndjson"
+        idField = "SA2_CODE_2021"
+        nameField = "SA2_NAME_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
-        lv3IdField = "SA4_CODE11"
-        lv4IdField = "SA3_CODE11"
+        lv2IdField = "STATE_CODE_2021"
+        lv3IdField = "SA4_CODE_2021"
+        lv4IdField = "SA3_CODE_2021"
         order = 50
     }
+    # ABS Statistical Area Level 1
     SA1 {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/SA1.geojson"
-        idField = "SA1_MAIN11"
-        nameField = "SA1_MAIN11",
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA1_2021.ndjson"
+        idField = "SA1_CODE_2021"
+        nameField = "SA1_CODE_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
-        lv3IdField = "SA4_CODE11"
-        lv4IdField = "SA3_CODE11"
-        lv5IdField = "SA2_MAIN11"
-        includeIdInName = false,
+        lv2IdField = "STATE_CODE_2021"
+        lv3IdField = "SA4_CODE_2021"
+        lv4IdField = "SA3_CODE_2021"
+        lv5IdField = "SA2_CODE_2021"
         order = 60
     }
+    # Australia Local Government Areas
     LGA {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/LGA.geojson"
-        idField = "LGA_CODE15"
-        nameField = "LGA_NAME15"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/LGA_2023.ndjson"
+        idField = "LGA_CODE_2023"
+        nameField = "LGA_NAME_2023"
         lv1Id = "1"
-        steIdField = "STE_CODE11"
+        lv2IdField = "STATE_CODE_2021"
         order = 20
     }
+    # Australia Postal Areas
     POA {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/POA.geojson"
-        idField = "POA_CODE"
-        nameField = "POA_NAME"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/POA_2021.ndjson"
+        idField = "POA_CODE_2021"
+        nameField = "POA_NAME_2021"
         lv1Id = "1"
         order = 70
     }
-    COM_ELB_ID_2016 {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/COM_ELB_ID_2016.geojson"
-        idField = "DIV_ID"
-        nameField = "SORTNAME"
+     # Australia Commonwealth electoral boundaries
+    ELB {
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/ELB_2021.ndjson"
+        idField = "Elect_div"
+        nameField = "Elect_div"
         lv1Id = "1"
         order = 80
     }
+    # Australia State and Territory
     STE {
-        url = "https://s3-ap-southeast-2.amazonaws.com/magda-files/STE.simplified.geojson"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/STE.simplified.ndjson"
         idField = "STE_CODE11"
         nameField = "STE_NAME11"
         shortNameField = "STE_ABBREV"
@@ -173,3 +183,10 @@ regionSources = {
         order = 10
     }
 }
+
+# default region mapping setting
+# Only by frontend region filter map view.
+# Served via search API [region-types](https://dev.magda.io/api/v0/apidocs/index.html#api-Search-GetV0SearchRegionTypes) endpoint
+# See repo here: https://github.com/magda-io/magda-regions
+# If not provided, the [default region mapping file](https://github.com/magda-io/magda/blob/main/magda-search-api/src/main/resources/regionMapping.json) will be used.
+# regionMapping = {}
diff --git a/magda-scala-common/src/main/scala/au/csiro/data61/magda/search/elasticsearch/IndexDefinition.scala b/magda-scala-common/src/main/scala/au/csiro/data61/magda/search/elasticsearch/IndexDefinition.scala
index fc1d9ee70d..d093680934 100644
--- a/magda-scala-common/src/main/scala/au/csiro/data61/magda/search/elasticsearch/IndexDefinition.scala
+++ b/magda-scala-common/src/main/scala/au/csiro/data61/magda/search/elasticsearch/IndexDefinition.scala
@@ -22,6 +22,7 @@ import org.locationtech.spatial4j.context.jts.JtsSpatialContext
 import spray.json._
 import au.csiro.data61.magda.util.RichConfig._
 
+import java.time.OffsetDateTime
 import scala.concurrent.Future
 
 case class IndexDefinition(
@@ -390,7 +391,7 @@ object IndexDefinition extends DefaultJsonProtocol {
   val regions: IndexDefinition =
     new IndexDefinition(
       name = "regions",
-      version = 26,
+      version = 27,
       indicesIndex = Indices.RegionsIndex,
       definition = (indices, config) => {
         val createIdxReq =
@@ -413,7 +414,8 @@ object IndexDefinition extends DefaultJsonProtocol {
                   .searchAnalyzer("regionSearchIdInput"),
                 magdaGeoShapeField("boundingBox"),
                 magdaGeoShapeField("geometry"),
-                intField("order")
+                intField("order"),
+                dateField("indexed")
               )
             )
             .analysis(
@@ -611,7 +613,14 @@ object IndexDefinition extends DefaultJsonProtocol {
       .map {
         case (regionSource, jsonRegion) =>
           val properties = jsonRegion.fields("properties").asJsObject
-          val id = properties.fields(regionSource.idProperty).convertTo[String]
+          val id = properties.fields(regionSource.idProperty) match {
+            case JsString(s) => s
+            case JsNumber(n) => n.toString()
+            case _ =>
+              throw new Exception(
+                "Invalid id property value type found for region file: " + regionSource.name
+              )
+          }
           val name = if (regionSource.includeIdInName) {
             JsString(
               properties
@@ -743,7 +752,8 @@ object IndexDefinition extends DefaultJsonProtocol {
                       5,
                       jsonRegion,
                       regionSource
-                    )
+                    ),
+                    "indexed" -> JsString(OffsetDateTime.now.toString)
                   ).toJson
                 )
           )
diff --git a/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionLoader.scala b/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionLoader.scala
index 9ea4112eab..6284fffd6a 100644
--- a/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionLoader.scala
+++ b/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionLoader.scala
@@ -4,14 +4,16 @@ import java.io.File
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.client.RequestBuilding
+import akka.http.scaladsl.model._
 import akka.stream.Materializer
 import akka.stream.scaladsl.FileIO
 import akka.stream.scaladsl.JsonFraming
-import akka.stream.scaladsl.Source
+import akka.stream.scaladsl.{Sink, Source}
 import spray.json.JsObject
 import spray.json._
 import scala.concurrent.Future
 import com.typesafe.config.Config
+import scala.util.{Failure, Success}
 
 trait RegionLoader {
   def setupRegions(): Source[(RegionSource, JsObject), _]
@@ -33,7 +35,48 @@ class FileRegionLoader(regionSources: List[RegionSource])(
   implicit val ec = system.dispatcher
   val pool = Http().superPool[Int]()
 
+  def sendRequestWithRedirects(
+      uri: Uri,
+      maxRedirects: Int = 5
+  ): Future[HttpResponse] = {
+    def requestLoop(
+        currentUri: Uri,
+        remainingRedirects: Int
+    ): Future[HttpResponse] = {
+      val request = RequestBuilding.Get(currentUri.toString)
+      Source
+        .single((request, 0))
+        .via(pool)
+        .runWith(Sink.head)
+        .flatMap {
+          case (Success(response), _) =>
+            response.status match {
+              case StatusCodes.MovedPermanently | StatusCodes.Found |
+                  StatusCodes.SeeOther | StatusCodes.TemporaryRedirect |
+                  StatusCodes.PermanentRedirect if remainingRedirects > 0 =>
+                response.header[headers.Location] match {
+                  case Some(locationHeader) =>
+                    val newUri = locationHeader.uri
+                    response.discardEntityBytes() // Clean up response entity
+                    requestLoop(newUri, remainingRedirects - 1)
+                  case None =>
+                    Future.failed(
+                      new RuntimeException(
+                        "Redirect response missing Location header"
+                      )
+                    )
+                }
+              case _ => Future.successful(response)
+            }
+          case (Failure(exception), _) =>
+            Future.failed(exception)
+        }
+    }
+    requestLoop(uri, maxRedirects)
+  }
+
   def loadABSRegions(regionSource: RegionSource): Future[File] = {
+
     val file = new File(
       s"${config.getString("regionLoading.cachePath")}/${regionSource.name}.json"
     )
@@ -56,18 +99,24 @@ class FileRegionLoader(regionSources: List[RegionSource])(
       file.getParentFile.mkdirs()
       file.createNewFile()
 
-      val request = RequestBuilding.Get(regionSource.url.toString)
-
       system.log.info("Indexing regions from {}", regionSource.url)
 
-      Source
-        .single((request, 0))
-        .via(pool)
-        .flatMapConcat {
-          case (response, _) =>
-            response.get.entity.withoutSizeLimit().dataBytes
+      sendRequestWithRedirects(regionSource.url.toString)
+        .flatMap { response =>
+          val fileSink = FileIO.toPath(file.toPath())
+          response.entity.withoutSizeLimit().dataBytes.runWith(fileSink)
+        }
+        .flatMap { ioResult =>
+          if (ioResult.wasSuccessful) {
+            Future.successful(file)
+          } else {
+            Future.failed(
+              new RuntimeException(
+                s"Failed to write file: ${ioResult.getError.getMessage}"
+              )
+            )
+          }
         }
-        .runWith(FileIO.toPath(file.toPath()))
         .recover {
           case e: Throwable =>
             system.log.info(
@@ -79,13 +128,12 @@ class FileRegionLoader(regionSources: List[RegionSource])(
             file.delete()
             throw e
         }
-        .map(_ => file)
     }
   }
 
   override def setupRegions(): Source[(RegionSource, JsObject), _] = {
     Source(regionSources)
-      .mapAsync(4)(
+      .mapAsyncUnordered(3)(
         regionSource => loadABSRegions(regionSource).map((_, regionSource))
       )
       .flatMapConcat {
@@ -98,6 +146,13 @@ class FileRegionLoader(regionSources: List[RegionSource])(
             .map(byteString => byteString.decodeString("UTF-8"))
             .map(string => string.parseJson)
             .map(jsValue => (regionSource, jsValue.asJsObject))
+            .recover {
+              case ex: Exception =>
+                system.log.error(
+                  s"region file processing failed: ${ex.getMessage}"
+                )
+                throw ex
+            }
       }
   }
 }
diff --git a/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionSource.scala b/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionSource.scala
index 98452beb87..be1805c665 100644
--- a/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionSource.scala
+++ b/magda-scala-common/src/main/scala/au/csiro/data61/magda/spatial/RegionSource.scala
@@ -53,41 +53,54 @@ class RegionSources(config: Config) {
       .map {
         case (name: String, config: ConfigObject) =>
           val regionSourceConfig = config.toConfig()
-          RegionSource(
-            name = name,
-            url = new URL(regionSourceConfig.getString("url")),
-            idProperty = regionSourceConfig.getString("idField"),
-            nameProperty = regionSourceConfig.getString("nameField"),
-            shortNameProperty =
-              regionSourceConfig.getOptionalString("shortNameField"),
-            includeIdInName =
-              if (regionSourceConfig.hasPath("includeIdInName"))
-                regionSourceConfig.getBoolean("includeIdInName")
-              else false,
-            disabled = regionSourceConfig
-              .hasPath("disabled") && regionSourceConfig.getBoolean("disabled"),
-            order = regionSourceConfig.getInt("order"),
-            simplifyToleranceRatio =
-              if (regionSourceConfig.hasPath("simplifyToleranceRatio"))
-                regionSourceConfig.getDouble("simplifyToleranceRatio")
-              else 0.01,
-            requireSimplify =
-              if (regionSourceConfig.hasPath("requireSimplify"))
-                regionSourceConfig.getBoolean("requireSimplify")
-              else true,
-            lv1IdField = regionSourceConfig.getOptionalString("lv1IdField"),
-            lv2IdField = regionSourceConfig.getOptionalString("lv2IdField"),
-            lv3IdField = regionSourceConfig.getOptionalString("lv3IdField"),
-            lv4IdField = regionSourceConfig.getOptionalString("lv4IdField"),
-            lv5IdField = regionSourceConfig.getOptionalString("lv5IdField"),
-            lv1Id = regionSourceConfig.getOptionalString("lv1Id"),
-            lv2Id = regionSourceConfig.getOptionalString("lv2Id"),
-            lv3Id = regionSourceConfig.getOptionalString("lv3Id"),
-            lv4Id = regionSourceConfig.getOptionalString("lv4Id"),
-            lv5Id = regionSourceConfig.getOptionalString("lv5Id")
-          )
+
+          val disabled = regionSourceConfig
+            .hasPath("disabled") && regionSourceConfig.getBoolean("disabled")
+
+          if (disabled) {
+            println(s"""Region ${name} file is disabled and ignored.""")
+            None
+          } else {
+            Some(
+              RegionSource(
+                name = name,
+                url = new URL(regionSourceConfig.getString("url")),
+                idProperty = regionSourceConfig.getString("idField"),
+                nameProperty = regionSourceConfig.getString("nameField"),
+                shortNameProperty =
+                  regionSourceConfig.getOptionalString("shortNameField"),
+                includeIdInName =
+                  if (regionSourceConfig.hasPath("includeIdInName"))
+                    regionSourceConfig.getBoolean("includeIdInName")
+                  else false,
+                disabled = regionSourceConfig
+                  .hasPath("disabled") && regionSourceConfig
+                  .getBoolean("disabled"),
+                order = regionSourceConfig.getInt("order"),
+                simplifyToleranceRatio =
+                  if (regionSourceConfig.hasPath("simplifyToleranceRatio"))
+                    regionSourceConfig.getDouble("simplifyToleranceRatio")
+                  else 0.01,
+                requireSimplify =
+                  if (regionSourceConfig.hasPath("requireSimplify"))
+                    regionSourceConfig.getBoolean("requireSimplify")
+                  else true,
+                lv1IdField = regionSourceConfig.getOptionalString("lv1IdField"),
+                lv2IdField = regionSourceConfig.getOptionalString("lv2IdField"),
+                lv3IdField = regionSourceConfig.getOptionalString("lv3IdField"),
+                lv4IdField = regionSourceConfig.getOptionalString("lv4IdField"),
+                lv5IdField = regionSourceConfig.getOptionalString("lv5IdField"),
+                lv1Id = regionSourceConfig.getOptionalString("lv1Id"),
+                lv2Id = regionSourceConfig.getOptionalString("lv2Id"),
+                lv3Id = regionSourceConfig.getOptionalString("lv3Id"),
+                lv4Id = regionSourceConfig.getOptionalString("lv4Id"),
+                lv5Id = regionSourceConfig.getOptionalString("lv5Id")
+              )
+            )
+          }
       }
       .toSeq
-      .filterNot(_.disabled)
+      .filterNot(_.isEmpty)
+      .map(_.get)
   }
 }
diff --git a/magda-scss-compiler/package.json b/magda-scss-compiler/package.json
index 3f8caf3b19..b4dc73fbac 100644
--- a/magda-scss-compiler/package.json
+++ b/magda-scss-compiler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/magda-scss-compiler",
   "description": "The web-client SCSS compiler pod",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -23,7 +23,7 @@
     "test": "c8 mocha"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/clean-css": "^3.4.30",
     "@types/config": "0.0.32",
@@ -47,8 +47,8 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^4.0.0",
-    "@magda/web-client": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
+    "@magda/web-client": "^4.2.1",
     "autoprefixer": "^10.4.16",
     "clean-css": "^4.2.1",
     "escape-string-regexp": "^1.0.5",
diff --git a/magda-search-api-node/package.json b/magda-search-api-node/package.json
index 88350992d4..880a08eef2 100644
--- a/magda-search-api-node/package.json
+++ b/magda-search-api-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/search-api-node",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": "./dist/index.js",
   "engines": {
@@ -22,7 +22,7 @@
     "@elastic/elasticsearch": "6.8.6",
     "@magda/esm-utils": "^1.0.1",
     "@magda/tsmonad": "^0.9.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "express": "^4.17.2",
     "express-validation": "^3.0.2",
     "geojson": "^0.5.0",
@@ -31,7 +31,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/express": "^4.17.21",
     "@types/geojson": "^7946.0.7",
diff --git a/magda-search-api/package.json b/magda-search-api/package.json
index 2ec7f5f5aa..48da2d72cf 100644
--- a/magda-search-api/package.json
+++ b/magda-search-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/search-api",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "The search API.",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/magda-search-api/src/main/resources/regionMapping.json b/magda-search-api/src/main/resources/regionMapping.json
index 13fa7d10e6..a09aa7b8ee 100644
--- a/magda-search-api/src/main/resources/regionMapping.json
+++ b/magda-search-api/src/main/resources/regionMapping.json
@@ -2,198 +2,150 @@
     "comments": "Matching takes place in the order defined in this file. Place code matches before name matches, and smaller regions before larger ones.",
     "regionWmsMap": {
         "STE": {
-            "layerName": "FID_STE_2011_AUST",
-            "server": "https://vector-tiles.terria.io/FID_STE_2011_AUST/{z}/{x}/{y}.pbf",
-            "regionProp": "STE_CODE11",
-            "aliases": ["ste_code", "ste_code_2011", "ste"],
-            "digits": 1,
-            "description": "States and Territories (STE)",
-            "regionIdsFile": "data/regionids/region_map-FID_STE_2011_AUST_STE_CODE11.json",
+            "layerName": "STE_2021",
+            "server": "https://tiles.magda.io/STE_2021/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81694140799998,
-                -43.74050960300003,
-                159.10921900799997,
-                -9.142175976999999
-            ],
-            "nameProp": "STE_NAME11"
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-STE_2021.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "STATE_CODE_2021",
+            "nameProp": "STATE_NAME_2021",
+            "aliases": ["ste_code_2021", "ste_code", "ste"],
+            "description": "States and Territories 2021",
+            "bbox": [96.81, -43.74, 168, -9.14]
         },
-        "SA4": {
-            "layerName": "FID_SA4_2011_AUST",
-            "server": "https://vector-tiles.terria.io/FID_SA4_2011_AUST/{z}/{x}/{y}.pbf",
-            "regionProp": "SA4_CODE11",
-            "aliases": ["sa4_code_2011", "sa4_code", "sa4"],
-            "digits": 3,
-            "description": "Statistical Area Level 4 (SA4)",
-            "regionIdsFile": "data/regionids/region_map-FID_SA4_2011_AUST_SA4_CODE11.json",
+        "SA1": {
+            "layerName": "SA1_2021",
+            "server": "https://tiles.magda.io/SA1_2021/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81694140799998,
-                -43.74050960300003,
-                159.10921900799997,
-                -9.142175976999999
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-SA1_2021.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "SA1_CODE_2021",
+            "nameProp": "SA1_CODE_2021",
+            "aliases": [
+                "sa1_code_2021",
+                "sa1_maincode_2021",
+                "sa1",
+                "sa1_code"
             ],
-            "nameProp": "SA4_NAME11"
+            "description": "Statistical Area Level 1 2021 (ABS)",
+            "bbox": [96.81, -43.75, 159.11, -9.14]
         },
-        "SA3": {
-            "layerName": "FID_SA3_2011_AUST",
-            "server": "https://vector-tiles.terria.io/FID_SA3_2011_AUST/{z}/{x}/{y}.pbf",
-            "regionProp": "SA3_CODE11",
-            "aliases": ["sa3_code_2011", "sa3_code", "sa3"],
-            "digits": 5,
-            "description": "Statistical Area Level 3 (SA3)",
-            "regionIdsFile": "data/regionids/region_map-FID_SA3_2011_AUST_SA3_CODE11.json",
+        "SA2": {
+            "layerName": "SA2_2021",
+            "server": "https://tiles.magda.io/SA2_2021/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81694140799998,
-                -43.74050960300003,
-                159.10921900799997,
-                -9.142175976999999
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-SA2_2021.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "SA2_CODE_2021",
+            "nameProp": "SA2_NAME_2021",
+            "aliases": [
+                "sa2_code_2021",
+                "sa2_maincode_2021",
+                "sa2",
+                "sa2_code"
             ],
-            "nameProp": "SA3_NAME11"
+            "description": "Statistical Area Level 2 2021 by code (ABS)",
+            "bbox": [96.81, -43.75, 168, -9.14]
         },
-        "SA2": {
-            "layerName": "FID_SA2_2011_AUST",
-            "server": "https://vector-tiles.terria.io/FID_SA2_2011_AUST/{z}/{x}/{y}.pbf",
-            "regionProp": "SA2_MAIN11",
-            "aliases": ["sa2_code_2011", "sa2_code", "sa2"],
-            "digits": 9,
-            "description": "Statistical Area Level 2 (SA2)",
-            "regionIdsFile": "data/regionids/region_map-FID_SA2_2011_AUST_SA2_MAIN11.json",
+        "SA3": {
+            "layerName": "SA3_2021",
+            "server": "https://tiles.magda.io/SA3_2021/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81694140799998,
-                -43.74050960300003,
-                159.10921900799997,
-                -9.142175976999999
-            ],
-            "nameProp": "SA2_NAME11"
-        },
-        "SA1": {
-            "layerName": "FID_SA1_2011_AUST",
-            "server": "https://vector-tiles.terria.io/FID_SA1_2011_AUST/{z}/{x}/{y}.pbf",
-            "regionProp": "SA1_MAIN11",
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-SA3_2021.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "SA3_CODE_2021",
+            "nameProp": "SA3_NAME_2021",
             "aliases": [
-                "sa1_code_2011",
-                "sa1_maincode_2011",
-                "sa1_code",
-                "sa1"
+                "sa3_code_2021",
+                "sa3_maincode_2021",
+                "sa3",
+                "sa3_code"
             ],
-            "digits": 11,
-            "description": "Statistical Area Level 1 (SA1)",
-            "regionIdsFile": "data/regionids/region_map-FID_SA1_2011_AUST_SA1_MAIN11.json",
+            "description": "Statistical Area Level 3 2021 by code (ABS)",
+            "bbox": [96.81, -43.75, 168, -9.14]
+        },
+        "SA4": {
+            "layerName": "SA4_2021",
+            "server": "https://tiles.magda.io/SA4_2021/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81694140799998,
-                -43.74050960300003,
-                159.10921900799997,
-                -9.142175976999999
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-SA4_2021.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "SA4_CODE_2021",
+            "nameProp": "SA4_NAME_2021",
+            "aliases": [
+                "sa4_code_2021",
+                "sa4_maincode_2021",
+                "sa4",
+                "sa4_code"
             ],
-            "nameProp": "SA2_NAME11"
+            "description": "Statistical Area Level 4 2021 by code (ABS)",
+            "bbox": [96.81, -43.75, 168, -9.14]
         },
         "LGA": {
-            "layerName": "FID_LGA_2015_AUST",
-            "server": "https://vector-tiles.terria.io/FID_LGA_2015_AUST/{z}/{x}/{y}.pbf",
-            "regionProp": "LGA_CODE15",
-            "aliases": [
-                "lga_code_2015",
-                "lga_code",
-                "lga",
-                "lga_code_2014",
-                "lga_code_2012",
-                "lga_code_2010"
-            ],
-            "digits": 5,
-            "description": "Local Government Area (LGA)",
-            "regionIdsFile": "data/regionids/region_map-FID_LGA_2015_AUST_LGA_CODE15.json",
+            "layerName": "LGA_2023",
+            "server": "https://tiles.magda.io/LGA_2023/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81694140799998,
-                -43.740509602999985,
-                159.10921900799997,
-                -9.142175976999999
-            ],
-            "nameProp": "LGA_NAME15"
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-LGA_2023.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "LGA_CODE_2023",
+            "nameProp": "LGA_NAME_2023",
+            "aliases": ["lga_code_2023", "lga_code", "lga"],
+            "description": "Local Government Areas 2023",
+            "bbox": [96.81, -43.74, 168, -9.14]
         },
-        "POA": {
-            "layerName": "FID_POA_2011_AUST",
-            "server": "https://vector-tiles.terria.io/FID_POA_2011_AUST/{z}/{x}/{y}.pbf",
-            "regionProp": "POA_CODE",
-            "aliases": [
-                "poa_2011",
-                "postcode_2011",
-                "poa",
-                "poa_code",
-                "poa_code_2011",
-                "postcode",
-                "postcode_2015"
-            ],
-            "digits": 4,
-            "dataReplacements": [["^(?=\\d\\d\\d$)", "0"]],
-            "description": "Postal Area (POA)",
-            "regionIdsFile": "data/regionids/region_map-FID_POA_2011_AUST_POA_CODE.json",
+        "ELB": {
+            "layerName": "ELB_2021",
+            "server": "https://tiles.magda.io/ELB_2021/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81694140799998,
-                -43.59821500299999,
-                159.10921900799997,
-                -9.142175976999999
-            ],
-            "nameProp": "POA_NAME"
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-ELB_NAME_2021.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "Elect_div",
+            "nameProp": "Elect_div",
+            "aliases": ["com_elb_name_2021", "com_elb_name"],
+            "description": "Commonwealth Electoral Divisions as at 2 August 2021 (AEC)",
+            "bbox": [96.81, -43.73, 168, -9.1]
         },
-        "COM_ELB_ID_2016": {
-            "layerName": "FID_COM20160509_ELB",
-            "server": "https://vector-tiles.terria.io/FID_COM20160509_ELB/{z}/{x}/{y}.pbf",
-            "regionProp": "DIV_ID",
-            "aliases": [
-                "divisionid",
-                "com_elb_id_2016",
-                "com_elb_id",
-                "com_elb"
-            ],
-            "digits": 3,
-            "description": "Commonwealth Electoral District",
-            "regionIdsFile": "data/regionids/region_map-FID_COM20160509_ELB_DIV_ID.json",
+        "POA": {
+            "layerName": "POA_2021",
+            "server": "https://tiles.magda.io/POA_2021/{z}/{x}/{y}.pbf",
             "serverType": "MVT",
-            "serverSubdomains": [],
-            "serverMinZoom": 0,
             "serverMaxNativeZoom": 12,
+            "serverMinZoom": 0,
             "serverMaxZoom": 28,
-            "bbox": [
-                96.81676599999997,
-                -43.740509999999986,
-                159.1092189999999,
-                -9.142175999999996
+            "regionIdsFile": "build/TerriaJS/data/regionids/region_map-POA_2021.json",
+            "uniqueIdProp": "FID",
+            "regionProp": "POA_CODE_2021",
+            "nameProp": "POA_CODE_2021",
+            "aliases": [
+                "poa_code_2021",
+                "poa_code",
+                "poa",
+                "postcode_2021",
+                "postcode"
             ],
-            "nameProp": "SORTNAME"
+            "description": "Postal Areas 2021 (ABS)",
+            "bbox": [96.81, -43.74, 168, -9.14]
         }
     }
 }
diff --git a/magda-search-api/src/main/scala/au/csiro/data61/magda/api/SearchApi.scala b/magda-search-api/src/main/scala/au/csiro/data61/magda/api/SearchApi.scala
index f917ba0f25..9b99e9a293 100755
--- a/magda-search-api/src/main/scala/au/csiro/data61/magda/api/SearchApi.scala
+++ b/magda-search-api/src/main/scala/au/csiro/data61/magda/api/SearchApi.scala
@@ -5,13 +5,14 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.model.StatusCodes._
 import akka.http.scaladsl.server.Directives._
+import akka.http.scaladsl.model._
 import au.csiro.data61.magda.model.misc
 import au.csiro.data61.magda.model.misc._
 import au.csiro.data61.magda.api.{model => apimodel}
 import au.csiro.data61.magda.client.AuthApiClient
 import au.csiro.data61.magda.directives.TenantDirectives.requiresTenantId
 import au.csiro.data61.magda.search.SearchQueryer
-import com.typesafe.config.Config
+import com.typesafe.config.{Config, ConfigRenderOptions}
 import au.csiro.data61.magda.search.Directives.withDatasetReadAuthDecision
 
 /**
@@ -32,6 +33,14 @@ class SearchApi(
     with apimodel.Protocols {
   override def getLogger = logger
 
+  val regionMappingConfig = if (config.hasPath("regionMapping")) {
+    Some(
+      config.getObject("regionMapping").render(ConfigRenderOptions.concise())
+    )
+  } else {
+    None
+  }
+
   val routes =
     magdaRoute {
       pathPrefix("v0") {
@@ -407,7 +416,7 @@ class SearchApi(
             * @apiDescription Returns a list of region types
             *
             * @apiSuccess {string} comments Notes for programmers.
-            * @apiSuccess {RegionWMSMap[]} regionWmsMap A mepping of string to WMS layer metadata.
+            * @apiSuccess {RegionWMSMap[]} regionWmsMap A mapping of string to WMS layer metadata.
             *
             * @apiSuccessExample {any} 200
             *    {
@@ -423,7 +432,23 @@ class SearchApi(
             *        }
             *    }
             */
-          path("region-types") { get { getFromResource("regionMapping.json") } } ~
+          path("region-types") {
+            get {
+
+              if (regionMappingConfig.isEmpty) {
+                // Serve the default region mapping
+                getFromResource("regionMapping.json")
+              } else {
+                // Serve the region mapping from config
+                val entity = HttpEntity(
+                  ContentTypes.`application/json`,
+                  regionMappingConfig.get
+                )
+                complete(HttpResponse(StatusCodes.OK, entity = entity))
+              }
+
+            }
+          } ~
           /**
             * @apiGroup Search
             * @api {get} /v0/search/regions Get Regions
diff --git a/magda-storage-api/package.json b/magda-storage-api/package.json
index ecddfa543a..60107ffe85 100644
--- a/magda-storage-api/package.json
+++ b/magda-storage-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/storage-api",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "express": "^4.17.2",
     "express-multipart-file-parser": "^0.1.2",
     "http-terminator": "^3.2.0",
@@ -36,7 +36,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/express": "^4.17.21",
     "@types/minio": "^7.0.12",
     "@types/urijs": "^1.19.19",
diff --git a/magda-tenant-api/package.json b/magda-tenant-api/package.json
index af1ca8df05..f9178de11f 100644
--- a/magda-tenant-api/package.json
+++ b/magda-tenant-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/tenant-api",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -26,7 +26,7 @@
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
     "@magda/tsmonad": "^0.9.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "express": "^4.17.2",
     "http-terminator": "^3.2.0",
     "jsonwebtoken": "^8.4.0",
@@ -37,7 +37,7 @@
     "yargs": "^12.0.5"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/express": "^4.17.21",
     "@types/lodash": "^4.14.96",
diff --git a/magda-typescript-common/package.json b/magda-typescript-common/package.json
index 5c4fd13f6c..b4e72f35a9 100644
--- a/magda-typescript-common/package.json
+++ b/magda-typescript-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/typescript-common",
   "description": "Common TypeScript code shared between components.",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -23,8 +23,8 @@
   },
   "devDependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/registry-aspects": "^4.0.0",
-    "@magda/scripts": "^4.0.0",
+    "@magda/registry-aspects": "^4.2.1",
+    "@magda/scripts": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.0",
     "@types/cross-spawn": "^6.0.1",
diff --git a/magda-web-client/package.json b/magda-web-client/package.json
index 7a50f99080..ebc7cdc8f0 100644
--- a/magda-web-client/package.json
+++ b/magda-web-client/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "@magda/web-client",
   "description": "The MAGDA in-browser web front end.",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "homepage": ".",
   "scripts": {
@@ -24,9 +24,9 @@
     "@babel/core": "^7.23.3",
     "@babel/runtime": "^7.23.2",
     "@craco/craco": "^7.1.0",
-    "@magda/registry-aspects": "^4.0.0",
-    "@magda/scripts": "^4.0.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/registry-aspects": "^4.2.1",
+    "@magda/scripts": "^4.2.1",
+    "@magda/typescript-common": "^4.2.1",
     "@types/debounce-promise": "^3.1.1",
     "@types/is-uuid": "^1.0.0",
     "@types/jsonpath": "^0.2.0",
diff --git a/magda-web-client/src/Components/Common/Pagination.js b/magda-web-client/src/Components/Common/Pagination.js
index 1d621c9895..c401893135 100644
--- a/magda-web-client/src/Components/Common/Pagination.js
+++ b/magda-web-client/src/Components/Common/Pagination.js
@@ -154,12 +154,15 @@ class Pagination extends Component {
                 {pageButtons.map((i) => (
                     <li key={i}>
                         <Link
-                            to={this.generateRoute(i)}
+                            to={this.generateRoute(
+                                //-- if i===0 then it's `...` button, Rule 6 applies
+                                i === 0 ? current - 4 : i
+                            )}
                             className={`${
                                 i === current ? "current" : "non-current"
                             }`}
                             aria-current={i === current ? "true" : "false"}
-                            aria-label={`Page ${i}`}
+                            aria-label={`Page ${i === 0 ? current - 4 : i}`}
                         >
                             {i === 0 ? "..." : i}
                         </Link>
@@ -171,7 +174,7 @@ class Pagination extends Component {
     }
 
     render() {
-        let currentPage = this.props.currentPage;
+        const currentPage = this.props.currentPage;
         const searchResultsPerPage = this.props.configuration
             .searchResultsPerPage;
 
diff --git a/magda-web-client/src/Components/Dataset/Search/Facets/FacetRegion.js b/magda-web-client/src/Components/Dataset/Search/Facets/FacetRegion.js
index 50c565eeae..ad60bc15fd 100644
--- a/magda-web-client/src/Components/Dataset/Search/Facets/FacetRegion.js
+++ b/magda-web-client/src/Components/Dataset/Search/Facets/FacetRegion.js
@@ -50,12 +50,12 @@ class FacetRegion extends Component {
     }
 
     onFeatureClick(feature) {
-        let regionMapping = this.props.regionMapping;
+        const regionMapping = this.props.regionMapping;
         let regionType = this.state._activeRegion.regionType;
         if (!regionType) regionType = "STE";
 
-        let regionProp = regionMapping[regionType].regionProp;
-        let nameProp = regionMapping[regionType].nameProp;
+        const regionProp = regionMapping[regionType].regionProp;
+        const nameProp = regionMapping[regionType].nameProp;
         const region = {
             regionType: regionType,
             regionId: feature.properties[regionProp],
diff --git a/magda-web-server/package.json b/magda-web-server/package.json
index 8e359e9eaa..2a08cbe894 100644
--- a/magda-web-server/package.json
+++ b/magda-web-server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/web-server",
   "description": "The server that serves the MAGDA web front end.",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": "./dist/index.js",
@@ -21,8 +21,8 @@
     "test": "c8 mocha"
   },
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
-    "@magda/web-client": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
+    "@magda/web-client": "^4.2.1",
     "@types/chai": "^4.3.11",
     "@types/config": "0.0.32",
     "@types/express": "^4.17.21",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "express": "^4.17.2",
     "fs-extra": "^11.2.0",
     "http-terminator": "^3.2.0",
diff --git a/packages/acs-cmd/package.json b/packages/acs-cmd/package.json
index b194762eef..acb66d8e67 100644
--- a/packages/acs-cmd/package.json
+++ b/packages/acs-cmd/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/acs-cmd",
   "description": "MAGDA Account Management Utilities",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "bin": {
     "acs-cmd": "./bin/acs-cmd.js"
   },
@@ -22,8 +22,8 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
+    "@magda/typescript-common": "^4.2.1",
     "esbuild": "^0.19.10",
     "fs-extra": "^11.2.0"
   },
diff --git a/packages/arbitraries/package.json b/packages/arbitraries/package.json
index 0f1a1ffb30..c4f6e5deeb 100644
--- a/packages/arbitraries/package.json
+++ b/packages/arbitraries/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/arbitraries",
   "description": "MAGDA jsverify property-based testing arbitraries definitions",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/minion-framework": "^4.0.0",
+    "@magda/minion-framework": "^4.2.1",
     "@microsoft/api-extractor": "~7.39.0",
     "esbuild": "^0.19.10",
     "ts-loader": "^9.5.1",
diff --git a/packages/auth-api-client/package.json b/packages/auth-api-client/package.json
index 5a66f0e055..be481bf224 100644
--- a/packages/auth-api-client/package.json
+++ b/packages/auth-api-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/auth-api-client",
   "description": "MAGDA Auth API Client",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "@microsoft/api-extractor": "~7.39.0",
     "esbuild": "^0.19.10",
     "ts-loader": "^9.5.1",
diff --git a/packages/authentication-plugin-sdk/package.json b/packages/authentication-plugin-sdk/package.json
index c085878aab..e7352264cd 100644
--- a/packages/authentication-plugin-sdk/package.json
+++ b/packages/authentication-plugin-sdk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/authentication-plugin-sdk",
   "description": "MAGDA Authentication Plugin SDK",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -23,8 +23,8 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@magda/auth-api-client": "^4.0.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/auth-api-client": "^4.2.1",
+    "@magda/typescript-common": "^4.2.1",
     "@types/express-session": "^1.17.10",
     "@types/lodash": "^4.14.74",
     "@types/pg": "^8.6.5",
diff --git a/packages/connector-sdk/package.json b/packages/connector-sdk/package.json
index a703c8bf49..d94cced171 100644
--- a/packages/connector-sdk/package.json
+++ b/packages/connector-sdk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/connector-sdk",
   "description": "MAGDA Connector SDK",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "@microsoft/api-extractor": "~7.39.0",
     "@types/yargs": "^12.0.8",
     "esbuild": "^0.19.10",
diff --git a/packages/connector-test-utils/package.json b/packages/connector-test-utils/package.json
index 52ee47b7ff..cf1d319338 100644
--- a/packages/connector-test-utils/package.json
+++ b/packages/connector-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/connector-test-utils",
   "description": "MAGDA Connector Utils for Test Cases",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "@microsoft/api-extractor": "~7.39.0",
     "esbuild": "^0.19.10",
     "ts-loader": "^9.5.1",
diff --git a/packages/create-secrets/package.json b/packages/create-secrets/package.json
index c31170ae77..e1752b9227 100644
--- a/packages/create-secrets/package.json
+++ b/packages/create-secrets/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/create-secrets",
   "description": "MAGDA Create Secrets Tool",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./bin/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/scripts": "^4.0.0",
+    "@magda/scripts": "^4.2.1",
     "esbuild": "^0.19.10"
   },
   "magda": {
diff --git a/packages/docker-utils/package.json b/packages/docker-utils/package.json
index b7a7f24b5c..cf09d339e8 100644
--- a/packages/docker-utils/package.json
+++ b/packages/docker-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/docker-utils",
   "description": "MAGDA Docker Utilities",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/docker-util.js",
@@ -23,7 +23,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/scripts": "^4.0.0"
+    "@magda/scripts": "^4.2.1"
   },
   "dependencies": {
     "fs-extra": "^11.2.0",
diff --git a/packages/external-ui-plugin-sdk/package.json b/packages/external-ui-plugin-sdk/package.json
index acc60dca0b..c3095dd990 100644
--- a/packages/external-ui-plugin-sdk/package.json
+++ b/packages/external-ui-plugin-sdk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/external-ui-plugin-sdk",
   "description": "MAGDA external UI plugin SDK",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "scripts": {
     "prebuild": "rimraf dist tsconfig.tsbuildinfo",
     "build": "api-extractor run -l",
@@ -18,7 +18,7 @@
     "directory": "packages/external-ui-plugin-sdk"
   },
   "devDependencies": {
-    "@magda/web-client": "^4.0.0",
+    "@magda/web-client": "^4.2.1",
     "typescript": "~5.3.3"
   },
   "peerDependencies": {
diff --git a/packages/minion-sdk/package.json b/packages/minion-sdk/package.json
index 7c81a798bc..aa800702cd 100644
--- a/packages/minion-sdk/package.json
+++ b/packages/minion-sdk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/minion-sdk",
   "description": "MAGDA Minion SDK",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -23,8 +23,8 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@magda/minion-framework": "^4.0.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/minion-framework": "^4.2.1",
+    "@magda/typescript-common": "^4.2.1",
     "@microsoft/api-extractor": "~7.39.0",
     "esbuild": "^0.19.10",
     "ts-loader": "^9.5.1",
diff --git a/packages/org-tree/package.json b/packages/org-tree/package.json
index c977176b69..935a5278df 100644
--- a/packages/org-tree/package.json
+++ b/packages/org-tree/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/org-tree",
   "description": "MAGDA Organizational Hierarchy Management Utilities",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -22,9 +22,9 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/authorization-api": "^4.0.0",
-    "@magda/scripts": "^4.0.0",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/authorization-api": "^4.2.1",
+    "@magda/scripts": "^4.2.1",
+    "@magda/typescript-common": "^4.2.1",
     "chalk": "^2.4.1",
     "commander": "^11.1.0",
     "esbuild": "^0.19.10",
diff --git a/packages/registry-client/package.json b/packages/registry-client/package.json
index a326989a3d..e0d68dbe7b 100644
--- a/packages/registry-client/package.json
+++ b/packages/registry-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/registry-client",
   "description": "MAGDA Registry Client",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
@@ -23,7 +23,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "@microsoft/api-extractor": "~7.39.0",
     "esbuild": "^0.19.10",
     "ts-loader": "^9.5.1",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 24e340467d..c9f377fffc 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@magda/utils",
   "description": "MAGDA Common Utils",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "type": "module",
   "exports": {
     ".": {
@@ -26,7 +26,7 @@
   "module": "dist/index.js",
   "browser": "dist/index-web.js",
   "devDependencies": {
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "@microsoft/api-extractor": "~7.39.0",
     "esbuild": "^0.19.10",
     "ts-loader": "^9.5.1",
diff --git a/scripts/package.json b/scripts/package.json
index 63da53f0f7..e67da93a0d 100755
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/scripts",
-  "version": "4.0.0",
+  "version": "4.2.1",
   "description": "Scripts for building, running, and deploying MAGDA",
   "license": "Apache-2.0",
   "type": "module",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^4.0.0",
+    "@magda/typescript-common": "^4.2.1",
     "ansi-styles": "^3.2.1",
     "apidoc": "https://github.com/magda-io/apidoc",
     "chalk": "^2.4.1",