diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index 38496cdac..437998457 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -36,23 +36,23 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Generate sources from the multi-source library
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v1
         env:
           CI_MULTISRC: "true"
         with:
           arguments: :multisrc:generateExtensions
-          wrapper-cache-enabled: true
+          distributions-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
       - name: Build "${{ matrix.lang }}" extensions
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v1
         env:
           CI_MULTISRC: "true"
           CI_MATRIX_LANG: ${{ matrix.lang }}
         with:
           arguments: assembleRelease
-          wrapper-cache-enabled: true
+          distributions-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
@@ -78,12 +78,12 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build "${{ matrix.lang }}" extensions
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v1
         env:
           CI_MULTISRC: "false"
           CI_MATRIX_LANG: ${{ matrix.lang }}
         with:
           arguments: assembleRelease
-          wrapper-cache-enabled: true
+          distributions-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 0357668d2..ed2f2d76e 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -43,23 +43,23 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Generate sources from the multi-source library
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v1
         env:
           CI_MULTISRC: "true"
         with:
           arguments: :multisrc:generateExtensions
-          wrapper-cache-enabled: true
+          distributions-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
       - name: Build "${{ matrix.lang }}" extensions
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v1
         env:
           CI_MULTISRC: "true"
           CI_MATRIX_LANG: ${{ matrix.lang }}
         with:
           arguments: assembleRelease
-          wrapper-cache-enabled: true
+          distributions-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
@@ -92,13 +92,13 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build "${{ matrix.lang }}" extensions
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v1
         env:
           CI_MULTISRC: "false"
           CI_MATRIX_LANG: ${{ matrix.lang }}
         with:
           arguments: assembleRelease
-          wrapper-cache-enabled: true
+          distributions-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true