diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 51938bb74..f0813b76d 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -44,31 +44,18 @@ jobs:
       - name: Run local tests
         run: ./gradlew testDemoDebug testProdDebug --stacktrace
 
-      - name: Upload Demo build outputs (APKs)
+      - name: Upload build outputs (APKs)
         uses: actions/upload-artifact@v2
         with:
-          name: build-outputs-demo
-          path: app/demo/build/outputs
+          name: build-outputs
+          path: app/build/outputs
 
-      - name: Upload Prod build outputs (APKs)
-        uses: actions/upload-artifact@v2
-        with:
-          name: build-outputs-prod
-          path: app/prod/build/outputs
-
-      - name: Upload Demo build reports
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: build-reports-demo
-          path: app/demo/build/reports
-
-      - name: Upload Prod build reports
+      - name: Upload build reports
         if: always()
         uses: actions/upload-artifact@v2
         with:
-          name: build-reports-prod
-          path: app/prod/build/reports
+          name: build-reports
+          path: app/build/reports
 
   androidTest:
     needs: build
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 086eb1c25..5a658ae53 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -45,6 +45,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/debug/app-debug.apk
-          asset_name: app-debug.apk
+          asset_path: app/build/outputs/apk/demo/debug/app-demo-debug.apk
+          asset_name: app-demo-debug.apk
           asset_content_type: application/vnd.android.package-archive