diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml
index 6481d9516..4e94319b9 100644
--- a/.github/workflows/helm-community.yml
+++ b/.github/workflows/helm-community.yml
@@ -20,7 +20,8 @@ concurrency:
   cancel-in-progress: true
 jobs:
   community_charts:
-    runs-on: [self-hosted]
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 
@@ -39,8 +40,6 @@ jobs:
         uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.8.0
         with:
           ingress-nginx-ref: controller-v1.8.2
-          kind-version: v0.19.0
-          kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b
 
       - name: Set nginx ingress config
         run: |
@@ -61,7 +60,7 @@ jobs:
             --set global.search.sharedSecret="$(openssl rand -hex 24)" \
             --set global.known_urls=http://localhost \
             --set global.alfrescoRegistryPullSecrets=regcred \
-            --wait --timeout 15m0s --values \
+            --wait --timeout 5m0s --values \
             test/community-integration-test-values.yaml
 
       - name: Spit cluster status
diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
index 02e03a610..87cea0dfc 100644
--- a/.github/workflows/helm-enterprise.yml
+++ b/.github/workflows/helm-enterprise.yml
@@ -57,7 +57,8 @@ jobs:
           echo "json=$CHARTS" >> $GITHUB_OUTPUT
 
   helm_integration:
-    runs-on: [self-hosted]
+    runs-on: alfrescoPub-ubuntu2204-16G-4CPU
+    timeout-minutes: 10
     needs:
       - build_vars
     name: Helm ${{ matrix.name }} ${{ matrix.values }}
@@ -89,8 +90,6 @@ jobs:
         uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.8.0
         with:
           ingress-nginx-ref: controller-v1.8.2
-          kind-version: v0.19.0
-          kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b
 
       - name: Set nginx ingress config
         run: |
@@ -103,6 +102,15 @@ jobs:
           --from-file=.dockerconfigjson=$HOME/.docker/config.json \
           --type=kubernetes.io/dockerconfigjson
 
+      - name: Check if cgroup v2 workaround is needed
+        id: extra-values
+        run: |
+          acs_version=$(echo ${{ matrix.values }} | cut -d'.' -f1,2)
+          is_affected=$(echo "$acs_version <= 7.2" | bc -l)
+          if [ "$is_affected" -eq 1 ]; then
+            echo "helm_install_params=--values test/cgroup-v2-workaround-values.yaml" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Helm install
         run: |
           helm dep up ./helm/alfresco-content-services
@@ -110,9 +118,10 @@ jobs:
             --set global.search.sharedSecret="$(openssl rand -hex 24)" \
             --set global.known_urls=http://localhost \
             --set global.alfrescoRegistryPullSecrets=regcred \
-            --wait --timeout 15m0s \
+            --wait --timeout 6m0s \
             --values helm/${{ matrix.name }}/${{ matrix.values }} \
-            --values test/enterprise-integration-test-values.yaml
+            --values test/enterprise-integration-test-values.yaml \
+            ${{ steps.extra-values.outputs.helm_install_params }}
 
       - name: Spit cluster status after install
         if: always()
@@ -125,7 +134,7 @@ jobs:
         id: newman
         with:
           timeout_minutes: 1
-          retry_wait_seconds: 30
+          retry_wait_seconds: 20
           max_attempts: 5
           command: >-
             docker run --network=host
diff --git a/test/cgroup-v2-workaround-values.yaml b/test/cgroup-v2-workaround-values.yaml
new file mode 100644
index 000000000..afe4ec694
--- /dev/null
+++ b/test/cgroup-v2-workaround-values.yaml
@@ -0,0 +1,42 @@
+---
+alfresco-repository:
+  environment:
+    JAVA_OPTS: >-
+      -XX:MaxRAMPercentage=80
+      -XX:MaxRAM=2147483648
+share:
+  environment:
+    CATALINA_OPTS: >-
+      -XX:MaxRAMPercentage=80
+      -XX:MaxRAM=536870912
+alfresco-transform-service:
+  pdfrenderer:
+    environment:
+      JAVA_OPTS: >-
+        -XX:MaxRAMPercentage=80
+        -XX:MaxRAM=536870912
+  imagemagick:
+    environment:
+      JAVA_OPTS: >-
+        -XX:MaxRAMPercentage=80
+        -XX:MaxRAM=536870912
+  libreoffice:
+    environment:
+      JAVA_OPTS: >-
+        -XX:MaxRAMPercentage=80
+        -XX:MaxRAM=1073741824
+  tika:
+    environment:
+      JAVA_OPTS: >-
+        -XX:MaxRAMPercentage=80
+        -XX:MaxRAM=536870912
+  transformmisc:
+    environment:
+      JAVA_OPTS: >-
+        -XX:MaxRAMPercentage=80
+        -XX:MaxRAM=536870912
+  transformrouter:
+    environment:
+      JAVA_OPTS: >-
+        -XX:MaxRAMPercentage=80
+        -XX:MaxRAM=838860800
diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml
index 64c28eae3..52cf27dcb 100644
--- a/test/enterprise-integration-test-values.yaml
+++ b/test/enterprise-integration-test-values.yaml
@@ -6,7 +6,7 @@ alfresco-repository:
       memory: "1024Mi"
     limits:
       cpu: "2"
-      memory: "1560Mi"
+      memory: "2Gi"
   replicaCount: 2
   persistence:
     accessModes: