diff --git a/.github/actions/calculate-next-internal-version/action.yml b/.github/actions/calculate-next-internal-version/action.yml
index 8591877fa..0a77f5357 100644
--- a/.github/actions/calculate-next-internal-version/action.yml
+++ b/.github/actions/calculate-next-internal-version/action.yml
@@ -20,7 +20,7 @@ runs:
   using: "composite"
   steps:
     - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v6.0.0
     - id: next-prerelease-resolver
       run: ${{ github.action_path }}/next-prerelease.sh
       shell: bash
diff --git a/.github/actions/dbp-charts/publish-chart/action.yml b/.github/actions/dbp-charts/publish-chart/action.yml
index 157af313c..cd73f1ffb 100644
--- a/.github/actions/dbp-charts/publish-chart/action.yml
+++ b/.github/actions/dbp-charts/publish-chart/action.yml
@@ -26,7 +26,7 @@ runs:
       with:
         fetch-depth: 0
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v6.0.0
     - name: Publish
       run: ${{ github.action_path }}/publish_chart.sh
       shell: bash
diff --git a/.github/actions/dbp-charts/verify-helm/action.yml b/.github/actions/dbp-charts/verify-helm/action.yml
index 7bbb0e7e5..b2c34eb1e 100644
--- a/.github/actions/dbp-charts/verify-helm/action.yml
+++ b/.github/actions/dbp-charts/verify-helm/action.yml
@@ -85,14 +85,14 @@ runs:
         password: ${{ inputs.docker_password }}
     - name: Get branch name
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.35.0
+        Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v6.0.0
     - name: Get commit msg
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v5.35.0
+        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v6.0.0
     - name: Get a namespace to deploy on
       id: k8sns
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v5.35.0
+        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v6.0.0
       with:
         branch_name: ${{ env.BRANCH_NAME }}
         release_prefix: ${{ inputs.release_prefix }}
@@ -111,7 +111,7 @@ runs:
     - name: Upload helm deployments logs as artifacts
       if: always()
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v5.35.0
+        Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v6.0.0
       with:
         namespace: ${{ steps.k8sns.outputs.namespace }}
     - name: Uninstall Helm releases
diff --git a/.github/actions/enforce-pr-conventions/action.yml b/.github/actions/enforce-pr-conventions/action.yml
index 906f08c90..a40e89427 100644
--- a/.github/actions/enforce-pr-conventions/action.yml
+++ b/.github/actions/enforce-pr-conventions/action.yml
@@ -20,7 +20,7 @@ runs:
   using: composite
   steps:
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v6.0.0
 
     - name: Check is Dependabot PR or Propagation PR
       id: check
diff --git a/.github/actions/get-build-info/action.yml b/.github/actions/get-build-info/action.yml
index c3ff39164..7ac8989f2 100644
--- a/.github/actions/get-build-info/action.yml
+++ b/.github/actions/get-build-info/action.yml
@@ -3,7 +3,7 @@ description: "Get build-related info from GitHub and load it as generically name
 runs:
   using: composite
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v6.0.0
     - name: "Get build info"
       run: |
         [[ $GITHUB_EVENT_NAME == "pull_request" ]] && IS_PULL_REQUEST="true" || IS_PULL_REQUEST="false"
diff --git a/.github/actions/github-check-upcoming-runs/action.yml b/.github/actions/github-check-upcoming-runs/action.yml
index 0433029e6..44bb1452d 100644
--- a/.github/actions/github-check-upcoming-runs/action.yml
+++ b/.github/actions/github-check-upcoming-runs/action.yml
@@ -20,7 +20,7 @@ runs:
   using: "composite"
   steps:
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v6.0.0
 
     - name: Check upcoming runs
       id: check
diff --git a/.github/actions/github-deployment-create/action.yml b/.github/actions/github-deployment-create/action.yml
index 682ad5e4a..84adeae2c 100644
--- a/.github/actions/github-deployment-create/action.yml
+++ b/.github/actions/github-deployment-create/action.yml
@@ -40,7 +40,7 @@ runs:
 
     - name: Update Deployment State
       if: ${{ inputs.state != '' }}
-      uses: Alfresco/alfresco-build-tools/.github/actions/github-deployment-status-update@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/github-deployment-status-update@v6.0.0
       with:
         github-token: ${{ inputs.github-token }}
         deployment-id: ${{ steps.create.outputs.id }}
diff --git a/.github/actions/helm-integration-tests/action.yml b/.github/actions/helm-integration-tests/action.yml
index 0b807939e..1ca410f23 100644
--- a/.github/actions/helm-integration-tests/action.yml
+++ b/.github/actions/helm-integration-tests/action.yml
@@ -37,7 +37,7 @@ runs:
   using: composite
   steps:
     - name: Setup rancher
-      uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v6.0.0
       with:
         url: ${{ inputs.test-rancher-url }}
         access-key: ${{ inputs.test-rancher-access-key }}
diff --git a/.github/actions/helm-publish-chart/action.yml b/.github/actions/helm-publish-chart/action.yml
index 610809bbf..e703b1b52 100644
--- a/.github/actions/helm-publish-chart/action.yml
+++ b/.github/actions/helm-publish-chart/action.yml
@@ -110,7 +110,7 @@ runs:
         fi
 
     - name: Commit changes
-      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v6.0.0
       with:
         username: ${{ inputs.git-username }}
         add-options: .
diff --git a/.github/actions/helm-release-and-publish/action.yml b/.github/actions/helm-release-and-publish/action.yml
index 90cd3d03c..ef2793638 100644
--- a/.github/actions/helm-release-and-publish/action.yml
+++ b/.github/actions/helm-release-and-publish/action.yml
@@ -47,7 +47,7 @@ runs:
       run: |
         echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v6.0.0
       id: check-tag
       with:
         tag: ${{ env.VERSION }}
@@ -55,14 +55,14 @@ runs:
 
     - name: Update chart version
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v6.0.0
       with:
         new-version: ${{ env.VERSION }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
         chart-dir: ${{ inputs.chart-dir }}
         helm-docs-version: ${{ inputs.helm-docs-version }}
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v6.0.0
       if: steps.check-tag.outputs.exists == 'false'
       with:
         username: ${{ inputs.git-username }}
@@ -79,7 +79,7 @@ runs:
     - name: Package Helm Chart
       if: steps.check-tag.outputs.exists == 'false'
       id: package-helm-chart
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v6.0.0
       with:
         chart-dir: ${{ inputs.chart-dir }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
@@ -92,7 +92,7 @@ runs:
 
     - name: Publish Helm chart
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v6.0.0
       with:
         helm-charts-repo: ${{inputs.helm-repository}}
         helm-charts-repo-branch: ${{ inputs.helm-repository-branch }}
diff --git a/.github/actions/helm-update-chart-version/action.yml b/.github/actions/helm-update-chart-version/action.yml
index e0c6381e6..0fcbdaf08 100644
--- a/.github/actions/helm-update-chart-version/action.yml
+++ b/.github/actions/helm-update-chart-version/action.yml
@@ -16,7 +16,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v6.0.0
       with:
         version: ${{ inputs.helm-docs-version }}
     - name: Update version
diff --git a/.github/actions/maven-build-and-tag/action.yml b/.github/actions/maven-build-and-tag/action.yml
index b7dcb38a9..c83cd45dc 100644
--- a/.github/actions/maven-build-and-tag/action.yml
+++ b/.github/actions/maven-build-and-tag/action.yml
@@ -160,7 +160,7 @@ runs:
     - name: Update pom files to the new version
       id: update-pom-to-next-version
       if: github.event_name == 'push' || env.IS_PREVIEW == 'true'
-      uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v6.0.0
       with:
         property-to-update: ${{ inputs.property-to-update }}
         maven-cli-opts: ${{ steps.compute-maven-options.outputs.result }}
@@ -256,7 +256,7 @@ runs:
       shell: bash
       run: find . -name TEST-*.xml -exec grep -h testcase {} \; | awk -F '"' '{printf("%s#%s() - %.3fms\n", $4, $2, $6); }' | sort -n -k 3 | tail -20
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v6.0.0
       if: github.event_name == 'push'
       with:
         username: ${{ inputs.git-username }}
diff --git a/.github/actions/maven-release/action.yml b/.github/actions/maven-release/action.yml
index 86117bee6..cb9f4a794 100644
--- a/.github/actions/maven-release/action.yml
+++ b/.github/actions/maven-release/action.yml
@@ -75,7 +75,7 @@ runs:
         path: '${{ env.REPO_DIR }}'
         token: ${{ inputs.github-token }}
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v6.0.0
       id: check-tag
       with:
         tag: ${{ env.RELEASE_VERSION }}
@@ -147,7 +147,7 @@ runs:
 
     - name: Commit changes
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v6.0.0
       with:
         username: ${{ inputs.git-username }}
         add-options: -u
diff --git a/.github/actions/reportportal-prepare/action.yml b/.github/actions/reportportal-prepare/action.yml
index c4fad2d5b..a0e90bb77 100644
--- a/.github/actions/reportportal-prepare/action.yml
+++ b/.github/actions/reportportal-prepare/action.yml
@@ -46,7 +46,7 @@ runs:
   using: composite
   steps:
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v6.0.0
 
     - name: Compute Report Portal input info
       id: info
diff --git a/.github/actions/send-slack-notification-slow-job/action.yml b/.github/actions/send-slack-notification-slow-job/action.yml
index 5aecafec1..a8a7b0c27 100644
--- a/.github/actions/send-slack-notification-slow-job/action.yml
+++ b/.github/actions/send-slack-notification-slow-job/action.yml
@@ -25,7 +25,7 @@ runs:
 
     - name: Slack Notification
       if: fromJSON(steps.fetch_time.outputs.total_time) > fromJSON(inputs.max-build-time-seconds)
-      uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v6.0.0
       with:
         channel-id: ${{ inputs.slack-channel }}
         message: 'Max build time exceeded: took ${{ steps.fetch_time.outputs.total_time }} seconds (expected max: ${{ inputs.max-build-time-seconds }} seconds)'
diff --git a/.github/actions/send-slack-notification/action.yml b/.github/actions/send-slack-notification/action.yml
index 7738e357b..5303c1a32 100644
--- a/.github/actions/send-slack-notification/action.yml
+++ b/.github/actions/send-slack-notification/action.yml
@@ -109,7 +109,7 @@ runs:
         echo "result=$RESULT" >> $GITHUB_OUTPUT
 
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v6.0.0
 
     - name: Send slack notification
       id: slack
diff --git a/.github/actions/setup-helm-docs/action.yml b/.github/actions/setup-helm-docs/action.yml
index 719319b38..de7d234bb 100644
--- a/.github/actions/setup-helm-docs/action.yml
+++ b/.github/actions/setup-helm-docs/action.yml
@@ -11,7 +11,7 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v6.0.0
       with:
         repo: norwoodj/helm-docs
         version: ${{ inputs.version != '' && inputs.version || env.DEFAULT_HELM_DOCS_VERSION }}
diff --git a/.github/actions/setup-jx-release-version/action.yml b/.github/actions/setup-jx-release-version/action.yml
index 7e3e90fd9..9282016b2 100644
--- a/.github/actions/setup-jx-release-version/action.yml
+++ b/.github/actions/setup-jx-release-version/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v6.0.0
       with:
         repo: jenkins-x-plugins/jx-release-version
         version: ${{ inputs.version }}
diff --git a/.github/actions/setup-terraform-docs/action.yml b/.github/actions/setup-terraform-docs/action.yml
index a664aa35d..c9d0ce715 100644
--- a/.github/actions/setup-terraform-docs/action.yml
+++ b/.github/actions/setup-terraform-docs/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.35.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v6.0.0
       with:
         repo: terraform-docs/terraform-docs
         version: ${{ inputs.version }}
diff --git a/.github/actions/update-pom-to-next-pre-release/action.yml b/.github/actions/update-pom-to-next-pre-release/action.yml
index fafe6f79d..f5cb8c14e 100644
--- a/.github/actions/update-pom-to-next-pre-release/action.yml
+++ b/.github/actions/update-pom-to-next-pre-release/action.yml
@@ -33,7 +33,7 @@ runs:
     - id: next-prerelease-resolver
       name: Calculate next internal release
       if: inputs.version == ''
-      uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v6.0.0
       with:
         next-version: ${{ steps.parse-next-final-version.outputs.result }}
         prerelease-type: ${{ inputs.prerelease-type }}
@@ -50,7 +50,7 @@ runs:
         fi
 
     - name: Update pom files to the new version
-      uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v5.35.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v6.0.0
       with:
         version: ${{ steps.resolve-version.outputs.version }}
         maven-cli-opts: ${{ inputs.maven-cli-opts }}
diff --git a/.github/workflows/build-and-release-maven.yml b/.github/workflows/build-and-release-maven.yml
index 64d8d6dc6..5e1d63d14 100644
--- a/.github/workflows/build-and-release-maven.yml
+++ b/.github/workflows/build-and-release-maven.yml
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v5.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v6.0.0
         with:
           java-version: ${{ inputs.java-version }}
           java-distribution: ${{ inputs.java-distribution }}
@@ -107,11 +107,11 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v5.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v6.0.0
         with:
           java-version: ${{ inputs.java-version }}
           java-distribution: ${{ inputs.java-distribution }}
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v5.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v6.0.0
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           email: ${{ secrets.BOT_GITHUB_EMAIL }}
diff --git a/.github/workflows/helm-publish-new-package-version.yml b/.github/workflows/helm-publish-new-package-version.yml
index b9f7d0126..d7702066b 100644
--- a/.github/workflows/helm-publish-new-package-version.yml
+++ b/.github/workflows/helm-publish-new-package-version.yml
@@ -46,7 +46,7 @@ jobs:
 
       - id: next-release
         name: Calculate next internal release
-        uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v5.35.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v6.0.0
         with:
           next-version: ${{ inputs.next-version }}
 
@@ -57,13 +57,13 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Update chart version
-        uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v5.35.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v6.0.0
         with:
           new-version: ${{env.VERSION}}
           chart-dir: ${{ inputs.chart-dir }}
           helm-docs-version: ${{ inputs.helm-docs-version }}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v6.0.0
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           add-options: -u
@@ -74,7 +74,7 @@ jobs:
 
       - name: Package Helm Chart
         id: package-helm-chart
-        uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v5.35.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v6.0.0
         with:
           chart-dir: ${{ inputs.chart-dir }}
 
@@ -82,7 +82,7 @@ jobs:
         run: git push origin $VERSION
 
       - name: Publish Helm chart
-        uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v5.35.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v6.0.0
         with:
             helm-charts-repo: ${{ inputs.helm-charts-repo }}
             helm-charts-repo-branch: ${{ inputs.helm-charts-repo-branch }}
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index f9dc55b5f..8bb7d5b8a 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -90,7 +90,7 @@ jobs:
           role-session-name: TerraformWorkflow
 
       - name: Load environment variables from yml
-        uses: Alfresco/alfresco-build-tools/.github/actions/env-load-from-yaml@v5.35.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/env-load-from-yaml@v6.0.0
         with:
           yml_path: ${{ inputs.terraform_root_path }}/tfenv.yml