diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0678bd0e8..65478e509 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,12 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       match: ${{ steps.check-tag.outputs.match }}
+      beta: ${{ steps.check-tag.outputs.beta }}
     steps:
       - id: check-tag
         run: |
           if [[ "${{ github.event.ref }}" =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
               echo ::set-output name=match::true
           fi
+          if [[ "${{ github.event.ref }}" =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+.*-beta$ ]]; then
+              echo ::set-output name=beta::true
+          fi
 
   build:
     needs: check
@@ -63,5 +67,6 @@ jobs:
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
           body: "Auto-generated release"
-          prerelease: endsWith(github.event.ref, '-beta')
+          prerelease: needs.check.outputs.beta == 'true'
+          fail_on_unmatched_files: true
           files: build/outputs/apk/gplay/release/*.apk
diff --git a/build.gradle b/build.gradle
index 7ccf088ad..a4c1c48c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -189,6 +189,8 @@ android {
         variant.outputs.all { output ->
             output.outputFileName = output.outputFileName
                 .replace("deltalab-android", "deltachat-lite")
+		.replace("-gplay", "")
+		.replace("-release", "")
                 .replace(".apk", "-${variant.versionName}.apk")
             output.versionCodeOverride =
                 project.ext.versionCodes.get(output.getFilter(