diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7504b733e..718dde657 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,13 +81,18 @@ jobs:
           ./gradlew :app:assemble${flavor^}${build_type^}
       - name: Copy ${{ matrix.flavor }} ${{ matrix.build_type }} APK
         run: |
-          find app/build/outputs/apk
-          cp app/build/outputs/apk/**/*.apk ./
+          cp app/build/outputs/apk/${{ matrix.flavor }}/${{ matrix.build_type }}/app-${{ matrix.flavor }}-${{ matrix.flavor }}-${{ matrix.build_type }}.apk ./
       - name: Upload ${{ matrix.flavor }} ${{ matrix.build_type }} APK
         uses: actions/upload-artifact@v3
         with:
           name: apk-${{ matrix.flavor }}-${{ matrix.build_type }}
           path: app-${{ matrix.flavor }}-${{ matrix.flavor }}-${{ matrix.build_type }}.apk
+      - name: Upload ${{ matrix.flavor }} ${{ matrix.build_type }} mappings
+        if: ${{ matrix.build_type == 'release' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: release-mappings
+          path: '**/build/outputs/mapping'
 
   run_unit_tests:
     name: Run unit tests