diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 0cc55ec90..bc4dd750a 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -1,14 +1,14 @@
-Fixes #[Add issue number here. Note: This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber]
+**Fixes** #<!-- Add issue number here. This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber" -->
 
-**Changes**: [Add here what changes were made in this issue and if possible provide links.]
+**Changes**: 
+- <!-- Add here what changes were made in this issue and if possible provide links. -->
 
-**Screenshot/s for the changes**: [Add screenshot/s of the layout where you made changes or a `*.gif` containing a demonstration]
+**Screen shots for the changes**: 
+<!-- Add screen shots/screen recordings of the layout where you made changes or a `*.gif` containing a demonstration -->
 
-**Checklist**: [Please tick following check boxes with `[x]` if the respective task is completed]
-- [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding them
-- [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml`
-- [ ] I have reformatted code in every file included in this PR [<kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>L</kbd>]
-- [ ] My code does not contain any extra lines or extra spaces
-- [ ] I have requested reviews from other members
-
-**APK for testing**: [Compress the `app-debug.apk` file into a `<feature>.rar` or `<feature>.zip` file and upload it here]
+**Checklist**: <!-- Please tick following check boxes with `[x]` if the respective task is completed -->
+- [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding any value.
+- [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml`.
+- [ ] I have reformatted code and fixed indentation in every file included in this pull request
+- [ ] My code does not contain any extra lines or extra spaces.
+- [ ] I have requested reviews from maintainers.
\ No newline at end of file
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 0c0adb1ab..9b900df30 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -1,8 +1,13 @@
-name: pslab-android-pull-requests
+name: Build
 
 on:
+  push:
+    branches:
+      - master
   pull_request:
-    branches: [ development ]
+    branches:
+      - master
+      - development
 
 jobs:
   build:
@@ -23,7 +28,11 @@ jobs:
       run: bash ./gradlew build --stacktrace
       
     - name: Upload APK
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
-        name: pslab-android-debug-apk
-        path: app/build/outputs/apk/debug/app-debug.apk
+        name: pslab-android-apk
+        path: |
+          app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
+          app/build/outputs/apk/fdroid/release/app-fdroid-release-unsigned.apk
+          app/build/outputs/apk/playstore/debug/app-playstore-debug.apk
+          app/build/outputs/apk/playstore/release/app-playstore-release-unsigned.apk
diff --git a/build.gradle b/build.gradle
index 62a13ee62..fa8308982 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "io.realm:realm-gradle-plugin:5.8.0"
         classpath "gradle.plugin.com.github.b3er.local.properties:local-properties-plugin:1.1"
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bd6207570..f39ba445f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 19 16:28:50 IST 2019
+#Mon Oct 04 22:33:05 CEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip