diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b3010c2..6fd1186 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -3,33 +3,31 @@ name: Java CI with Gradle
 on:
   push:
     branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 15
-        uses: actions/setup-java@v1
-        with:
-          java-version: 15
-      - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2.0.1
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-      - name: build-tools
-        run: sdkmanager "build-tools;29.0.3"
-      - name: Add Android SDK to PATH
-        run: echo "${ANDROID_HOME}/build-tools/29.0.3" >> $GITHUB_PATH
+    - uses: actions/checkout@v2
+    - name: Set up JDK 16
+      uses: actions/setup-java@v1
+      with:
+        java-version: 16
+    - name: Setup Android SDK Tools
+      uses: android-actions/setup-android@v2.0.1
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+    - name: build-tools
+      run: sdkmanager "build-tools;29.0.3"
+    - name: Add Android SDK to PATH
+      run: echo "${ANDROID_HOME}/build-tools/29.0.3" >> $GITHUB_PATH
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Build with Gradle
-        run: ./gradlew buildDex
-
-      - name: Upload a Build Artifact (dexed)
-        uses: actions/upload-artifact@v2.2.1
-        with:
-          name: dexed
-          path: build/libs/raw-*.jar
+    - name: Upload Build Artifact
+      uses: actions/upload-artifact@v2.2.1
+      with:
+        name: informatis
+        path: build/libs/[!raw-]*.jar