diff --git a/.github/actions/setup-kind/action.yml b/.github/actions/setup-kind/action.yml
index 49d1cf7ed..d0b7ea635 100644
--- a/.github/actions/setup-kind/action.yml
+++ b/.github/actions/setup-kind/action.yml
@@ -1,19 +1,24 @@
 name: "Setup a KinD cluster"
 description: "Spin a local Kubernetes cluster with ingress-nginx"
 inputs:
+  kind-version:
+    description: |
+      The kind version to use. Versions available at:
+      https://github.com/kubernetes-sigs/kind/releases
+    default: v0.20.0
   kind-node-image:
     description: |
-      The Kind docker node image to use. Check the Kind version
-      release notes to check the list of suitable images:
+      The Kind docker node image to use. Should match the same kind version at:
       https://github.com/kubernetes-sigs/kind/releases
-    required: true
     default: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+  kind-wait:
+    description: The duration to wait for the control plane to become ready
+    default: 60s
   ingress-nginx-ref:
     description: |
-      the Nginx ingress ref to get the ingress congtroller deployment manifest from
+      the Nginx ingress ref to get the ingress controller deployment manifest from
       (https://github.com/kubernetes/ingress-nginx). Consider main (the default) a floating tag which can result in
       deploying any version (including betas) and non repeatable builds.
-    required: false
     default: main
 runs:
   using: "composite"
@@ -22,7 +27,9 @@ runs:
       uses: helm/kind-action@v1.8.0 # https://github.com/helm/kind-action/releases/tag/v1.8.0
       with:
         config: ${{ github.action_path }}/kind.yml
+        version: ${{ inputs.kind-version }}
         node_image: ${{ inputs.kind-node-image }}
+        wait: ${{ inputs.kind-wait }}
 
     - name: Install ingress-nginx
       shell: bash
diff --git a/docs/README.md b/docs/README.md
index b969ee184..ca639f06b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1236,18 +1236,19 @@ Spin up a local kubernetes cluster with nginx ingress exposing http/https ports.
       - name: Setup cluster
         uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@ref
         with:
-          # See the available refs in the kind release notes at https://github.com/kubernetes-sigs/kind/releases
-          # Make sure to use a node image built for the same KinD version
-          # kind-node-image: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
-          ingress-nginx-ref: controller-v1.8.2
+          # Specify kind and k8s version to use.
+          # see https://github.com/kubernetes-sigs/kind/releases
+          # kind-version: v0.20.0
+          # kind-node-image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+          # Optional but ensure repeatable builds (defaults to latest nginx ingress version otherwise).
+          # see https://github.com/kubernetes/ingress-nginx
+          # ingress-nginx-ref: controller-v1.8.2
       - name: Helm deploy
         run: |
           helm dep up ./helm/chart
           helm install acs ./helm/chart
 ```
 
-> Although not required we recommend setting the `ingress-nginx-ref``to ensure repeatable builds
-
 ### update-project-base-tag
 
 Used to update a base tag in the release descriptor. It will add or update the
diff --git a/version.txt b/version.txt
index d1e9cf3bb..40c06ccb7 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v3.7.0
+v3.8.0