diff --git a/.github/workflows/apk-on-comment.yml b/.github/workflows/apk-on-comment.yml
index 9fb1fa69b..6b91c2fe0 100644
--- a/.github/workflows/apk-on-comment.yml
+++ b/.github/workflows/apk-on-comment.yml
@@ -29,21 +29,9 @@ jobs:
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
 
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: ./.github/actions/setup-build-env
         with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92 # v2
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@1168cd3d07c1876a65e1724114de42ccbdfa7b78 # v3
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+          gradle-cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Test
         run: ./gradlew app:testOrangeGoogleReleaseUnitTest --stacktrace