diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b29ae0b43a..25c7473c83 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - main
-  pull_request:
+    tags:
+      - '*'
+    pull_request:
 
 jobs:
   build:
@@ -27,13 +29,14 @@ jobs:
         run: ./gradlew :maestro-cli:installDist -q
 
       - name: Create GitHub Release
+        if: startsWith(github.ref, 'refs/tags/')
         id: create_release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
           draft: false
           prerelease: false
 
diff --git a/maestro-client/src/main/resources/maestro-app.apk b/maestro-client/src/main/resources/maestro-app.apk
index 7fd0d8384d..a8b311fe23 100644
Binary files a/maestro-client/src/main/resources/maestro-app.apk and b/maestro-client/src/main/resources/maestro-app.apk differ
diff --git a/maestro-client/src/main/resources/maestro-server.apk b/maestro-client/src/main/resources/maestro-server.apk
index 227981913f..f41bd08a0a 100644
Binary files a/maestro-client/src/main/resources/maestro-server.apk and b/maestro-client/src/main/resources/maestro-server.apk differ