diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
index d543fdc674..d4ecf0aa8b 100644
--- a/.github/workflows/android_build.yml
+++ b/.github/workflows/android_build.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: [ self-hosted, android ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -25,5 +25,15 @@ jobs:
         uses: android-actions/setup-android@v2
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Build Debug with gradle
+      - name: Unit Test (for modules w/o flavors)
+        run: ./gradlew testDebugUnitTest
+      - name: Unit Test (for modules w/ flavors)
+        run: ./gradlew testDevDebugUnitTest
+      - name: Assemble with Stacktrace
         run: ./gradlew assembleDevDebug --stacktrace
+      - name: Upload APK
+        uses: actions/upload-artifact@v3
+        with:
+          name: app-dev-debug
+          path: app/build/outputs/apk/dev/debug/
+          retention-days: 30
diff --git a/.github/workflows/android_checkstyle.yml b/.github/workflows/android_checkstyle.yml
index bc500fbe14..99c671d723 100644
--- a/.github/workflows/android_checkstyle.yml
+++ b/.github/workflows/android_checkstyle.yml
@@ -13,11 +13,11 @@ jobs:
     runs-on: [ self-hosted, default ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Fetch origin/development
         run: git fetch origin development
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'adopt'
diff --git a/.github/workflows/android_test.yml b/.github/workflows/android_test.yml
deleted file mode 100644
index cdab1ea517..0000000000
--- a/.github/workflows/android_test.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Android Test CI
-
-on:
-  push:
-    branches: [ development, master ]
-  pull_request:
-    branches: [ development, master ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: [ self-hosted, default ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Unit Test
-        run: ./gradlew testDebugUnitTest