diff --git a/.github/workflows/android-integration.yml b/.github/workflows/android-integration.yml
index be8c6bdb501f..0e45ced241e6 100644
--- a/.github/workflows/android-integration.yml
+++ b/.github/workflows/android-integration.yml
@@ -18,13 +18,15 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: "adopt"
+          java-version: "11"
 
       - name: Compile screenshots android tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: compileOffPlaystoreScreenshotsAndroidTestSources -PtestBuildType=screenshots
+          arguments: >
+            compileOffPlaystoreScreenshotsAndroidTestSources 
+            -PtestBuildType=screenshots
 
   test:
     name: Unit Tests
@@ -37,13 +39,17 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: "adopt"
+          java-version: "11"
 
       - name: Run unit tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: testObfPlaystoreDebugUnitTest testOffPlaystoreDebugUnitTest testOpfPlaystoreDebugUnitTest testOpffPlaystoreDebugUnitTest
+          arguments: >
+            testObfPlaystoreDebugUnitTest
+            testOffPlaystoreDebugUnitTest
+            testOpfPlaystoreDebugUnitTest
+            testOpffPlaystoreDebugUnitTest
 
   assemble_apk:
     name: Assemble APKs
@@ -56,40 +62,50 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: "adopt"
+          java-version: "11"
 
       - name: Workaround for Android Gradle Plugin issue
-        run: "echo \"ndk.dir=${ANDROID_HOME}/ndk-bundle\" > local.properties"
+        run: 'echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties'
 
       - name: Assemble debug APKs
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: assembleDebug --stacktrace
+          arguments: assembleDebug
 
-      - name: Upload OBF APK
+      - name: Upload OBF APKs
         uses: actions/upload-artifact@v2.2.3
         with:
-          name: obf
-          path: app/build/outputs/apk/obf/debug/app-obf-debug.apk
+          name: OBF
+          path: |
+            ./app/build/outputs/apk/obfPlaystore/debug/app-obf-playstore-debug.apk
+            ./app/build/outputs/apk/obfFdroid/debug/app-obf-fdroid-debug.apk
 
       - name: Upload OFF APK
         uses: actions/upload-artifact@v2.2.3
         with:
-          name: off
-          path: app/build/outputs/apk/off/debug/app-off-debug.apk
+          name: OFF
+          path: |
+            ./app/build/outputs/apk/offPlaystore/debug/app-off-playstore-debug.apk
+            ./app/build/outputs/apk/offFdroid/debug/app-off-fdroid-debug.apk
 
       - name: Upload OPF APK
         uses: actions/upload-artifact@v2.2.3
         with:
-          name: opf
-          path: app/build/outputs/apk/opf/debug/app-opf-debug.apk
+          name: OPF
+          path: |
+            ./app/build/outputs/apk/opfPlaystore/debug/app-opf-playstore-debug.apk
+            ./app/build/outputs/apk/opfFdroid/debug/app-opf-fdroid-debug.apk
 
       - name: Upload OPFF APK
         uses: actions/upload-artifact@v2.2.3
         with:
-          name: opff
-          path: app/build/outputs/apk/opff/debug/app-opff-debug.apk
+          name: OPFF
+          path: |
+            ./app/build/outputs/apk/opffPlaystore/debug/app-opf-playstore-debug.apk
+            ./app/build/outputs/apk/opffFdroid/debug/app-opff-fdroid-debug.apk
+
+
 
 #  lint:
 #    name: Lint
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 92a15872303c..b8ae6e549bcd 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,24 +14,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout repository
+      - name: Checkout sources
         uses: actions/checkout@v2
-        with:
-          # We must fetch at least the immediate parents so that if this is
-          # a pull request then we can checkout the head.
-          fetch-depth: 2
-
-        # If this run was triggered by a pull request event, then checkout
-        # the head of the pull request instead of the merge commit.
-      - name: Checkout head
-        run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
 
         # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
-          languages: java, kotlin
+          languages: java
 
       - name: Set up JDK 11
         uses: actions/setup-java@v2