diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2a4db6a..c58d451 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,10 +3,10 @@ name: Android Pull Request & Master CI & CD to Firebase
 on:
   pull_request:
     branches:
-      - 'main'
+      - 'master'
   push:
     branches:
-      - 'main'
+      - 'master'
 
 jobs:
   test:
@@ -17,10 +17,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2.4.0
       - name: Setup JDK
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v1
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          java-version: '1.8'
       - name: Set execution flag for gradlew
         run: chmod +x gradlew
       - name: Unit tests
@@ -33,10 +32,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2.4.0
       - name: Setup JDK
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v1
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          java-version: '1.8'
       - name: build release
         run: bash ./gradlew assembleDebug
       - name: upload artifact to Firebase App Distribution
@@ -54,10 +52,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2.4.0
       - name: Setup JDK
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v1
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          java-version: '1.8'
       - name: Set execution flag for gradlew
         run: chmod +x gradlew
       - name: Build debug APK