diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
new file mode 100644
index 0000000..473b380
--- /dev/null
+++ b/.gitea/workflows/release.yml
@@ -0,0 +1,39 @@
+name: Build and Release APK
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Test and Build Debug APK
+        run: chmod +x ./gradlew && ./gradlew test && ./gradlew assembleDebug
+
+      - name: Rename APK
+        run: mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/esp32-aldl-dashboard-${{ github.ref_name }}.apk
+
+      - name: Create Release and Upload APK
+        uses: softprops/action-gh-release@v2
+        with:
+          files: app/build/outputs/apk/debug/esp32-aldl-dashboard-${{ github.ref_name }}.apk
+          
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e4632d6..755b0a3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,10 +2,8 @@ name: Build and Release APK
 
 on:
   push:
-    branches:
-      - main
-      - master
-      - v2
+    tags:
+      - 'v*'
 
 jobs:
   build-and-release:
@@ -28,29 +26,15 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
 
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
-
-      - name: Run Unit Tests
-        run: ./gradlew test
-
-      - name: Build Debug APK
-        run: ./gradlew assembleDebug
-
-      - name: Get Short SHA
-        id: vars
-        run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+      - name: Test and Build Debug APK
+        run: chmod +x ./gradlew && ./gradlew test && ./gradlew assembleDebug
 
       - name: Rename APK
-        run: |
-          mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/esp32-aldl-dashboard-${{ env.short_sha }}.apk
+        run: mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/esp32-aldl-dashboard-${{ github.ref_name }}.apk
 
-      - name: Create Gitea Release
+      - name: Create Release and Upload APK
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: "build-${{ env.short_sha }}"
-          name: "Build ${{ env.short_sha }}"
-          files: app/build/outputs/apk/debug/esp32-aldl-dashboard-${{ env.short_sha }}.apk
-          prerelease: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          files: app/build/outputs/apk/debug/esp32-aldl-dashboard-${{ github.ref_name }}.apk
+          generate_release_notes: true
+          
\ No newline at end of file