diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
index d5a3db278..e1ea37de0 100644
--- a/.github/workflows/helm-enterprise.yml
+++ b/.github/workflows/helm-enterprise.yml
@@ -116,9 +116,7 @@ jobs:
         run: |
           if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml" ]; then
             echo "Enabling clustered tests via auto-scaling: 2 replicas max, 10s stabilization window"
-            echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true \
-              --set alfresco-repository.autoscaling.maxReplicas=2 \
-              --set alfresco-repository.autoscaling.behavior.scaleUp.stabilizationWindowSeconds=10 \
+            echo "helm_install_params=--values test/autoscaling-hpa-test-values.yaml \
               --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT"
           fi
           if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then
diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock
index ddc0e90e5..9ec54b669 100644
--- a/helm/alfresco-content-services/Chart.lock
+++ b/helm/alfresco-content-services/Chart.lock
@@ -16,36 +16,36 @@ dependencies:
   version: 0.1.0
 - name: alfresco-repository
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 0.5.1
+  version: 0.6.0-alpha.0
 - name: activemq
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 3.5.3
 - name: alfresco-transform-service
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 1.3.2
+  version: 2.0.0-alpha.0
 - name: alfresco-search-service
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 3.3.1
 - name: alfresco-sync-service
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 5.2.3
+  version: 6.0.0-alpha.0
 - name: alfresco-search-enterprise
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.2.6
+  version: 4.0.0-alpha.0
 - name: alfresco-connector-msteams
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 0.5.1
+  version: 0.6.0-alpha.0
 - name: alfresco-share
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 0.6.1
+  version: 1.0.0-alpha.0
 - name: alfresco-connector-ms365
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 0.7.1
+  version: 1.0.0-alpha.0
 - name: alfresco-ai-transformer
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 1.2.3
+  version: 2.0.0-alpha.0
 - name: elasticsearch
   repository: https://helm.elastic.co
   version: 7.17.3
-digest: sha256:4eacdf946479b47b7276bfdf86ebb6b513266f0e293ed10eae66c495abbf9b78
-generated: "2024-06-04T12:18:05.816648+02:00"
+digest: sha256:01a9b9eb4f01b7693b7f7969df1fcd1fcc8ff988ecd60a330159f8c81111b395
+generated: "2024-06-18T16:13:45.778249+02:00"
diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml
index 37b7ce8c1..ca7a734a9 100644
--- a/helm/alfresco-content-services/Chart.yaml
+++ b/helm/alfresco-content-services/Chart.yaml
@@ -4,7 +4,7 @@
 # https://www.alfresco.com/platform/content-services-ecm/trial/download
 apiVersion: v2
 name: alfresco-content-services
-version: 8.2.0
+version: 8.3.0-alpha.0
 appVersion: 23.2.1
 description: A Helm chart for deploying Alfresco Content Services
 keywords:
@@ -41,14 +41,14 @@ dependencies:
     condition: >-
       alfresco-digital-workspace.enabled
   - name: alfresco-repository
-    version: 0.5.1
+    version: 0.6.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
   - name: activemq
     version: 3.5.3
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: activemq.enabled
   - name: alfresco-transform-service
-    version: 1.3.2
+    version: 2.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-transform-service.enabled
   - name: alfresco-search-service
@@ -58,27 +58,27 @@ dependencies:
     condition: alfresco-search.enabled
   - name: alfresco-sync-service
     repository: https://alfresco.github.io/alfresco-helm-charts/
-    version: 5.2.3
+    version: 6.0.0-alpha.0
     condition: alfresco-sync-service.enabled
   - name: alfresco-search-enterprise
-    version: 3.2.6
+    version: 4.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-search-enterprise.enabled
   - name: alfresco-connector-msteams
-    version: 0.5.1
+    version: 0.6.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-connector-msteams.enabled
   - name: alfresco-share
     alias: share
-    version: 0.6.1
+    version: 1.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: share.enabled
   - name: alfresco-connector-ms365
-    version: 0.7.1
+    version: 1.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-connector-ms365.enabled
   - name: alfresco-ai-transformer
-    version: 1.2.3
+    version: 2.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
     condition: alfresco-ai-transformer.enabled
   - name: elasticsearch
diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
index 8abe96cf3..1bcfeb31e 100644
--- a/helm/alfresco-content-services/README.md
+++ b/helm/alfresco-content-services/README.md
@@ -6,7 +6,7 @@ grand_parent: Helm
 
 # alfresco-content-services
 
-![Version: 8.2.0](https://img.shields.io/badge/Version-8.2.0-informational?style=flat-square) ![AppVersion: 23.2.1](https://img.shields.io/badge/AppVersion-23.2.1-informational?style=flat-square)
+![Version: 8.3.0-alpha.0](https://img.shields.io/badge/Version-8.3.0--alpha.0-informational?style=flat-square) ![AppVersion: 23.2.1](https://img.shields.io/badge/AppVersion-23.2.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Content Services
 
@@ -25,16 +25,16 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.5.3 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-control-center(alfresco-adf-app) | 0.1.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-digital-workspace(alfresco-adf-app) | 0.1.0 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-ai-transformer | 1.2.3 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-ai-transformer | 2.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.3 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.7.1 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.5.1 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.5.1 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 3.2.6 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 1.0.0-alpha.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.6.0-alpha.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.6.0-alpha.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 4.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 3.3.1 |
-| https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.6.1 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 5.2.3 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 1.3.2 |
+| https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 1.0.0-alpha.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 6.0.0-alpha.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 2.0.0-alpha.0 |
 | https://helm.elastic.co | elasticsearch | 7.17.3 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql-sync(postgresql) | 12.8.5 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 |
diff --git a/helm/alfresco-content-services/templates/_helpers-ats.tpl b/helm/alfresco-content-services/templates/_helpers-ats.tpl
index 61f439485..3d983e6dd 100644
--- a/helm/alfresco-content-services/templates/_helpers-ats.tpl
+++ b/helm/alfresco-content-services/templates/_helpers-ats.tpl
@@ -3,22 +3,22 @@ Local transformers config
 */}}
 {{- define "alfresco-content-services.localTransformConfig" -}}
 localTransform.core-aio.url=
-localTransform.pdfrenderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.name" . }}
-localTransform.imagemagick.url=http://{{ template "alfresco-transform-service.imagemagick.name" . }}
-localTransform.libreoffice.url=http://{{ template "alfresco-transform-service.libreoffice.name" . }}
-localTransform.tika.url=http://{{ template "alfresco-transform-service.tika.name" . }}
-localTransform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.name" . }}
+localTransform.pdfrenderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.fullname" . }}
+localTransform.imagemagick.url=http://{{ template "alfresco-transform-service.imagemagick.fullname" . }}
+localTransform.libreoffice.url=http://{{ template "alfresco-transform-service.libreoffice.fullname" . }}
+localTransform.tika.url=http://{{ template "alfresco-transform-service.tika.fullname" . }}
+localTransform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.fullname" . }}
 {{- end -}}
 
 {{/*
 ATS Tengines config
 */}}
 {{- define "alfresco-content-services.tengineConfig" -}}
-alfresco-pdf-renderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.name" . }}
-img.url=http://{{ template "alfresco-transform-service.imagemagick.name" . }}
-jodconverter.url=http://{{ template "alfresco-transform-service.libreoffice.name" . }}
-tika.url=http://{{ template "alfresco-transform-service.tika.name" . }}
-transform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.name" . }}
+alfresco-pdf-renderer.url=http://{{ template "alfresco-transform-service.pdfrenderer.fullname" . }}
+img.url=http://{{ template "alfresco-transform-service.imagemagick.fullname" . }}
+jodconverter.url=http://{{ template "alfresco-transform-service.libreoffice.fullname" . }}
+tika.url=http://{{ template "alfresco-transform-service.tika.fullname" . }}
+transform.misc.url=http://{{ template "alfresco-transform-service.transform-misc.fullname" . }}
 {{- end -}}
 
 {{/*
@@ -30,8 +30,8 @@ Get Alfresco Content Service configuration for Alfresco Transform Service
 {{- if and $atsCtx.Values.filestore.enabled $atsCtx.Values.transformrouter.enabled }}
 {{- $routerCtx := (dict "Values" (dict "nameOverride" "router" ) "Chart" .Chart "Release" .Release) }}
 {{- $sfsCtx := (dict "Values" (dict "nameOverride" "filestore" ) "Chart" .Chart "Release" .Release) }}
-transform.service.url=http://{{ template "alfresco-transform-service.transform-router.name" $atsCtx }}
-sfs.url=http://{{ template "alfresco-transform-service.filestore.name" $atsCtx }}
+transform.service.url=http://{{ template "alfresco-transform-service.transform-router.fullname" $atsCtx }}
+sfs.url=http://{{ template "alfresco-transform-service.filestore.fullname" $atsCtx }}
 {{ template "alfresco-content-services.tengineConfig" $atsCtx }}
 {{- end }}
 {{- end }}
diff --git a/helm/alfresco-content-services/templates/config-infrastructure.yaml b/helm/alfresco-content-services/templates/config-infrastructure.yaml
index d37a3756f..1c12fb7e6 100644
--- a/helm/alfresco-content-services/templates/config-infrastructure.yaml
+++ b/helm/alfresco-content-services/templates/config-infrastructure.yaml
@@ -58,8 +58,8 @@ data:
   {{- with (index .Values "alfresco-transform-service") }}
   {{- $atsCtx := dict "Values" . "Chart" $.Chart "Release" $.Release }}
   {{- if and .enabled .filestore.enabled .transformrouter.enabled }}
-  SFS_URL: {{ template "alfresco-common.sfs.fullurl" (printf "http://%s" (include "alfresco-transform-service.filestore.name" $atsCtx)) }}
-    {{- $ats_baseurl := (printf "http://%s" (include "alfresco-transform-service.transform-router.name" $atsCtx)) }}
+  SFS_URL: {{ template "alfresco-common.sfs.fullurl" (printf "http://%s" (include "alfresco-transform-service.filestore.fullname" $atsCtx)) }}
+    {{- $ats_baseurl := (printf "http://%s" (include "alfresco-transform-service.transform-router.fullname" $atsCtx)) }}
     {{- if index $.Values "alfresco-search-enterprise" "enabled" }}
       {{- include "alfresco-search-enterprise.ats.fullurl" $ats_baseurl | nindent 2 }}
     {{- end }}
diff --git a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-im.yaml b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-im.yaml
index 0cb1ca2b5..4c6781c56 100644
--- a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-im.yaml
+++ b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-im.yaml
@@ -11,7 +11,7 @@ metadata:
   name: {{ printf "%s-tengine-im" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
 spec:
   scaleTargetRef:
-    name: {{ template "alfresco-transform-service.imagemagick.name" $atsCtx }}
+    name: {{ template "alfresco-transform-service.imagemagick.fullname" $atsCtx }}
   triggers:
   {{- $destQ := "org.alfresco.transform.engine.imagemagick.acs" }}
   {{- $targetQSize := $atsCtx.Values.imagemagick.autoscaling.kedaTargetValue | default 10 | toString }}
diff --git a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-lo.yaml b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-lo.yaml
index 5e71cf53c..a9ea66015 100644
--- a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-lo.yaml
+++ b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-lo.yaml
@@ -11,7 +11,7 @@ metadata:
   name: {{ printf "%s-tengine-lo" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
 spec:
   scaleTargetRef:
-    name: {{ template "alfresco-transform-service.libreoffice.name" $atsCtx }}
+    name: {{ template "alfresco-transform-service.libreoffice.fullname" $atsCtx }}
   triggers:
   {{- $destQ := "org.alfresco.transform.engine.libreoffice.acs" }}
   {{- $targetQSize := $atsCtx.Values.libreoffice.autoscaling.kedaTargetValue | default 10 | toString }}
diff --git a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-misc.yaml b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-misc.yaml
index 30643157e..425d28fec 100644
--- a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-misc.yaml
+++ b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-misc.yaml
@@ -11,7 +11,7 @@ metadata:
   name: {{ printf "%s-tengine-misc" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
 spec:
   scaleTargetRef:
-    name: {{ template "alfresco-transform-service.transform-misc.name" $atsCtx }}
+    name: {{ template "alfresco-transform-service.transform-misc.fullname" $atsCtx }}
   triggers:
   {{- $destQ := "org.alfresco.transform.engine.misc.acs" }}
   {{- $targetQSize := $atsCtx.Values.transformmisc.autoscaling.kedaTargetValue | default 10 | toString }}
diff --git a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-pdf.yaml b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-pdf.yaml
index a6c2e6ec8..a7a85a358 100644
--- a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-pdf.yaml
+++ b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-pdf.yaml
@@ -11,7 +11,7 @@ metadata:
   name: {{ printf "%s-tengine-pdfrenderer" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
 spec:
   scaleTargetRef:
-    name: {{ template "alfresco-transform-service.pdfrenderer.name" $atsCtx }}
+    name: {{ template "alfresco-transform-service.pdfrenderer.fullname" $atsCtx }}
   triggers:
   {{- $destQ := "org.alfresco.transform.engine.alfresco-pdf-renderer.acs" }}
   {{- $targetQSize := $atsCtx.Values.pdfrenderer.autoscaling.kedaTargetValue | default 10 | toString }}
diff --git a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-tika.yaml b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-tika.yaml
index 20428d1d3..59bc96bb4 100644
--- a/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-tika.yaml
+++ b/helm/alfresco-content-services/templates/keda/scaler-activemq-ats-tika.yaml
@@ -11,7 +11,7 @@ metadata:
   name: {{ printf "%s-tengine-tika" (include "alfresco-content-services.fullname" $atsCtx) | trunc 63 | trimSuffix "-" }}
 spec:
   scaleTargetRef:
-    name: {{ template "alfresco-transform-service.tika.name" $atsCtx }}
+    name: {{ template "alfresco-transform-service.tika.fullname" $atsCtx }}
   triggers:
   {{- $destQ := "org.alfresco.transform.engine.tika.acs" }}
   {{- $targetQSize := $atsCtx.Values.tika.autoscaling.kedaTargetValue | default 10 | toString }}
diff --git a/test/autoscaling-hpa-test-values.yaml b/test/autoscaling-hpa-test-values.yaml
new file mode 100644
index 000000000..0033d8e3c
--- /dev/null
+++ b/test/autoscaling-hpa-test-values.yaml
@@ -0,0 +1,8 @@
+---
+alfresco-repository:
+  autoscaling:
+    enabled: true
+    maxReplicas: 2
+    behavior:
+      scaleUp:
+        stabilizationWindowSeconds: 10