diff --git a/.github/workflows/update-nextcloud-openapi.yml b/.github/workflows/update-nextcloud-openapi.yml
index 9cf2c449104..d61b012e8ba 100644
--- a/.github/workflows/update-nextcloud-openapi.yml
+++ b/.github/workflows/update-nextcloud-openapi.yml
@@ -18,7 +18,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable33', 'stable32']
+        branches:
+          - ${{ github.event.repository.default_branch }}
+          - 'stable34'
+          - 'stable33'
+          - 'stable32'
 
     name: Update Nextcloud OpenAPI types from core
 
@@ -29,22 +33,12 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        if: ${{ matrix.branches != 'main' }}
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
           submodules: true
           repository: nextcloud/server
-          ref: ${{ matrix.branches }}
-
-      - name: Checkout server (Main)
-        if: ${{ matrix.branches == 'main' }}
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-          submodules: true
-          repository: nextcloud/server
-          ref: master
+          ref: ${{ matrix.branches == 'main' && 'master' || matrix.branches }}
 
       - name: Checkout app
         id: checkout
@@ -73,15 +67,18 @@ jobs:
         if: steps.checkout.outcome == 'success'
         run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
 
-      - name: Install dependencies & generate types
+      - name: Install dependencies
         if: steps.checkout.outcome == 'success'
         working-directory: apps/${{ env.APP_NAME }}
         env:
           CYPRESS_INSTALL_BINARY: 0
           PUPPETEER_SKIP_DOWNLOAD: true
-        run: |
-          npm ci
-          npm run ts:generate-core-types --if-present
+        run: npm ci
+
+      - name: Generate types
+        if: steps.checkout.outcome == 'success'
+        working-directory: apps/${{ env.APP_NAME }}
+        run: npm run ts:generate-core-types
 
       - name: Create Pull Request
         if: steps.checkout.outcome == 'success'
diff --git a/.github/workflows/update-nextcloud-openapi.yml.patch b/.github/workflows/update-nextcloud-openapi.yml.patch
deleted file mode 100644
index 4357c43864a..00000000000
--- a/.github/workflows/update-nextcloud-openapi.yml.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/.github/workflows/update-nextcloud-openapi.yml b/.github/workflows/update-nextcloud-openapi.yml
-index 8bb2d794c0..2d4befebab 100644
---- a/.github/workflows/update-nextcloud-openapi.yml
-+++ b/.github/workflows/update-nextcloud-openapi.yml
-@@ -99,4 +99,3 @@ jobs:
-             Auto-generated update of Nextcloud OpenAPI types
-           labels: |
-             dependencies
--            3. to review