diff --git a/Gemfile b/Gemfile
index 1642e64e8..906ddc55a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,5 +3,5 @@ source "https://rubygems.org"
 gem "fastlane"
 gem "abbrev"
 
-plugins_path = File.join(File.dirname(__FILE__), '.', 'Pluginfile')
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index ccf8875a2..fc9c0423f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,8 +8,8 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.1)
-    aws-partitions (1.1300.0)
-    aws-sdk-core (3.263.0)
+    aws-partitions (1.1301.0)
+    aws-sdk-core (3.264.0)
       aws-eventstream (~> 1, >= 1.4.1)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -18,11 +18,11 @@ GEM
       jmespath (~> 1, >= 1.6.1)
       logger
       rexml (~> 3.4, >= 3.4.2)
-    aws-sdk-kms (1.138.0)
-      aws-sdk-core (~> 3, >= 3.263.0)
+    aws-sdk-kms (1.139.0)
+      aws-sdk-core (~> 3, >= 3.264.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.237.0)
-      aws-sdk-core (~> 3, >= 3.263.0)
+    aws-sdk-s3 (1.238.0)
+      aws-sdk-core (~> 3, >= 3.264.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -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.111.0)
@@ -195,7 +197,7 @@ GEM
     pp (0.6.4)
       prettyprint
     prettyprint (0.2.1)
-    prism (1.9.0)
+    prism (2.1.0-x86_64-linux-gnu)
     pstore (0.3.0)
     public_suffix (7.0.5)
     rake (13.4.2)
@@ -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 587310c03..1c8a35c18 100644
--- a/fastlane/common.Fastfile
+++ b/fastlane/common.Fastfile
@@ -171,8 +171,8 @@ platform :android do
     private_lane :writeVersions do |options|
         File.open("../app/build.gradle.kts","r+") do |file|
             text = file.read
-            text.gsub!(/versionName = "(.*)"$/, "versionName = \"#{options[:versionName]}\"")
-            text.gsub!(/versionCode = ([0-9]*)$/, "versionCode = #{options[:versionCode]}")
+            text.sub!(/versionName = "(.*)"$/, "versionName = \"#{options[:versionName]}\"")
+            text.sub!(/versionCode = ([0-9]*)$/, "versionCode = #{options[:versionCode]}")
             file.rewind
             file.write(text)
             file.truncate(file.pos)
@@ -275,7 +275,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")
@@ -340,8 +340,8 @@ platform :android do
 			name: options[:name],
 			is_prerelease: options[:isPrerelease],
 			tag_name: options[:tag],
-			description: (File.read("metadata/android/en-US/changelogs/" + options[:versionCode] + ".txt") rescue "No changelog provided"),
-			upload_assets: Dir.glob("release/*.apk")
+			description: (File.read("metadata/android/en-US/changelogs/#{options[:versionCode]}.txt") rescue "No changelog provided"),
+			upload_assets: Dir.glob(File.expand_path("../release/*.apk"))
 		)
 	end