diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml
index 87044bd91..2b8dc0d24 100644
--- a/.github/workflows/helm-community.yml
+++ b/.github/workflows/helm-community.yml
@@ -36,11 +36,15 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@OPSEXP-2242-kindaction
+        with:
+          nginx-ingress-ref: controller-v1.8.2
 
       - name: Create registries auth secret
         if: ${{ ! github.event.repository.fork }}
         run: |
+          kubectl -n ingress-nginx patch cm ingress-nginx-controller \
+          -p '{"data": {"allow-snippet-annotations":"true"}}'
           kubectl create secret generic regcred \
           --from-file=.dockerconfigjson=$HOME/.docker/config.json \
           --type=kubernetes.io/dockerconfigjson
diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
index 0bb76656b..b7af31bc7 100644
--- a/.github/workflows/helm-enterprise.yml
+++ b/.github/workflows/helm-enterprise.yml
@@ -97,10 +97,14 @@ jobs:
           password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@OPSEXP-2242-kindaction
+        with:
+          nginx-ingress-ref: controller-v1.8.2
 
       - name: Create registries auth secret
         run: |
+          kubectl -n ingress-nginx patch cm ingress-nginx-controller \
+          -p '{"data": {"allow-snippet-annotations":"true"}}'
           kubectl create secret generic regcred \
           --from-file=.dockerconfigjson=$HOME/.docker/config.json \
           --type=kubernetes.io/dockerconfigjson