diff --git a/.github/workflows/QA_keystore.jks.license b/.github/workflows/QA_keystore.jks.license
index 7ec214431369..f070b8a4c019 100644
--- a/.github/workflows/QA_keystore.jks.license
+++ b/.github/workflows/QA_keystore.jks.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 4b03ffe92c2f..d38ab46aec69 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -27,7 +27,6 @@ concurrency:
 jobs:
     analysis:
         runs-on: ubuntu-latest
-        timeout-minutes: 60
         steps:
             - name: Disabled on forks
               if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}
@@ -71,9 +70,8 @@ jobs:
                 run: |
                     mkdir -p "$HOME/.gradle"
                     {
-                        echo "org.gradle.jvmargs=-Xmx5g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g"
+                        echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
                         echo "org.gradle.configureondemand=true"
-                        echo "org.gradle.configuration-cache=false"
                         echo "kapt.incremental.apt=true"
                     } > "$HOME/.gradle/gradle.properties"
                     scripts/analysis/analysis-wrapper.sh "${{ steps.get-vars.outputs.branch }}" "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" "$GITHUB_RUN_NUMBER" "${{ steps.get-vars.outputs.pr }}"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d553729cfb36..23816c902343 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"
-          echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
-          ./gradlew assembleDebug
+          echo "org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
+          ./gradlew --no-daemon assembleDebug
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
diff --git a/.github/workflows/lib.sh b/.github/workflows/lib.sh
index 42f4b55b3efe..3bb8b10f7930 100644
--- a/.github/workflows/lib.sh
+++ b/.github/workflows/lib.sh
@@ -2,7 +2,7 @@
 #
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
-# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+# SPDX-License-Identifier: AGPL-3.0-or-later
 #
 
 ## This file is intended to be sourced by other scripts
diff --git a/.github/workflows/lib.sh.license b/.github/workflows/lib.sh.license
index 162c96150eb5..23bad5cb8a9c 100644
--- a/.github/workflows/lib.sh.license
+++ b/.github/workflows/lib.sh.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2019-2025 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index 378bcbe28c4e..ef51624feed4 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -46,10 +46,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mkdir -p "$HOME/.gradle"
-          echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
+          echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
           echo "org.gradle.caching=true; org.gradle.parallel=true; org.gradle.configureondemand=true; kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"
-          sed -i "/qa/,/\}/ s/versionCode.*/versionCode = ${{ github.event.number }}/" app/build.gradle.kts
-          sed -i "/qa/,/\}/ s/versionName.*/versionName = \"${{ github.event.number }}\"/" app/build.gradle.kts
+          sed -i "/qa/,/\}/ s/versionCode .*/versionCode ${{github.event.number}} /" "app/build.gradle"
+          sed -i "/qa/,/\}/ s/versionName .*/versionName \"${{github.event.number}}\"/" "app/build.gradle"
           ./gradlew assembleQaDebug
           $(find /usr/local/lib/android/sdk/build-tools/*/apksigner | sort | tail -n1) sign  --ks-pass pass:"$KS_PASS" --key-pass pass:"$KEY_PASS" --ks-key-alias key0 --ks ".github/workflows/QA_keystore.jks" app/build/outputs/apk/qa/debug/*qa-debug*.apk
           .github/workflows/uploadArtifact.sh "$LOG_USERNAME" "$LOG_PASSWORD" "${{github.event.number}}" "${{github.event.number}}" "$GITHUB_TOKEN"
diff --git a/.github/workflows/uploadArtifact.sh b/.github/workflows/uploadArtifact.sh
index fa263064bf66..bf96572045ab 100755
--- a/.github/workflows/uploadArtifact.sh
+++ b/.github/workflows/uploadArtifact.sh
@@ -3,7 +3,7 @@
 #
 # SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-FileCopyrightText: 2019-2022 Tobias Kaminsky <tobias@kaminsky.me>
-# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+# SPDX-License-Identifier: AGPL-3.0-or-later
 #
 
 #1: LOG_USERNAME