diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index 8f27b5f..580fbe5 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -1,12 +1,6 @@
 name: Push
 
-on:
-  push:
-    branches:
-      - "*"
-    tags:
-      - "*"
-  workflow_dispatch:
+on: push
 
 jobs:
   build:
@@ -47,13 +41,20 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
       - run: echo "Build status report=${{ job.status }}."
+      - name: Get tag or commit id
+        id: get-version-id
+        uses: iawia002/get-tag-or-commit-id@v1
+        with:
+          length: 7
+      - name: Rename
+        run: mv ${{steps.sign.outputs.signedReleaseFile}} app/build/outputs/apk/debug/kirby_${{steps.get-version-id.outputs.id}}.apk
       - name: Upload App Bundle
         uses: actions/upload-artifact@v1
         with:
           name: signed_apk
-          path: ${{steps.sign.outputs.signedReleaseFile}}
+          path: app/build/outputs/apk/debug/kirby_${{steps.get-version-id.outputs.id}}.apk
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: ${{steps.sign.outputs.signedReleaseFile}}
+          files: app/build/outputs/apk/debug/kirby_${{steps.get-version-id.outputs.id}}.apk