diff --git a/charts/alfresco-repository/Chart.lock b/charts/alfresco-repository/Chart.lock
index 3a1e501b..f2b18487 100644
--- a/charts/alfresco-repository/Chart.lock
+++ b/charts/alfresco-repository/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.0.0-alpha.4
+  version: 3.0.0
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 12.5.6
-digest: sha256:569e88f1d311e341437a62bae88d6bca83b986d8f40cb9bbafd4f33aa4e9ed8f
-generated: "2023-10-27T17:28:14.899057+02:00"
+digest: sha256:4e6157fb30d7ac198f6c4ced7b5891c3f859996abfcbcfe2c20ab44b55cc8073
+generated: "2023-11-07T15:20:15.639695+01:00"
diff --git a/charts/alfresco-repository/Chart.yaml b/charts/alfresco-repository/Chart.yaml
index e33c19a5..024e406b 100644
--- a/charts/alfresco-repository/Chart.yaml
+++ b/charts/alfresco-repository/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v2
 name: alfresco-repository
 description: Alfresco content repository Helm chart
 type: application
-version: 0.1.0-alpha.21
-appVersion: 23.1.0-A21
+version: 0.1.0
+appVersion: 23.1.0
 dependencies:
   - name: alfresco-common
-    version: 3.0.0-alpha.4
+    version: 3.0.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
   - name: postgresql
     version: 12.5.6
diff --git a/charts/alfresco-repository/README.md b/charts/alfresco-repository/README.md
index 0e941970..1b53e7d9 100644
--- a/charts/alfresco-repository/README.md
+++ b/charts/alfresco-repository/README.md
@@ -1,6 +1,6 @@
 # alfresco-repository
 
-![Version: 0.1.0-alpha.21](https://img.shields.io/badge/Version-0.1.0--alpha.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0-A21](https://img.shields.io/badge/AppVersion-23.1.0--A21-informational?style=flat-square)
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0](https://img.shields.io/badge/AppVersion-23.1.0-informational?style=flat-square)
 
 Alfresco content repository Helm chart
 
@@ -8,7 +8,7 @@ Alfresco content repository Helm chart
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0-alpha.4 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.5.6 |
 
 ## Values
@@ -77,7 +77,7 @@ Alfresco content repository Helm chart
 | image.port | int | `8080` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` |  |
-| image.tag | string | `"23.1.0-A21"` |  |
+| image.tag | string | `"23.1.0"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{"nginx.ingress.kubernetes.io/affinity":"cookie","nginx.ingress.kubernetes.io/proxy-body-size":"5g","nginx.ingress.kubernetes.io/session-cookie-hash":"sha1","nginx.ingress.kubernetes.io/session-cookie-name":"alfrescoRepo"}` | provide annotations for nginx ingress (no toher ingress is supported at that point) |
 | ingress.enabled | bool | `true` | Toggle ingress |
diff --git a/charts/alfresco-repository/values.yaml b/charts/alfresco-repository/values.yaml
index 350fc026..457ef2c0 100644
--- a/charts/alfresco-repository/values.yaml
+++ b/charts/alfresco-repository/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: quay.io/alfresco/alfresco-content-repository
   pullPolicy: IfNotPresent
-  tag: 23.1.0-A21
+  tag: 23.1.0
   port: 8080
 
 strategy:
diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
index 68101283..348163f8 100644
--- a/charts/alfresco-search-enterprise/Chart.yaml
+++ b/charts/alfresco-search-enterprise/Chart.yaml
@@ -3,8 +3,8 @@ apiVersion: v2
 name: alfresco-search-enterprise
 description: A Helm chart for deploying Alfresco Elasticsearch connector
 type: application
-version: 3.0.0-alpha.6
-appVersion: 3.3.1
+version: 3.0.0
+appVersion: 4.0.0
 dependencies:
   - name: alfresco-common
     version: 3.0.0-alpha.3
diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index 4af9ca17..cd6b8845 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-enterprise
 
-![Version: 3.0.0-alpha.6](https://img.shields.io/badge/Version-3.0.0--alpha.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0](https://img.shields.io/badge/AppVersion-4.0.0-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Elasticsearch connector
 
@@ -32,18 +32,18 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | indexName | string | `"alfresco"` | Name of the existing search index, usually created by repo |
 | liveIndexing.content.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.content.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-content"` |  |
-| liveIndexing.content.image.tag | string | `"3.3.1"` |  |
+| liveIndexing.content.image.tag | string | `"4.0.0"` |  |
 | liveIndexing.content.replicaCount | int | `1` |  |
 | liveIndexing.mediation.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.mediation.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-mediation"` |  |
-| liveIndexing.mediation.image.tag | string | `"3.3.1"` |  |
+| liveIndexing.mediation.image.tag | string | `"4.0.0"` |  |
 | liveIndexing.metadata.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.metadata.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-metadata"` |  |
-| liveIndexing.metadata.image.tag | string | `"3.3.1"` |  |
+| liveIndexing.metadata.image.tag | string | `"4.0.0"` |  |
 | liveIndexing.metadata.replicaCount | int | `1` |  |
 | liveIndexing.path.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.path.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-path"` |  |
-| liveIndexing.path.image.tag | string | `"3.3.1"` |  |
+| liveIndexing.path.image.tag | string | `"4.0.0"` |  |
 | liveIndexing.path.replicaCount | int | `1` |  |
 | messageBroker.existingConfigMap.keys.url | string | `"BROKER_URL"` | Key within the configmap holding the URL of the message broker |
 | messageBroker.existingConfigMap.name | string | `nil` | Alternatively, provide message broker connection details via an existing configmap |
@@ -67,7 +67,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | reindexing.enabled | bool | `true` | Create the one-shot job to trigger the reindexing of repo contents |
 | reindexing.image.pullPolicy | string | `"IfNotPresent"` |  |
 | reindexing.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-reindexing"` |  |
-| reindexing.image.tag | string | `"3.3.1"` |  |
+| reindexing.image.tag | string | `"4.0.0"` |  |
 | reindexing.initcontainers.waitForRepository.resources.limits.cpu | string | `"0.25"` |  |
 | reindexing.initcontainers.waitForRepository.resources.limits.memory | string | `"10Mi"` |  |
 | reindexing.pathIndexingEnabled | bool | `true` |  |
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index fd13ad82..3ac0d7eb 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -26,24 +26,24 @@ liveIndexing:
     image:
       repository: >-
         quay.io/alfresco/alfresco-elasticsearch-live-indexing-mediation
-      tag: 3.3.1
+      tag: 4.0.0
       pullPolicy: IfNotPresent
   content:
     image:
       repository: quay.io/alfresco/alfresco-elasticsearch-live-indexing-content
-      tag: 3.3.1
+      tag: 4.0.0
       pullPolicy: IfNotPresent
     replicaCount: 1
   metadata:
     image:
       repository: quay.io/alfresco/alfresco-elasticsearch-live-indexing-metadata
-      tag: 3.3.1
+      tag: 4.0.0
       pullPolicy: IfNotPresent
     replicaCount: 1
   path:
     image:
       repository: quay.io/alfresco/alfresco-elasticsearch-live-indexing-path
-      tag: 3.3.1
+      tag: 4.0.0
       pullPolicy: IfNotPresent
     replicaCount: 1
 reindexing:
@@ -51,7 +51,7 @@ reindexing:
   enabled: true
   image:
     repository: quay.io/alfresco/alfresco-elasticsearch-reindexing
-    tag: 3.3.1
+    tag: 4.0.0
     pullPolicy: IfNotPresent
   pathIndexingEnabled: true
   repository:
@@ -110,7 +110,6 @@ serviceAccount:
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: "alfresco-search-enterprise-sa"
-
 ats:
   # -- URL of the alfresco transform (trouter or tengine-aio)
   transform_url: null
@@ -170,7 +169,6 @@ search:
       password: SEARCH_PASSWORD
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret
-
 tags:
   # -- A chart tag used for Hyland's CI purpose. Do not set it to true.
   ci: false
diff --git a/charts/alfresco-search-service/Chart.yaml b/charts/alfresco-search-service/Chart.yaml
index ed606b72..28958b65 100644
--- a/charts/alfresco-search-service/Chart.yaml
+++ b/charts/alfresco-search-service/Chart.yaml
@@ -15,8 +15,8 @@ keywords:
 name: alfresco-search-service
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 2.0.0-alpha.2
-appVersion: 2.0.8
+version: 2.0.0
+appVersion: 2.0.8.2
 dependencies:
   - name: alfresco-insight-zeppelin
     version: 2.2.0
diff --git a/charts/alfresco-search-service/README.md b/charts/alfresco-search-service/README.md
index b5ede60a..cf4d7b47 100644
--- a/charts/alfresco-search-service/README.md
+++ b/charts/alfresco-search-service/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-service
 
-![Version: 2.0.0-alpha.2](https://img.shields.io/badge/Version-2.0.0--alpha.2-informational?style=flat-square) ![AppVersion: 2.0.8](https://img.shields.io/badge/AppVersion-2.0.8-informational?style=flat-square)
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![AppVersion: 2.0.8.2](https://img.shields.io/badge/AppVersion-2.0.8.2-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Search Service
 
@@ -40,7 +40,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | insightEngineImage.internalPort | string | `nil` | container's port search service is listening on change if your custom image use a different port. |
 | insightEngineImage.pullPolicy | string | `"IfNotPresent"` |  |
 | insightEngineImage.repository | string | `"quay.io/alfresco/insight-engine"` |  |
-| insightEngineImage.tag | string | `"2.0.8"` |  |
+| insightEngineImage.tag | string | `"2.0.8.2"` |  |
 | livenessProbe.initialDelaySeconds | int | `130` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
@@ -71,7 +71,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | searchServicesImage.internalPort | string | `nil` | container's port search service is listening on change if your custom image use a different port. |
 | searchServicesImage.pullPolicy | string | `"IfNotPresent"` |  |
 | searchServicesImage.repository | string | `"quay.io/alfresco/search-services"` |  |
-| searchServicesImage.tag | string | `"2.0.8"` |  |
+| searchServicesImage.tag | string | `"2.0.8.2"` |  |
 | service.name | string | `"solr"` |  |
 | service.type | string | `"ClusterIP"` |  |
 | type | string | `"search-services"` | set alfresco-insight-zeppelin.enabled=true As the Docker Image for Insight Engine is not publicly available the alfrescoRegistryPullSecrets has to be set More information can be found on https://github.com/Alfresco/acs-deployment/blob/master/docs/helm/registry-authentication.md |
diff --git a/charts/alfresco-search-service/values.yaml b/charts/alfresco-search-service/values.yaml
index 9116340b..560e001e 100644
--- a/charts/alfresco-search-service/values.yaml
+++ b/charts/alfresco-search-service/values.yaml
@@ -20,14 +20,14 @@ podSecurityContext:
   fsGroup: 33007
 searchServicesImage:
   repository: quay.io/alfresco/search-services
-  tag: 2.0.8
+  tag: 2.0.8.2
   pullPolicy: &searchDockerImagePullPolicy IfNotPresent
   # -- container's port search service is listening on
   # change if your custom image use a different port.
   internalPort: null
 insightEngineImage:
   repository: quay.io/alfresco/insight-engine
-  tag: 2.0.8
+  tag: 2.0.8.2
   pullPolicy: *searchDockerImagePullPolicy
   # -- container's port search service is listening on
   # change if your custom image use a different port.
@@ -49,10 +49,10 @@ ingress:
   # You can create your own with htpasswd utilility & encode it with base640.
   # Example: `echo -n "$(htpasswd -nbm admin admin)" | base64 | tr -d '\n'`
   # basicAuth: YWRtaW46JGFwcjEkVVJqb29uS00kSEMuS1EwVkRScFpwSHB2a3JwTDd1Lg==
-  basicAuth:
+  basicAuth: null
   # -- An existing secret that contains an `auth` key with a value in the same
   # format of `ingress.basicAuth`
-  existingSecretName:
+  existingSecretName: null
   # -- nginx ingress annotations (see
   # https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations)
   annotations:
@@ -128,6 +128,5 @@ initContainer:
       memory: "5Mi"
     limits:
       memory: "10Mi"
-
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret
diff --git a/charts/alfresco-share/Chart.yaml b/charts/alfresco-share/Chart.yaml
index 52adaef1..68abec6b 100644
--- a/charts/alfresco-share/Chart.yaml
+++ b/charts/alfresco-share/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: alfresco-share
 description: Alfresco Share Helm chart for Kubernetes
 type: application
-version: 0.1.1
-appVersion: 7.4.1.1
+version: 0.2.0
+appVersion: 23.1.0
 dependencies:
   - repository: https://alfresco.github.io/alfresco-helm-charts
     version: 2.1.0
diff --git a/charts/alfresco-share/README.md b/charts/alfresco-share/README.md
index 72f93d8c..65be7866 100644
--- a/charts/alfresco-share/README.md
+++ b/charts/alfresco-share/README.md
@@ -1,6 +1,6 @@
 # alfresco-share
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.4.1.1](https://img.shields.io/badge/AppVersion-7.4.1.1-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0](https://img.shields.io/badge/AppVersion-23.1.0-informational?style=flat-square)
 
 Alfresco Share Helm chart for Kubernetes
 
@@ -28,7 +28,7 @@ Alfresco Share Helm chart for Kubernetes
 | image.port | int | `8080` | Internal port where the pod is listening. Should only be changed is you use a custom image which uses a different port. |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-share"` |  |
-| image.tag | string | `"7.4.1.1"` |  |
+| image.tag | string | `"23.1.0"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/affinity" | string | `"cookie"` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/proxy-body-size" | string | `"5g"` |  |
diff --git a/charts/alfresco-share/values.yaml b/charts/alfresco-share/values.yaml
index e0e36e31..72c1906c 100644
--- a/charts/alfresco-share/values.yaml
+++ b/charts/alfresco-share/values.yaml
@@ -20,7 +20,7 @@ repository:
 known_urls: null
 image:
   repository: quay.io/alfresco/alfresco-share
-  tag: 7.4.1.1
+  tag: 23.1.0
   pullPolicy: IfNotPresent
   # -- Internal port where the pod is listening. Should only be changed is you
   # use a custom image which uses a different port.
diff --git a/charts/alfresco-sync-service/Chart.yaml b/charts/alfresco-sync-service/Chart.yaml
index 8dbe81c1..3488991d 100644
--- a/charts/alfresco-sync-service/Chart.yaml
+++ b/charts/alfresco-sync-service/Chart.yaml
@@ -8,8 +8,8 @@ keywords:
 name: alfresco-sync-service
 sources:
   - https://github.com/Alfresco/acs-deployment
-version: 4.4.0
-appVersion: 3.11.0
+version: 4.5.0
+appVersion: 4.0.0
 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-sync-service/README.md b/charts/alfresco-sync-service/README.md
index 0bb9f719..51906eaf 100644
--- a/charts/alfresco-sync-service/README.md
+++ b/charts/alfresco-sync-service/README.md
@@ -1,6 +1,6 @@
 # alfresco-sync-service
 
-![Version: 4.4.0](https://img.shields.io/badge/Version-4.4.0-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square)
+![Version: 4.5.0](https://img.shields.io/badge/Version-4.5.0-informational?style=flat-square) ![AppVersion: 4.0.0](https://img.shields.io/badge/AppVersion-4.0.0-informational?style=flat-square)
 
 Alfresco Sync Service
 
@@ -33,13 +33,13 @@ Alfresco Sync Service
 | environment.EXTRA_JAVA_OPTS | string | `""` |  |
 | environment.JAVA_OPTS | string | `"-Dsync.metrics.reporter.graphite.enabled=false -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"` |  |
 | global | object | `{"alfrescoRegistryPullSecrets":"quay-registry-secret","messageBroker":{"password":null,"url":null,"user":null},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0}}}` | Global definition of Docker registry pull secret which can be overridden from parent ACS Helm chart(s) |
-| global.messageBroker.password | string | `nil` | Credential to use to authenticate to the broker. |
+| global.messageBroker.password | string | `nil` | Credential to use to authenticate to the broker |
 | global.messageBroker.url | string | `nil` | A failover URI formatted string, see: https://activemq.apache.org/failover-transport-reference |
-| global.messageBroker.user | string | `nil` | Username to authenticate as. |
+| global.messageBroker.user | string | `nil` | Username to authenticate as |
 | image.internalPort | int | `9090` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/service-sync"` |  |
-| image.tag | string | `"3.11.0"` |  |
+| image.tag | string | `"4.0.0"` |  |
 | ingress.extraAnnotations | object | `{}` | useful when running Sync service without SSL termination done by a load balancer, e.g. when ran on Minikube for testing purposes nginx.ingress.kubernetes.io/ssl-redirect: "false" |
 | ingress.path | string | `"/syncservice"` |  |
 | ingress.tls | list | `[]` |  |
diff --git a/charts/alfresco-sync-service/values.yaml b/charts/alfresco-sync-service/values.yaml
index bf132c60..fa23e37e 100644
--- a/charts/alfresco-sync-service/values.yaml
+++ b/charts/alfresco-sync-service/values.yaml
@@ -7,10 +7,10 @@ global:
   messageBroker:
     # -- A failover URI formatted string, see:
     # https://activemq.apache.org/failover-transport-reference
-    url:
-    # -- Username to authenticate as.
-    user:
-    # -- Credential to use to authenticate to the broker.
+    url: null
+    # -- Username to authenticate as
+    user: null
+    # -- Credential to use to authenticate to the broker
     password: null
   alfrescoRegistryPullSecrets: quay-registry-secret
   strategy:
@@ -24,7 +24,7 @@ podSecurityContext:
   fsGroup: 1000
 image:
   repository: quay.io/alfresco/service-sync
-  tag: 3.11.0
+  tag: 4.0.0
   pullPolicy: IfNotPresent
   internalPort: 9090
 environment:
@@ -82,9 +82,9 @@ messageBroker:
   # -- A name that will be used as a base to get broker connection details
   nameOverride: activemq
   # -- Username to authenticate as.
-  user:
+  user: null
   # -- Credential to use to authenticate to the broker.
-  password:
+  password: null
   # -- An existing k8s secret with broker details (preferred over using values)
   existingSecretName: null
 # -- Defines properties required by sync service for connecting to the database
diff --git a/charts/alfresco-transform-service/Chart.yaml b/charts/alfresco-transform-service/Chart.yaml
index 418aa369..a254e87b 100644
--- a/charts/alfresco-transform-service/Chart.yaml
+++ b/charts/alfresco-transform-service/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: alfresco-transform-service
 description: A Helm chart for deploying Alfresco Transform Services
 type: application
-version: 0.2.0
-appVersion: "3.0.0"
+version: 0.3.0
+appVersion: 4.0.0
 dependencies:
   - name: alfresco-common
     version: 2.1.0
diff --git a/charts/alfresco-transform-service/README.md b/charts/alfresco-transform-service/README.md
index 3f64e6a9..a794877f 100644
--- a/charts/alfresco-transform-service/README.md
+++ b/charts/alfresco-transform-service/README.md
@@ -1,6 +1,6 @@
 # alfresco-transform-service
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0](https://img.shields.io/badge/AppVersion-4.0.0-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Transform Services
 
@@ -30,7 +30,7 @@ A Helm chart for deploying Alfresco Transform Services
 | filestore.image.internalPort | int | `8099` |  |
 | filestore.image.pullPolicy | string | `"IfNotPresent"` |  |
 | filestore.image.repository | string | `"quay.io/alfresco/alfresco-shared-file-store"` |  |
-| filestore.image.tag | string | `"3.0.0"` |  |
+| filestore.image.tag | string | `"4.0.0"` |  |
 | filestore.initContainer.image.pullPolicy | string | `"IfNotPresent"` |  |
 | filestore.initContainer.image.repository | string | `"busybox"` |  |
 | filestore.initContainer.image.tag | string | `"1.35.0"` |  |
@@ -220,7 +220,7 @@ A Helm chart for deploying Alfresco Transform Services
 | transformrouter.image.internalPort | int | `8095` |  |
 | transformrouter.image.pullPolicy | string | `"IfNotPresent"` |  |
 | transformrouter.image.repository | string | `"quay.io/alfresco/alfresco-transform-router"` |  |
-| transformrouter.image.tag | string | `"3.0.0"` |  |
+| transformrouter.image.tag | string | `"4.0.0"` |  |
 | transformrouter.livenessProbe.initialDelaySeconds | int | `20` |  |
 | transformrouter.livenessProbe.path | string | `"/actuator/health"` |  |
 | transformrouter.livenessProbe.periodSeconds | int | `30` |  |
diff --git a/charts/alfresco-transform-service/values.yaml b/charts/alfresco-transform-service/values.yaml
index 8eac9626..5cc13edf 100644
--- a/charts/alfresco-transform-service/values.yaml
+++ b/charts/alfresco-transform-service/values.yaml
@@ -4,7 +4,7 @@ transformrouter:
   nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-transform-router
-    tag: 3.0.0
+    tag: 4.0.0
     pullPolicy: IfNotPresent
     internalPort: 8095
   service:
@@ -35,7 +35,6 @@ transformrouter:
     limits:
       cpu: "1"
       memory: "1Gi"
-
 pdfrenderer:
   enabled: true
   replicaCount: 2
@@ -77,7 +76,6 @@ pdfrenderer:
     livenessTransformPeriodSeconds: 600
     maxTransforms: 10000
     maxTransformSeconds: 1200
-
 imagemagick:
   enabled: true
   replicaCount: 2
@@ -119,7 +117,6 @@ imagemagick:
     livenessTransformPeriodSeconds: 600
     maxTransforms: 10000
     maxTransformSeconds: 900
-
 libreoffice:
   enabled: true
   replicaCount: 2
@@ -161,7 +158,6 @@ libreoffice:
     livenessTransformPeriodSeconds: 600
     maxTransforms: 99999
     maxTransformSeconds: 1800
-
 tika:
   enabled: true
   replicaCount: 2
@@ -203,7 +199,6 @@ tika:
     livenessTransformPeriodSeconds: 600
     maxTransforms: 10000
     maxTransformSeconds: 1800
-
 transformmisc:
   enabled: true
   replicaCount: 2
@@ -245,14 +240,13 @@ transformmisc:
     livenessTransformPeriodSeconds: 600
     maxTransforms: 10000
     maxTransformSeconds: 1800
-
 filestore:
   enabled: true
   replicaCount: 1
   nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-shared-file-store
-    tag: 3.0.0
+    tag: 4.0.0
     pullPolicy: IfNotPresent
     internalPort: 8099
   initContainer:
@@ -304,13 +298,12 @@ filestore:
     accessModes:
       - ReadWriteOnce
     # -- Bind PVC based on storageClass (e.g. dynamic provisionning)
-    storageClass:
+    storageClass: null
     # -- Use pre-provisioned pv through its claim (e.g. static provisionning)
     existingClaim: null
     data:
       mountPath: "/tmp/Alfresco"
       subPath: "alfresco-content-services/filestore-data"
-
 activemq:
   nameOverride: activemq
   enabled: false
@@ -322,7 +315,6 @@ activemq:
     user: admin
     # -- Default password for the embedded broker admin user
     password: admin
-
 # -- external activemq connection setting when activemq.enabled=false
 messageBroker:
   url: null
@@ -332,11 +324,9 @@ messageBroker:
   secretName: acs-alfresco-cs-brokersecret
   # -- Alternatively, provide credentials via an existing secret that contains BROKER_URL, BROKER_USERNAME and BROKER_PASSWORD keys
   existingSecretName: null
-
 ai:
   enabled: false
   nameOverride: alfresco-ai
-
 global:
   alfrescoRegistryPullSecrets: quay-registry-secret
   strategy:
diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml
index 198f364e..927a1580 100644
--- a/updatecli-matrix-targets.yaml
+++ b/updatecli-matrix-targets.yaml
@@ -9,7 +9,7 @@ matrix:
       pattern:
       image:
       helm_target: >-
-        charts/alfresco-search-services/values.yaml
+        charts/alfresco-search-service/values.yaml
       helm_keys:
         search: $.searchServicesImage.tag
         insight: $.insightEngineImage.tag