diff --git a/charts/activemq/Chart.yaml b/charts/activemq/Chart.yaml
index bd56d66b7..e94d1e0e3 100644
--- a/charts/activemq/Chart.yaml
+++ b/charts/activemq/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
 name: activemq
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 3.5.5
+version: 3.6.0-alpha.0
 appVersion: 5.18.5
 dependencies:
   - name: alfresco-common
diff --git a/charts/activemq/README.md b/charts/activemq/README.md
index 065f84469..e61904be0 100644
--- a/charts/activemq/README.md
+++ b/charts/activemq/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # activemq
 
-![Version: 3.5.5](https://img.shields.io/badge/Version-3.5.5-informational?style=flat-square) ![AppVersion: 5.18.5](https://img.shields.io/badge/AppVersion-5.18.5-informational?style=flat-square)
+![Version: 3.6.0-alpha.0](https://img.shields.io/badge/Version-3.6.0--alpha.0-informational?style=flat-square) ![AppVersion: 5.18.5](https://img.shields.io/badge/AppVersion-5.18.5-informational?style=flat-square)
 
 A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate ACS (not meant to be used in production).
 
@@ -34,6 +34,7 @@ A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate A
 | livenessProbe.failureThreshold | int | `6` |  |
 | livenessProbe.initialDelaySeconds | int | `60` |  |
 | livenessProbe.periodSeconds | int | `10` |  |
+| livenessProbe.tcpSocket.port | string | `"openwire"` |  |
 | livenessProbe.timeoutSeconds | int | `1` |  |
 | nodeSelector | object | `{}` |  |
 | persistence.accessModes | list | `["ReadWriteOnce"]` | defines type of access required by the persistent volume [Access_Modes] (https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) |
@@ -49,6 +50,7 @@ A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate A
 | readinessProbe.failureThreshold | int | `6` |  |
 | readinessProbe.initialDelaySeconds | int | `5` |  |
 | readinessProbe.periodSeconds | int | `10` |  |
+| readinessProbe.tcpSocket.port | string | `"openwire"` |  |
 | readinessProbe.timeoutSeconds | int | `1` |  |
 | replicaCount | int | `1` |  |
 | resources.limits.cpu | string | `"2"` |  |
diff --git a/charts/activemq/templates/deployment-activemq.yaml b/charts/activemq/templates/deployment-activemq.yaml
index a0d124694..5f1917dab 100755
--- a/charts/activemq/templates/deployment-activemq.yaml
+++ b/charts/activemq/templates/deployment-activemq.yaml
@@ -55,21 +55,12 @@ spec:
           containerPort: {{ .Values.services.broker.ports.internal.amqp | default 5672 }}
         - name: web-console
           containerPort: {{ .Values.services.webConsole.ports.internal.webConsole | default 8161 }}
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.services.broker.ports.internal.openwire | default 61616 }}
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
         livenessProbe:
-          tcpSocket:
-            port: {{ .Values.services.broker.ports.internal.openwire | default 61616 }}
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
-        resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- toYaml .Values.livenessProbe | nindent 12 }}
+        readinessProbe:
+          {{- toYaml .Values.readinessProbe | nindent 12 }}
+        resources:
+          {{- toYaml .Values.resources | nindent 12 }}
         volumeMounts:
           - name: data
             mountPath: {{ .Values.persistence.data.mountPath }}
diff --git a/charts/activemq/values.yaml b/charts/activemq/values.yaml
index 7a40dba70..7659d7120 100644
--- a/charts/activemq/values.yaml
+++ b/charts/activemq/values.yaml
@@ -50,11 +50,15 @@ readinessProbe:
   periodSeconds: 10
   timeoutSeconds: 1
   failureThreshold: 6
+  tcpSocket:
+    port: openwire
 livenessProbe:
   initialDelaySeconds: 60
   periodSeconds: 10
   timeoutSeconds: 1
   failureThreshold: 6
+  tcpSocket:
+    port: openwire
 persistence:
   enabled: true
   baseSize: 20Gi
diff --git a/charts/alfresco-adf-app/Chart.yaml b/charts/alfresco-adf-app/Chart.yaml
index 5c6613156..0359bfc2a 100644
--- a/charts/alfresco-adf-app/Chart.yaml
+++ b/charts/alfresco-adf-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-adf-app
 description: A generic Alfresco Development Framework Helm chart for Kubernetes
 type: application
-version: 0.1.1
+version: 0.2.0-alpha.0
 dependencies:
   - name: alfresco-common
     version: 3.1.3
diff --git a/charts/alfresco-adf-app/README.md b/charts/alfresco-adf-app/README.md
index b841eb54c..9b18bc403 100644
--- a/charts/alfresco-adf-app/README.md
+++ b/charts/alfresco-adf-app/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-adf-app
 
-![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)
+![Version: 0.2.0-alpha.0](https://img.shields.io/badge/Version-0.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A generic Alfresco Development Framework Helm chart for Kubernetes
 
@@ -36,20 +36,32 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
+| livenessProbe.failureThreshold | int | `3` |  |
+| livenessProbe.httpGet.path | string | `"/"` |  |
+| livenessProbe.httpGet.port | string | `"http"` |  |
+| livenessProbe.initialDelaySeconds | int | `0` |  |
+| livenessProbe.periodSeconds | int | `10` |  |
+| livenessProbe.timeoutSeconds | int | `1` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
 | podLabels | object | `{}` |  |
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
 | podSecurityContext.runAsUser | int | `101` | Retrocompat with Activiti Common chart |
+| readinessProbe.failureThreshold | int | `3` |  |
+| readinessProbe.httpGet.path | string | `"/"` |  |
+| readinessProbe.httpGet.port | string | `"http"` |  |
+| readinessProbe.initialDelaySeconds | int | `0` |  |
+| readinessProbe.periodSeconds | int | `10` |  |
+| readinessProbe.timeoutSeconds | int | `1` |  |
 | replicaCount | int | `1` |  |
 | resources.limits.cpu | string | `"100m"` |  |
 | resources.limits.memory | string | `"128Mi"` |  |
 | resources.requests.cpu | string | `"100m"` |  |
 | resources.requests.memory | string | `"128Mi"` |  |
 | securityContext | object | `{}` |  |
-| service.port | int | `80` |  |
-| service.targetPort | int | `8080` |  |
+| service.port | int | `8080` |  |
+| service.targetPort | string | `"http"` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |
diff --git a/charts/alfresco-adf-app/templates/deployment.yaml b/charts/alfresco-adf-app/templates/deployment.yaml
index 7ec1bdbd5..b802e6d1b 100644
--- a/charts/alfresco-adf-app/templates/deployment.yaml
+++ b/charts/alfresco-adf-app/templates/deployment.yaml
@@ -41,13 +41,9 @@ spec:
               containerPort: {{ .Values.service.port }}
               protocol: TCP
           livenessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.targetPort }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.targetPort }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.volumeMounts }}
diff --git a/charts/alfresco-adf-app/values.yaml b/charts/alfresco-adf-app/values.yaml
index 75d54776b..86d0388f7 100644
--- a/charts/alfresco-adf-app/values.yaml
+++ b/charts/alfresco-adf-app/values.yaml
@@ -32,8 +32,8 @@ securityContext: {}
 
 service:
   type: ClusterIP
-  port: 80
-  targetPort: 8080
+  port: 8080
+  targetPort: http
 
 ingress:
   enabled: true
@@ -46,6 +46,24 @@ ingress:
           pathType: Prefix
   tls: []
 
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 0
+  periodSeconds: 10
+  timeoutSeconds: 1
+  failureThreshold: 3
+
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 0
+  periodSeconds: 10
+  timeoutSeconds: 1
+  failureThreshold: 3
+
 resources:
   limits:
     cpu: 100m
diff --git a/charts/alfresco-ai-transformer/Chart.yaml b/charts/alfresco-ai-transformer/Chart.yaml
index a8835b8d0..0b9272024 100644
--- a/charts/alfresco-ai-transformer/Chart.yaml
+++ b/charts/alfresco-ai-transformer/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-ai-transformer
 description: A Helm chart for deploying Alfresco ai transformer service
 type: application
-version: 2.0.1
+version: 3.0.0-alpha.0
 appVersion: 3.1.6
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-ai-transformer/README.md b/charts/alfresco-ai-transformer/README.md
index 1a3a096c8..9de5d6b87 100644
--- a/charts/alfresco-ai-transformer/README.md
+++ b/charts/alfresco-ai-transformer/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-ai-transformer
 
-![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.6](https://img.shields.io/badge/AppVersion-3.1.6-informational?style=flat-square)
+![Version: 3.0.0-alpha.0](https://img.shields.io/badge/Version-3.0.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.6](https://img.shields.io/badge/AppVersion-3.1.6-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco ai transformer service
 
@@ -47,11 +47,10 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` |  |
 | image.tag | string | `"3.1.6"` |  |
+| livenessProbe.failureThreshold | int | `1` |  |
+| livenessProbe.httpGet.path | string | `"/live"` |  |
+| livenessProbe.httpGet.port | string | `"service-port"` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
-| livenessProbe.livenessPercent | int | `400` |  |
-| livenessProbe.livenessTransformPeriodSeconds | int | `600` |  |
-| livenessProbe.maxTransformSeconds | int | `1800` |  |
-| livenessProbe.maxTransforms | int | `10000` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
 | messageBroker.existingConfigMap | object | `{"keys":{"url":"BROKER_URL"},"name":null}` | Alternatively, provide credentials via an existing secret and set the keys as they are given |
@@ -63,6 +62,9 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | messageBroker.user | string | `nil` |  |
 | nodeSelector | object | `{}` |  |
 | podSecurityContext.runAsUser | int | `33015` |  |
+| readinessProbe.failureThreshold | int | `3` |  |
+| readinessProbe.httpGet.path | string | `"/ready"` |  |
+| readinessProbe.httpGet.port | string | `"service-port"` |  |
 | readinessProbe.initialDelaySeconds | int | `20` |  |
 | readinessProbe.periodSeconds | int | `60` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |
@@ -84,4 +86,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | strategy.rollingUpdate.maxUnavailable | int | `0` |  |
 | tags.ci | bool | `false` | A chart tag used for Hyland's CI purpose. Do not set it to true. |
 | tolerations | list | `[]` |  |
+| transformerLiveness.livenessPercent | int | `400` |  |
+| transformerLiveness.livenessTransformPeriodSeconds | int | `600` |  |
+| transformerLiveness.maxTransformSeconds | int | `1800` |  |
+| transformerLiveness.maxTransforms | int | `10000` |  |
 | trouter.pipelines | list | See | List of transformer pipelines the ATS router can advertise when using AI To get more details abous pipeline configuration check https://docs.alfresco.com/transform-service/latest/config/#transform-pipelines https://github.com/Alfresco/alfresco-ai-renditions/blob/master/ai-renditions/docker-compose/ai-pipeline-routes.json |
diff --git a/charts/alfresco-ai-transformer/templates/config-ai-transformer.yaml b/charts/alfresco-ai-transformer/templates/config-ai-transformer.yaml
index 61728bb6f..30f82730b 100644
--- a/charts/alfresco-ai-transformer/templates/config-ai-transformer.yaml
+++ b/charts/alfresco-ai-transformer/templates/config-ai-transformer.yaml
@@ -8,7 +8,7 @@ data:
   {{- range $key, $val := .Values.environment }}
   {{ $key }}: {{ $val | quote }}
   {{- end }}
-  livenessPercent: "{{ .Values.livenessProbe.livenessPercent }}"
-  livenessTransformPeriodSeconds: "{{ .Values.livenessProbe.livenessTransformPeriodSeconds }}"
-  maxTransforms: "{{ .Values.livenessProbe.maxTransforms }}"
-  maxTransformSeconds: "{{ .Values.livenessProbe.maxTransformSeconds }}"
+  livenessPercent: "{{ .Values.transformerLiveness.livenessPercent }}"
+  livenessTransformPeriodSeconds: "{{ .Values.transformerLiveness.livenessTransformPeriodSeconds }}"
+  maxTransforms: "{{ .Values.transformerLiveness.maxTransforms }}"
+  maxTransformSeconds: "{{ .Values.transformerLiveness.maxTransformSeconds }}"
diff --git a/charts/alfresco-ai-transformer/templates/deployment-ai-transformer.yaml b/charts/alfresco-ai-transformer/templates/deployment-ai-transformer.yaml
index 9d328c1f3..5bfc53764 100644
--- a/charts/alfresco-ai-transformer/templates/deployment-ai-transformer.yaml
+++ b/charts/alfresco-ai-transformer/templates/deployment-ai-transformer.yaml
@@ -80,26 +80,16 @@ spec:
                   key: {{ .Values.aws.existingConfigMap.keys.comprehendRoleARN }}
 
           ports:
-            - containerPort: {{ .Values.image.internalPort }}
+            - name: service-port
+              containerPort: {{ .Values.image.internalPort }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /ready
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           livenessProbe:
-            httpGet:
-              path: /live
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            failureThreshold: 1
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           {{- if .Values.command }}
           command:
             {{- toYaml .Values.command | nindent 12 }}
diff --git a/charts/alfresco-ai-transformer/values.yaml b/charts/alfresco-ai-transformer/values.yaml
index 5dc356267..0b34fdbe1 100644
--- a/charts/alfresco-ai-transformer/values.yaml
+++ b/charts/alfresco-ai-transformer/values.yaml
@@ -36,13 +36,22 @@ environment:
     -XX:MinRAMPercentage=50
     -XX:MaxRAMPercentage=80
 readinessProbe:
+  httpGet:
+    path: /ready
+    port: service-port
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 10
+  failureThreshold: 3
 livenessProbe:
+  httpGet:
+    path: /live
+    port: service-port
   initialDelaySeconds: 10
   periodSeconds: 20
   timeoutSeconds: 10
+  failureThreshold: 1
+transformerLiveness:
   livenessPercent: 400
   livenessTransformPeriodSeconds: 600
   maxTransforms: 10000
diff --git a/charts/alfresco-connector-ms365/Chart.yaml b/charts/alfresco-connector-ms365/Chart.yaml
index 3ba4b35c1..77d798134 100644
--- a/charts/alfresco-connector-ms365/Chart.yaml
+++ b/charts/alfresco-connector-ms365/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-connector-ms365
 description: A Helm chart for deploying Alfresco connector ms365 service
 type: application
-version: 2.1.0
+version: 2.2.0-alpha.0
 appVersion: 2.0.3
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-connector-ms365/README.md b/charts/alfresco-connector-ms365/README.md
index e2c1b86dd..ce2ea7110 100644
--- a/charts/alfresco-connector-ms365/README.md
+++ b/charts/alfresco-connector-ms365/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-connector-ms365
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
+![Version: 2.2.0-alpha.0](https://img.shields.io/badge/Version-2.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector ms365 service
 
@@ -36,7 +36,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
-| livenessProbe.tcpSocket.port | int | `9095` |  |
+| livenessProbe.tcpSocket.port | string | `"service-port"` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
@@ -45,7 +45,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | podSecurityContext.runAsUser | int | `33006` |  |
 | readinessProbe.initialDelaySeconds | int | `20` |  |
 | readinessProbe.periodSeconds | int | `60` |  |
-| readinessProbe.tcpSocket.port | int | `9095` |  |
+| readinessProbe.tcpSocket.port | string | `"service-port"` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |
 | replicaCount | int | `2` |  |
 | repository.existingConfigMap.keys.host | string | `"REPO_HOST"` | name of the key in the configMap where to find the repository service host |
diff --git a/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml b/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml
index dd2c03fb3..edeae98d3 100644
--- a/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml
+++ b/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml
@@ -34,7 +34,8 @@ spec:
           env:
             {{- include "alfresco-connector-ms365.env" $ | indent 12 }}
           ports:
-              - containerPort: {{ .Values.image.internalPort }}
+            - name: service-port
+              containerPort: {{ .Values.image.internalPort }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
diff --git a/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml b/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
index 310504401..0c0450c1e 100644
--- a/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
+++ b/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
@@ -103,7 +103,7 @@ tests:
           path: spec.template.spec.containers[0].readinessProbe
           value:
             tcpSocket:
-              port: 9095
+              port: service-port
             initialDelaySeconds: 20
             periodSeconds: 60
             timeoutSeconds: 10
@@ -111,7 +111,7 @@ tests:
           path: spec.template.spec.containers[0].livenessProbe
           value:
             tcpSocket:
-              port: 9095
+              port: service-port
             initialDelaySeconds: 10
             periodSeconds: 20
             failureThreshold: 1
diff --git a/charts/alfresco-connector-ms365/values.yaml b/charts/alfresco-connector-ms365/values.yaml
index 71dfe6127..f8cbe4f06 100644
--- a/charts/alfresco-connector-ms365/values.yaml
+++ b/charts/alfresco-connector-ms365/values.yaml
@@ -74,13 +74,13 @@ resources:
 environment: {}
 readinessProbe:
   tcpSocket:
-    port: 9095
+    port: service-port
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 10
 livenessProbe:
   tcpSocket:
-    port: 9095
+    port: service-port
   initialDelaySeconds: 10
   periodSeconds: 20
   failureThreshold: 1
diff --git a/charts/alfresco-connector-msteams/Chart.yaml b/charts/alfresco-connector-msteams/Chart.yaml
index 74fae5ef6..c3b42af24 100644
--- a/charts/alfresco-connector-msteams/Chart.yaml
+++ b/charts/alfresco-connector-msteams/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-connector-msteams
 description: A Helm chart for deploying Alfresco connector msteams service
 type: application
-version: 1.1.0
+version: 1.2.0-alpha.0
 appVersion: 2.0.3
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-connector-msteams/README.md b/charts/alfresco-connector-msteams/README.md
index de4c94539..77a9b3326 100644
--- a/charts/alfresco-connector-msteams/README.md
+++ b/charts/alfresco-connector-msteams/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-connector-msteams
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
+![Version: 1.2.0-alpha.0](https://img.shields.io/badge/Version-1.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector msteams service
 
@@ -39,7 +39,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
-| livenessProbe.tcpSocket.port | int | `3978` |  |
+| livenessProbe.tcpSocket.port | string | `"service-port"` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
 | microsoft.app.existingSecret.keys.id | string | `"MICROSOFT_APP_ID"` |  |
 | microsoft.app.existingSecret.keys.password | string | `"MICROSOFT_APP_PASSWORD"` |  |
@@ -52,7 +52,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | podSecurityContext.runAsUser | int | `33041` |  |
 | readinessProbe.initialDelaySeconds | int | `20` |  |
 | readinessProbe.periodSeconds | int | `60` |  |
-| readinessProbe.tcpSocket.port | int | `3978` |  |
+| readinessProbe.tcpSocket.port | string | `"service-port"` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |
 | replicaCount | int | `2` |  |
 | repository.existingConfigMap.keys.url | string | `"ALFRESCO_BASE_URL"` | Key within the configmap holding the full url to connect to the alfresco repository |
diff --git a/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml b/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml
index 8f7aaee78..e73ea2ae7 100644
--- a/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml
+++ b/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml
@@ -43,7 +43,8 @@ spec:
             {{- include "alfresco-connector-msteams.repo-msteams.env" $ | nindent 12 }}
             {{- include "alfresco-connector-msteams.secret-msteams.env" $ | nindent 12 }}
           ports:
-              - containerPort: {{ .Values.image.internalPort }}
+            - name: service-port
+              containerPort: {{ .Values.image.internalPort }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
diff --git a/charts/alfresco-connector-msteams/tests/deployment-connector-msteams_test.yaml b/charts/alfresco-connector-msteams/tests/deployment-connector-msteams_test.yaml
index 46152ed8c..0cfade28d 100644
--- a/charts/alfresco-connector-msteams/tests/deployment-connector-msteams_test.yaml
+++ b/charts/alfresco-connector-msteams/tests/deployment-connector-msteams_test.yaml
@@ -160,7 +160,7 @@ tests:
         path: spec.template.spec.containers[0].readinessProbe
         value:
           tcpSocket:
-            port: 3978
+            port: service-port
           initialDelaySeconds: 20
           periodSeconds: 60
           timeoutSeconds: 10
@@ -168,7 +168,7 @@ tests:
         path: spec.template.spec.containers[0].livenessProbe
         value:
           tcpSocket:
-            port: 3978
+            port: service-port
           initialDelaySeconds: 10
           periodSeconds: 20
           failureThreshold: 1
diff --git a/charts/alfresco-connector-msteams/values.yaml b/charts/alfresco-connector-msteams/values.yaml
index b23c9727e..23ac59577 100644
--- a/charts/alfresco-connector-msteams/values.yaml
+++ b/charts/alfresco-connector-msteams/values.yaml
@@ -33,13 +33,13 @@ resources:
     memory: "1000Mi"
 readinessProbe:
   tcpSocket:
-    port: 3978
+    port: service-port
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 10
 livenessProbe:
   tcpSocket:
-    port: 3978
+    port: service-port
   initialDelaySeconds: 10
   failureThreshold: 1
   periodSeconds: 20
diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
index b5f02ea1f..ba3e07c37 100644
--- a/charts/alfresco-search-enterprise/Chart.yaml
+++ b/charts/alfresco-search-enterprise/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: alfresco-search-enterprise
 description: A Helm chart for deploying Alfresco Elasticsearch connector
 type: application
-version: 4.2.0-alpha.0
+version: 4.2.0-alpha.1
 appVersion: 4.1.0
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
index 64d77ef9f..b718cc599 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-search-enterprise
 
-![Version: 4.2.0-alpha.0](https://img.shields.io/badge/Version-4.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)
+![Version: 4.2.0-alpha.1](https://img.shields.io/badge/Version-4.2.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Elasticsearch connector
 
@@ -40,6 +40,14 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | liveIndexing.content.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.content.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-content"` |  |
 | liveIndexing.content.image.tag | string | `"4.1.0"` |  |
+| liveIndexing.content.livenessProbe.httpGet.path | string | `"/actuator/health"` |  |
+| liveIndexing.content.livenessProbe.httpGet.port | string | `"http"` |  |
+| liveIndexing.content.livenessProbe.initialDelaySeconds | int | `300` |  |
+| liveIndexing.content.livenessProbe.timeoutSeconds | int | `60` |  |
+| liveIndexing.content.readinessProbe.httpGet.path | string | `"/actuator/health"` |  |
+| liveIndexing.content.readinessProbe.httpGet.port | string | `"http"` |  |
+| liveIndexing.content.readinessProbe.initialDelaySeconds | int | `60` |  |
+| liveIndexing.content.readinessProbe.timeoutSeconds | int | `60` |  |
 | liveIndexing.content.replicaCount | int | `1` |  |
 | liveIndexing.environment | object | `{}` | Set environment variables for all the live indexing components (mediation, content, metadata, path) |
 | liveIndexing.mediation.environment | object | `{}` | Set environment variables for the mediation component |
@@ -52,6 +60,14 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | liveIndexing.metadata.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.metadata.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-metadata"` |  |
 | liveIndexing.metadata.image.tag | string | `"4.1.0"` |  |
+| liveIndexing.metadata.livenessProbe.httpGet.path | string | `"/actuator/health"` |  |
+| liveIndexing.metadata.livenessProbe.httpGet.port | string | `"http"` |  |
+| liveIndexing.metadata.livenessProbe.initialDelaySeconds | int | `300` |  |
+| liveIndexing.metadata.livenessProbe.timeoutSeconds | int | `60` |  |
+| liveIndexing.metadata.readinessProbe.httpGet.path | string | `"/actuator/health"` |  |
+| liveIndexing.metadata.readinessProbe.httpGet.port | string | `"http"` |  |
+| liveIndexing.metadata.readinessProbe.initialDelaySeconds | int | `60` |  |
+| liveIndexing.metadata.readinessProbe.timeoutSeconds | int | `60` |  |
 | liveIndexing.metadata.replicaCount | int | `1` |  |
 | liveIndexing.path.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0] | object | `{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app.kubernetes.io/name","operator":"In","values":["{{ template \"alfresco-search-enterprise.path.name\" $ }}"]},{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ $.Release.Name }}"]},{"key":"app.kubernetes.io/component","operator":"In","values":["{{ $.Chart.Name }}"]}]},"topologyKey":"topology.kubernetes.io/zone"},"weight":10}` | Prefer to schedule the content pod on a different zone |
 | liveIndexing.path.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[1] | object | `{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app.kubernetes.io/name","operator":"In","values":["{{ template \"alfresco-search-enterprise.path.name\" $ }}"]},{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ $.Release.Name }}"]},{"key":"app.kubernetes.io/component","operator":"In","values":["{{ $.Chart.Name }}"]}]},"topologyKey":"kubernetes.io/hostname"},"weight":5}` | Prefer to schedule the content pod on a different node |
@@ -59,6 +75,14 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | liveIndexing.path.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.path.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-path"` |  |
 | liveIndexing.path.image.tag | string | `"4.1.0"` |  |
+| liveIndexing.path.livenessProbe.httpGet.path | string | `"/actuator/health"` |  |
+| liveIndexing.path.livenessProbe.httpGet.port | string | `"http"` |  |
+| liveIndexing.path.livenessProbe.initialDelaySeconds | int | `300` |  |
+| liveIndexing.path.livenessProbe.timeoutSeconds | int | `60` |  |
+| liveIndexing.path.readinessProbe.httpGet.path | string | `"/actuator/health"` |  |
+| liveIndexing.path.readinessProbe.httpGet.port | string | `"http"` |  |
+| liveIndexing.path.readinessProbe.initialDelaySeconds | int | `60` |  |
+| liveIndexing.path.readinessProbe.timeoutSeconds | int | `60` |  |
 | 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 |
diff --git a/charts/alfresco-search-enterprise/templates/deployment.yaml b/charts/alfresco-search-enterprise/templates/deployment.yaml
index 044b0937d..eb35ff01c 100644
--- a/charts/alfresco-search-enterprise/templates/deployment.yaml
+++ b/charts/alfresco-search-enterprise/templates/deployment.yaml
@@ -60,17 +60,9 @@ spec:
               containerPort: 8080
               protocol: TCP
           livenessProbe:
-            initialDelaySeconds: 300
-            timeoutSeconds: 60
-            httpGet:
-              path: /actuator/health
-              port: http
+            {{- toYaml $service.livenessProbe | nindent 12 }}
           readinessProbe:
-            initialDelaySeconds: 60
-            timeoutSeconds: 60
-            httpGet:
-              path: /actuator/health
-              port: http
+            {{- toYaml $service.readinessProbe | nindent 12 }}
           resources: {{- toYaml $.Values.resources | nindent 12 }}
       {{- with $.Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/alfresco-search-enterprise/values.yaml b/charts/alfresco-search-enterprise/values.yaml
index 39e058e88..769ab8015 100644
--- a/charts/alfresco-search-enterprise/values.yaml
+++ b/charts/alfresco-search-enterprise/values.yaml
@@ -39,6 +39,18 @@ liveIndexing:
     replicaCount: 1
     # -- Set environment variables for the content component
     environment: {}
+    livenessProbe:
+      initialDelaySeconds: 300
+      timeoutSeconds: 60
+      httpGet:
+        path: /actuator/health
+        port: http
+    readinessProbe:
+      initialDelaySeconds: 60
+      timeoutSeconds: 60
+      httpGet:
+        path: /actuator/health
+        port: http
     affinity:
       podAntiAffinity:
         preferredDuringSchedulingIgnoredDuringExecution:
@@ -88,6 +100,18 @@ liveIndexing:
     replicaCount: 1
     # -- Set environment variables for the metadata component
     environment: {}
+    livenessProbe:
+      initialDelaySeconds: 300
+      timeoutSeconds: 60
+      httpGet:
+        path: /actuator/health
+        port: http
+    readinessProbe:
+      initialDelaySeconds: 60
+      timeoutSeconds: 60
+      httpGet:
+        path: /actuator/health
+        port: http
     affinity:
       podAntiAffinity:
         preferredDuringSchedulingIgnoredDuringExecution:
@@ -137,6 +161,18 @@ liveIndexing:
     replicaCount: 1
     # -- Set environment variables for the path component
     environment: {}
+    livenessProbe:
+      initialDelaySeconds: 300
+      timeoutSeconds: 60
+      httpGet:
+        path: /actuator/health
+        port: http
+    readinessProbe:
+      initialDelaySeconds: 60
+      timeoutSeconds: 60
+      httpGet:
+        path: /actuator/health
+        port: http
     affinity:
       podAntiAffinity:
         preferredDuringSchedulingIgnoredDuringExecution:
diff --git a/charts/alfresco-search-service/Chart.yaml b/charts/alfresco-search-service/Chart.yaml
index 8b8ccabfa..a5d602a75 100644
--- a/charts/alfresco-search-service/Chart.yaml
+++ b/charts/alfresco-search-service/Chart.yaml
@@ -10,7 +10,7 @@ keywords:
 name: alfresco-search-service
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 3.3.3
+version: 4.0.0-alpha.0
 appVersion: 2.0.11
 dependencies:
   - name: alfresco-insight-zeppelin
diff --git a/charts/alfresco-search-service/README.md b/charts/alfresco-search-service/README.md
index 853446ea8..facc5dc83 100644
--- a/charts/alfresco-search-service/README.md
+++ b/charts/alfresco-search-service/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-search-service
 
-![Version: 3.3.3](https://img.shields.io/badge/Version-3.3.3-informational?style=flat-square) ![AppVersion: 2.0.11](https://img.shields.io/badge/AppVersion-2.0.11-informational?style=flat-square)
+![Version: 4.0.0-alpha.0](https://img.shields.io/badge/Version-4.0.0--alpha.0-informational?style=flat-square) ![AppVersion: 2.0.11](https://img.shields.io/badge/AppVersion-2.0.11-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Search Service
 
@@ -48,6 +48,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | insightEngineImage.pullPolicy | string | `"IfNotPresent"` |  |
 | insightEngineImage.repository | string | `"quay.io/alfresco/insight-engine"` |  |
 | insightEngineImage.tag | string | `"2.0.11"` |  |
+| livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `130` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
diff --git a/charts/alfresco-search-service/templates/deployment.yaml b/charts/alfresco-search-service/templates/deployment.yaml
index da0285c1a..34eed86f0 100644
--- a/charts/alfresco-search-service/templates/deployment.yaml
+++ b/charts/alfresco-search-service/templates/deployment.yaml
@@ -89,9 +89,7 @@ spec:
                   | xmllint --xpath '/response/str[@name="status"]/text()' -
                   )
                   = "OK" ]
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+              {{- toYaml .Values.readinessProbe | nindent 12 }}
           livenessProbe:
             exec:
               command:
@@ -104,10 +102,7 @@ spec:
                   | xmllint --xpath '/response/lst/int[@name="status"]/text()' -
                   )
                   -eq 0 ]
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            failureThreshold: 1
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
       volumes:
         {{- include "alfresco-common.data_volume" .Values | nindent 8 }}
         {{- with .Values.volumes }}
diff --git a/charts/alfresco-search-service/values.yaml b/charts/alfresco-search-service/values.yaml
index 9056182c8..2dba72831 100644
--- a/charts/alfresco-search-service/values.yaml
+++ b/charts/alfresco-search-service/values.yaml
@@ -118,6 +118,7 @@ livenessProbe:
   initialDelaySeconds: 130
   periodSeconds: 20
   timeoutSeconds: 10
+  failureThreshold: 1
 initContainer:
   image:
     repository: busybox
diff --git a/charts/alfresco-share/Chart.yaml b/charts/alfresco-share/Chart.yaml
index d8fbe1376..b22c21b61 100644
--- a/charts/alfresco-share/Chart.yaml
+++ b/charts/alfresco-share/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-share
 description: Alfresco Share Helm chart for Kubernetes
 type: application
-version: 1.1.2
+version: 1.2.0-alpha.0
 appVersion: 23.3.2
 dependencies:
   - repository: https://alfresco.github.io/alfresco-helm-charts
diff --git a/charts/alfresco-share/README.md b/charts/alfresco-share/README.md
index 4a7707320..86b47867a 100644
--- a/charts/alfresco-share/README.md
+++ b/charts/alfresco-share/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-share
 
-![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.3.2](https://img.shields.io/badge/AppVersion-23.3.2-informational?style=flat-square)
+![Version: 1.2.0-alpha.0](https://img.shields.io/badge/Version-1.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.3.2](https://img.shields.io/badge/AppVersion-23.3.2-informational?style=flat-square)
 
 Alfresco Share Helm chart for Kubernetes
 
@@ -51,6 +51,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
 | known_urls | string | `nil` | Provide the list of URL considered allowed to access Share resources (used for CSRF protection). The value be either a list of strings or a single string separated by spaces. |
+| livenessProbe.httpGet.path | string | `"/share"` |  |
+| livenessProbe.httpGet.port | string | `"http"` |  |
 | livenessProbe.initialDelaySeconds | int | `15` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `5` |  |
@@ -60,6 +62,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | podAnnotations | object | `{}` |  |
 | podLabels | object | `{}` |  |
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
+| readinessProbe.httpGet.path | string | `"/share"` |  |
+| readinessProbe.httpGet.port | string | `"http"` |  |
 | readinessProbe.initialDelaySeconds | int | `15` |  |
 | readinessProbe.periodSeconds | int | `30` |  |
 | readinessProbe.timeoutSeconds | int | `5` |  |
diff --git a/charts/alfresco-share/templates/deployment.yaml b/charts/alfresco-share/templates/deployment.yaml
index b87475f1a..32566d3a9 100644
--- a/charts/alfresco-share/templates/deployment.yaml
+++ b/charts/alfresco-share/templates/deployment.yaml
@@ -91,19 +91,9 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
           readinessProbe:
-            httpGet:
-              path: /share
-              port: {{ .Values.image.port }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           livenessProbe:
-            httpGet:
-              path: /share
-              port: {{ .Values.image.port }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
         {{- if .Values.extraSideContainers }}
         {{- toYaml .Values.extraSideContainers | nindent 8 }}
         {{- end }}
diff --git a/charts/alfresco-share/values.yaml b/charts/alfresco-share/values.yaml
index deb19e63f..6fcf79591 100644
--- a/charts/alfresco-share/values.yaml
+++ b/charts/alfresco-share/values.yaml
@@ -89,10 +89,16 @@ environment:
     -XX:MinRAMPercentage=50
     -XX:MaxRAMPercentage=80
 readinessProbe:
+  httpGet:
+    path: /share
+    port: http
   initialDelaySeconds: 15
   periodSeconds: 30
   timeoutSeconds: 5
 livenessProbe:
+  httpGet:
+    path: /share
+    port: http
   initialDelaySeconds: 15
   periodSeconds: 20
   timeoutSeconds: 5
diff --git a/charts/alfresco-sync-service/Chart.yaml b/charts/alfresco-sync-service/Chart.yaml
index 92a95954e..31c79fe32 100644
--- a/charts/alfresco-sync-service/Chart.yaml
+++ b/charts/alfresco-sync-service/Chart.yaml
@@ -8,7 +8,7 @@ keywords:
 name: alfresco-sync-service
 sources:
   - https://github.com/Alfresco/acs-deployment
-version: 6.0.1
+version: 6.1.0-alpha.0
 appVersion: 5.0.0
 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4
 dependencies:
diff --git a/charts/alfresco-sync-service/README.md b/charts/alfresco-sync-service/README.md
index 234e06494..ac18490ee 100644
--- a/charts/alfresco-sync-service/README.md
+++ b/charts/alfresco-sync-service/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-sync-service
 
-![Version: 6.0.1](https://img.shields.io/badge/Version-6.0.1-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square)
+![Version: 6.1.0-alpha.0](https://img.shields.io/badge/Version-6.1.0--alpha.0-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square)
 
 Alfresco Sync Service
 
@@ -50,6 +50,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | 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 | `[]` |  |
+| livenessProbe.httpGet.path | string | `"/alfresco/healthcheck"` |  |
+| livenessProbe.httpGet.port | string | `"serviceport"` |  |
 | livenessProbe.initialDelaySeconds | int | `30` |  |
 | livenessProbe.periodSeconds | int | `30` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
@@ -70,6 +72,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
 | podSecurityContext.runAsUser | int | `33020` |  |
 | readinessProbe.failureThreshold | int | `12` |  |
+| readinessProbe.httpGet.path | string | `"/alfresco/healthcheck"` |  |
+| readinessProbe.httpGet.port | string | `"serviceport"` |  |
 | readinessProbe.initialDelaySeconds | int | `20` |  |
 | readinessProbe.periodSeconds | int | `10` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |
diff --git a/charts/alfresco-sync-service/templates/deployment.yaml b/charts/alfresco-sync-service/templates/deployment.yaml
index 1f02ba80c..fb09bb3bf 100644
--- a/charts/alfresco-sync-service/templates/deployment.yaml
+++ b/charts/alfresco-sync-service/templates/deployment.yaml
@@ -117,18 +117,9 @@ spec:
         {{- end }}
         resources: {{- toYaml .Values.resources | nindent 12 }}
         readinessProbe:
-          httpGet:
-            path: /alfresco/healthcheck
-            port: serviceport
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          {{- toYaml .Values.readinessProbe | nindent 12 }}
         livenessProbe:
-          httpGet:
-            path: /alfresco/healthcheck
-            port: serviceport
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+          {{- toYaml .Values.livenessProbe | nindent 12 }}
         lifecycle:
           preStop:
             exec:
diff --git a/charts/alfresco-sync-service/values.yaml b/charts/alfresco-sync-service/values.yaml
index 0aa6e6caa..00a612b8a 100644
--- a/charts/alfresco-sync-service/values.yaml
+++ b/charts/alfresco-sync-service/values.yaml
@@ -46,10 +46,16 @@ resources:
     cpu: "2"
     memory: "2000Mi"
 livenessProbe:
+  httpGet:
+    path: /alfresco/healthcheck
+    port: serviceport
   initialDelaySeconds: 30
   periodSeconds: 30
   timeoutSeconds: 10
 readinessProbe:
+  httpGet:
+    path: /alfresco/healthcheck
+    port: serviceport
   initialDelaySeconds: 20
   periodSeconds: 10
   failureThreshold: 12