diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e2c3ec..fae66cc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,56 +2,34 @@ name: Android CI
 
 on:
   push:
-    branches: [ "main" ]
+    tags:
+      - '*'
     
 jobs:
-  build:
-
+  build_and_release:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 17
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: gradle
-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build assembleDebug --stacktrace
-    - name: Upload APK Debug
-      uses: actions/upload-artifact@v3
+      run: |
+        ./gradlew build assembleDebug --stacktrace
+        mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/gads-stream.apk
+        zip -j gads-stream.zip app/build/outputs/apk/debug/gads-stream.apk
+    - name: Upload release
+      uses: svenstaro/upload-release-action@v2
       with:
-        name: gads-stream
-        path: app/build/outputs/apk/debug/app-debug.apk
-  release:
-    name: Release APK
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download APK from build
-        uses: actions/download-artifact@v1
-        with:
-          name: gads-stream  
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }} 
-      - name: Upload Release APK
-        id: upload_release_asset
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: apk/app-debug.apk
-          asset_name: gads-stream.apk
-          asset_content_type: application/zip
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: gads-stream.zip
+        asset_name: gads-stream.zip
+        tag: ${{ github.ref_name }}
+        overwrite: true