diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
index e397591c7..c7f5ecd02 100644
--- a/.github/workflows/build-artifacts.yml
+++ b/.github/workflows/build-artifacts.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: temurin
           java-version: 11
 
       - name: Set jadx version
@@ -24,12 +24,10 @@ jobs:
           JADX_VERSION="${JADX_LAST_TAG:1}.$GITHUB_RUN_NUMBER-${GITHUB_SHA:0:8}"
           echo "JADX_VERSION=$JADX_VERSION" >> $GITHUB_ENV
 
-      - uses: burrunan/gradle-cache-action@v1
-        name: Build with Gradle
-        env:
-          TERM: dumb
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
         with:
-          arguments: clean dist copyExe
+          arguments: dist copyExe
 
       - name: Save bundle artifact
         uses: actions/upload-artifact@v3
@@ -72,12 +70,10 @@ jobs:
           JADX_VERSION="${JADX_LAST_TAG:1}.$GITHUB_RUN_NUMBER-${GITHUB_SHA:0:8}"
           echo "JADX_VERSION=$JADX_VERSION" >> $GITHUB_ENV
 
-      - uses: gradle/gradle-build-action@v2
-        name: Build with Gradle
-        env:
-          TERM: dumb
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
         with:
-          arguments: clean dist -PbundleJRE=true
+          arguments: dist -PbundleJRE=true
 
       - name: Save exe bundle artifact
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 55354133d..19e7d85fb 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -11,18 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
 
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: temurin
           java-version: 11
 
-      - uses: burrunan/gradle-cache-action@v1
-        name: Build with Gradle
-        env:
-          TERM: dumb
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
         with:
-          arguments: clean build dist copyExe --warning-mode=all
+          arguments: build dist copyExe
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index c6df11b3d..adeb6af3c 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,9 +1,14 @@
-name: "Validate Gradle Wrapper"
-on: [push]
+name: Validate Gradle Wrapper
+
+on:
+  push:
+    branches: [ master, build-test ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   validation:
-    name: "Validation"
+    name: Validation
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3