diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 4215e17b..8d55e22a 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -1,6 +1,8 @@
 name: Pre-release
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
 
 concurrency: 
   group: "pre-release"
@@ -11,16 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Run Gradle command
-      uses: Raul6469/android-gradle-action@2.0.0
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        script: assembleDebug
-        # In some cases, you may need to provide
-        # Android licence agreement id
-        # You can find it on your own machine under `$ANDROID_HOME/license`,
-        # and add the file content as a GitHub secret named `$ANDROID_LICENCE`.
-        # android-licence: ${{ secrets.ANDROID_LICENCE }}
-        
+        java-version: '8'
+        distribution: 'adopt'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Run Gradle
+      run: ./gradlew assembleDebug
     - name: Create pre-release
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 67d4fcc6..281bb10b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -7,16 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Run Gradle command
-      uses: Raul6469/android-gradle-action@2.0.0
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        script: assembleDebug
-        # In some cases, you may need to provide
-        # Android licence agreement id
-        # You can find it on your own machine under `$ANDROID_HOME/license`,
-        # and add the file content as a GitHub secret named `$ANDROID_LICENCE`.
-        # android-licence: ${{ secrets.ANDROID_LICENCE }}
-        
+        java-version: '8'
+        distribution: 'adopt'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Run Gradle
+      run: ./gradlew assembleDebug
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with: