diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index e3f55574..4e781f3f 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,22 +1,23 @@
-name: Eatvio App Android Test
+name: Android Release
 
-on: [ pull_request ]
+on: [ push, pull_request ]
 
 env:
-  flutter_version: "3.24.5"
-  java_version: "21.x"
+  flutter_version: "3.22.0"
+  java_version: "12.x"
   flutter_channel: "stable"
 
 jobs:
   build:
-    runs-on: [ dev-office ]
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          distribution: "zulu"
+          distribution: 'zulu'
           java-version: ${{ env.java_version }}
 
       - name: Install Android SDK
@@ -29,25 +30,24 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses 2>/dev/null || true  
-
-      - name: Cache Android SDK
+          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
       - uses: actions/cache@v3
         with:
           path: |
             /root/Android/Sdk
           key: ${{ runner.os }}-sdk-
-          restore-keys: ${{ runner.os }}-sdk-                 
+          restore-keys: ${{ runner.os }}-sdk-
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV                    
+          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
-      - name: Install jq
-        run: |
-          apt-get install -y jq                    
+      - uses: actions/cache@v2
+        with:
+          path: ${{ runner.tool_cache }}/flutter
+          key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
 
       - id: flutter-action
         uses: actions/flutter-action@v2
@@ -56,11 +56,21 @@ jobs:
           flutter-version: ${{ env.flutter_version }}
           cache: true
 
-      - name: Fix dir permissions
+      - name: show cache keys
+        run: |
+          echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
+          echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
+          echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
+          echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
+          echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
+          echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
+          echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
+        shell: bash
+
+      - name: fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter config --android-sdk="$ANDROID_HOME"
-          flutter doctor -v                    
+          flutter --version
 
       - name: Get dependencies
         run: flutter pub get
@@ -68,13 +78,15 @@ jobs:
       - name: Native Analyze
         run: flutter analyze
 
+      - name: Run Code Metrics
+        run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance
+
       - name: Test
         run: |
-          flutter test                    
+          flutter test
 
       - name: Build apk
-        run: |
-          flutter build apk                    
+        run: flutter build apk
 
       - name: Rename and move apk
         run: |
@@ -82,10 +94,3 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
-          echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV                    
-
-      - name: Upload APK artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.APK_NAME }}
-          path: ${{ env.APK_NAME }}