diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml
index 75e1dc0..2c7c162 100644
--- a/.gitea/workflows/push.yaml
+++ b/.gitea/workflows/push.yaml
@@ -92,6 +92,7 @@ jobs:
         run: |
           git config --global user.name "Gitea Actions [bot]"
           git config --global user.email "actions@yannick-weigert.de"
+          git pull origin ${{ gitea.ref_name }}
           git add pubspec.yaml
           git commit -m "Updated version number [skip ci]"
           git push origin HEAD:${{ gitea.ref_name }}
@@ -103,15 +104,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Flutter (wget)
+      # Required for Flutter action
+      - name: Install jq
         run: |
-          wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          git config --global --add safe.directory "$(pwd)/flutter"
-          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.38.6
 
       - name: Get dependencies
-        run: flutter pub get
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
+          flutter pub get
 
       - name: Generate oss_licenses.dart
         run: flutter pub run dart_pubspec_licenses:generate -o lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
@@ -123,6 +131,7 @@ jobs:
           if [ -n "$(git status --porcelain lib test)" ]; then
             git config --global user.name "Gitea Actions [bot]"
             git config --global user.email "actions@yannick-weigert.de"
+            git pull origin ${{ gitea.ref_name }}
             git add lib test
             git commit -m "Updated licenses [skip ci]"
             git push origin HEAD:${{ gitea.ref_name }}