diff --git a/.github/workflows/bump-elastic-stack-version.yml b/.github/workflows/bump-elastic-stack-version.yml
index 54dff6157..5a50e899f 100644
--- a/.github/workflows/bump-elastic-stack-version.yml
+++ b/.github/workflows/bump-elastic-stack-version.yml
@@ -7,7 +7,7 @@ on:
     - cron: '0 1 * * 1-5'
   pull_request:
     paths:
-      - .github/workflows/updatecli.d/*
+      - .github/workflows/updatecli/**
       - .github/workflows/bump-elastic-stack-version.yml
 
 permissions:
@@ -35,28 +35,10 @@ jobs:
           echo "UPDATECLI_ACTION=apply" >> $GITHUB_ENV
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.62.0
+        uses: updatecli/updatecli-action@3a8785d88ec4fa03d86521a181f37c0e74627463 #v2.64.0
 
       - name: Update default stack version
         # --experimental needed for commitusingapi option.
-        run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-elastic-stack-version.yml --values .github/workflows/updatecli.d/scm.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Update latest testing 7.x stack version
-        # --experimental needed for commitusingapi option.
-        run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-latest-7x-version.yml --values .github/workflows/updatecli.d/scm.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Update latest testing stack version
-        # --experimental needed for commitusingapi option.
-        run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-latest-snapshot-version.yml --values .github/workflows/updatecli.d/scm.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Update Package Registry version
-        # --experimental needed for commitusingapi option.
-        run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-package-registry-version.yml --values .github/workflows/updatecli.d/scm.yml
+        run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli --values .github/workflows/updatecli/values.d/scm.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/updatecli.d/bump-elastic-stack-version.yml b/.github/workflows/updatecli/updatecli.d/bump-elastic-stack-version.yml
similarity index 96%
rename from .github/workflows/updatecli.d/bump-elastic-stack-version.yml
rename to .github/workflows/updatecli/updatecli.d/bump-elastic-stack-version.yml
index f80b01a29..44895be74 100644
--- a/.github/workflows/updatecli.d/bump-elastic-stack-version.yml
+++ b/.github/workflows/updatecli/updatecli.d/bump-elastic-stack-version.yml
@@ -19,6 +19,7 @@ scms:
       owner: '{{ .scm.owner }}'
       repository: '{{ .scm.repository }}'
       user: '{{ requiredEnv "GITHUB_ACTOR" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       commitusingapi: true
       branch: main
diff --git a/.github/workflows/updatecli.d/bump-latest-7x-version.yml b/.github/workflows/updatecli/updatecli.d/bump-latest-7x-version.yml
similarity index 95%
rename from .github/workflows/updatecli.d/bump-latest-7x-version.yml
rename to .github/workflows/updatecli/updatecli.d/bump-latest-7x-version.yml
index 2dc2c14ee..c35d8cbc3 100644
--- a/.github/workflows/updatecli.d/bump-latest-7x-version.yml
+++ b/.github/workflows/updatecli/updatecli.d/bump-latest-7x-version.yml
@@ -19,6 +19,7 @@ scms:
       owner: '{{ .scm.owner }}'
       repository: '{{ .scm.repository }}'
       user: '{{ requiredEnv "GITHUB_ACTOR" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       commitusingapi: true
       branch: main
diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml
similarity index 95%
rename from .github/workflows/updatecli.d/bump-latest-snapshot-version.yml
rename to .github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml
index f0602b740..301d43940 100644
--- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml
+++ b/.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml
@@ -19,6 +19,7 @@ scms:
       owner: '{{ .scm.owner }}'
       repository: '{{ .scm.repository }}'
       user: '{{ requiredEnv "GITHUB_ACTOR" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       commitusingapi: true
       branch: main
diff --git a/.github/workflows/updatecli.d/bump-package-registry-version.yml b/.github/workflows/updatecli/updatecli.d/bump-package-registry-version.yml
similarity index 95%
rename from .github/workflows/updatecli.d/bump-package-registry-version.yml
rename to .github/workflows/updatecli/updatecli.d/bump-package-registry-version.yml
index b6bdf681e..31f7efbe4 100644
--- a/.github/workflows/updatecli.d/bump-package-registry-version.yml
+++ b/.github/workflows/updatecli/updatecli.d/bump-package-registry-version.yml
@@ -19,6 +19,7 @@ scms:
       owner: '{{ .scm.owner }}'
       repository: '{{ .scm.repository }}'
       user: '{{ requiredEnv "GITHUB_ACTOR" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       commitusingapi: true
       branch: main
diff --git a/.github/workflows/updatecli.d/scm.yml b/.github/workflows/updatecli/values.d/scm.yml
similarity index 100%
rename from .github/workflows/updatecli.d/scm.yml
rename to .github/workflows/updatecli/values.d/scm.yml