diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 5406dd1f93ec..e24676e9a883 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -61,6 +61,8 @@ jobs:
                 with:
                     distribution: "temurin"
                     java-version: 25
+            -   name: Setup Gradle
+                uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
             -   name: Install dependencies
                 run: |
                     sudo apt install python3-defusedxml
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8d6ca036b1ed..21e68d12a959 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -57,6 +57,8 @@ jobs:
         with:
           distribution: "temurin"
           java-version: 25
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index 42c2cb09a3e5..536b1a549310 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -37,6 +37,10 @@ jobs:
           distribution: "temurin"
           java-version: 25
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
+        if: ${{ steps.check-secrets.outputs.ok == 'true' }}
+
       - name: Build QA
         id: build-qa
         if: ${{ steps.check-secrets.outputs.ok == 'true' }}
diff --git a/Gemfile.lock b/Gemfile.lock
index ab0f0afc4d51..b99098d9002e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.8)
     abbrev (0.1.2)
-    addressable (2.9.0)
+    addressable (2.9.2)
       public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     atomos (0.1.3)
@@ -117,6 +117,8 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-huawei_appgallery_connect (1.1.3)
+      cgi
     fastlane-sirp (1.1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.110.0)
@@ -127,8 +129,8 @@ GEM
       faraday-follow_redirects (~> 0.3)
       googleauth (~> 1.14)
       mini_mime (~> 1.1)
-      multi_json (~> 1.11)
-      representable (~> 3.0)
+      multi_json (~> 1.21, >= 1.21.2)
+      representable (~> 3.3, >= 3.3.1)
       retriable (>= 3.1, < 5.0)
     google-apis-iamcredentials_v1 (0.28.0)
       google-apis-core (>= 0.15.0, < 2.a)
@@ -136,7 +138,7 @@ GEM
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-storage_v1 (0.70.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.9.0)
+    google-cloud-core (1.9.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (2.4.1)
@@ -262,6 +264,7 @@ PLATFORMS
 DEPENDENCIES
   abbrev
   fastlane
+  fastlane-plugin-huawei_appgallery_connect
 
 BUNDLED WITH
-   2.5.4
+  4.0.24
diff --git a/fastlane/common.Fastfile b/fastlane/common.Fastfile
index 4027e3b6eff7..54a61cc72e58 100644
--- a/fastlane/common.Fastfile
+++ b/fastlane/common.Fastfile
@@ -252,7 +252,7 @@ platform :android do
 			flavor: options[:flavor],
 			build_type: 'Release',
 			print_command: false,
-			properties: GRADLE_SIGNING_PROPERTIES
+			properties: defined?(APK_SIGNING_PROPERTIES) ? APK_SIGNING_PROPERTIES : GRADLE_SIGNING_PROPERTIES
 			)
 			
 		sh("mv ../app/build/outputs/apk/#{options[:flavor]}/release/*.apk ../release/nextcloud-#{APP}-#{options[:flavor]}-#{options[:versionCode]}.apk")