diff --git a/docs/helm/autoscaling.md b/docs/helm/autoscaling.md
index 5529fe25b..c159cc23e 100644
--- a/docs/helm/autoscaling.md
+++ b/docs/helm/autoscaling.md
@@ -119,7 +119,7 @@ In the same maner the parameters below can be set:
 
 Refer to the
 [alfresco-repository auto-scaling
-documentation](https://github.com/Alfresco/alfresco-helm-charts/blob/main/charts/alfresco-transform-service/docs/autoscaling.md)
+documentation](https://alfresco.github.io/alfresco-helm-charts/charts/alfresco-transform-service/docs/autoscaling.html)
 for a detailed guide on Alfresco repository auto-scaling configuration and
 implications.
 
diff --git a/helm/alfresco-content-services/templates/_helpers-keda.tpl b/helm/alfresco-content-services/templates/keda/_helpers-keda.tpl
similarity index 100%
rename from helm/alfresco-content-services/templates/_helpers-keda.tpl
rename to helm/alfresco-content-services/templates/keda/_helpers-keda.tpl
diff --git a/helm/alfresco-content-services/templates/keda-auth-trigger-activemq.yaml b/helm/alfresco-content-services/templates/keda/auth-trigger-activemq.yaml
similarity index 100%
rename from helm/alfresco-content-services/templates/keda-auth-trigger-activemq.yaml
rename to helm/alfresco-content-services/templates/keda/auth-trigger-activemq.yaml
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
similarity index 100%
rename from helm/alfresco-content-services/templates/keda-scaler-activemq-ats-im.yaml
rename to helm/alfresco-content-services/templates/keda/scaler-activemq-ats-im.yaml
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
similarity index 100%
rename from helm/alfresco-content-services/templates/keda-scaler-activemq-ats-lo.yaml
rename to helm/alfresco-content-services/templates/keda/scaler-activemq-ats-lo.yaml
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
similarity index 100%
rename from helm/alfresco-content-services/templates/keda-scaler-activemq-ats-misc.yaml
rename to helm/alfresco-content-services/templates/keda/scaler-activemq-ats-misc.yaml
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
similarity index 100%
rename from helm/alfresco-content-services/templates/keda-scaler-activemq-ats-pdf.yaml
rename to helm/alfresco-content-services/templates/keda/scaler-activemq-ats-pdf.yaml
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
similarity index 100%
rename from helm/alfresco-content-services/templates/keda-scaler-activemq-ats-tika.yaml
rename to helm/alfresco-content-services/templates/keda/scaler-activemq-ats-tika.yaml
diff --git a/helm/alfresco-content-services/templates/keda-scaler-prometheus-repo.yaml b/helm/alfresco-content-services/templates/keda/scaler-prometheus-repo.yaml
similarity index 100%
rename from helm/alfresco-content-services/templates/keda-scaler-prometheus-repo.yaml
rename to helm/alfresco-content-services/templates/keda/scaler-prometheus-repo.yaml