diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml
index 7f03f4f..5e3198a 100644
--- a/.gitea/workflows/pull_request.yaml
+++ b/.gitea/workflows/pull_request.yaml
@@ -4,40 +4,6 @@ on:
   pull_request:
 
 jobs:
-  generate_licenses:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Install Flutter (wget)
-        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
-
-      - name: Get dependencies
-        run: 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
-
-      - name: Commit license update
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-        run: |
-          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 add lib test
-            git commit -m "Auto-format code [skip ci]"
-            git push origin HEAD:${{ gitea.head_ref }}
-          else
-            echo "No changes to commit"
-          fi
-  
-
   lint:
     runs-on: ubuntu-latest
     steps:
diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml
index 43cc999..9788ce3 100644
--- a/.gitea/workflows/push.yaml
+++ b/.gitea/workflows/push.yaml
@@ -53,7 +53,7 @@ jobs:
             git config --global user.name "Gitea Actions [bot]"
             git config --global user.email "actions@yannick-weigert.de"
             git add lib test
-            git commit -m "Auto-format code [skip ci]"
+            git commit -m "Updated licenses [skip ci]"
             git push origin HEAD:${{ gitea.ref_name }}
           else
             echo "No changes to commit"
@@ -61,6 +61,7 @@ jobs:
 
   format:
     runs-on: ubuntu-latest
+    needs: generate_licenses
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -106,7 +107,7 @@ jobs:
 
   update_version:
     runs-on: ubuntu-latest
-    needs: format
+    needs: [format, generate_licenses]
     if: gitea.ref == 'refs/heads/development'
     steps:
       - name: Checkout code