diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
index 3cd08e048..e7ed6b49a 100644
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@@ -62,14 +62,13 @@ jobs:
           gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg
           gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
           gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-      - name: Build HMS version
+      - name: Prepare credentials
+        env:
+          AGC_CREDENTIALS: ${{ secrets.AGC_CREDENTIALS }}
+        run: echo $AGC_CREDENTIALS > ./app/src/release/agconnect-credentials.json
+      - name: Build and publish HMS version
         env:
           PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
           PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
           PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-        run: ./gradlew assembleHmsRelease --stacktrace
-      - name: Upload APK to AppGallery
-        env:
-          AGC_CLIENT_ID: ${{ secrets.AGC_CLIENT_ID }}
-          AGC_CLIENT_SECRET: ${{ secrets.AGC_CLIENT_SECRET }}
-        run: ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace;
+        run: ./gradlew assembleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace
diff --git a/.gitignore b/.gitignore
index 5d3321e3f..3709487b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,4 @@ Thumbs.db
 
 
 app/src/release/agconnect-services.json
+app/src/release/agconnect-credentials.json
diff --git a/app/build.gradle b/app/build.gradle
index 6c8f0ca6a..ac2e3d25b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,8 +143,7 @@ play {
 huaweiPublish {
     instances {
         hmsRelease {
-            clientId = System.getenv("AGC_CLIENT_ID")
-            clientSecret = System.getenv("AGC_CLIENT_SECRET")
+            credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
             buildFormat = "apk"
             deployType = "draft"
         }
diff --git a/build.gradle b/build.gradle
index 7862eab49..b91b4b8b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         classpath 'com.huawei.agconnect:agcp:1.5.2.201'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
         classpath "com.github.triplet.gradle:play-publisher:2.8.0"
-        classpath "ru.cian:huawei-publish-gradle-plugin:1.2.2"
+        classpath "ru.cian:huawei-publish-gradle-plugin:1.2.4"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.2.0"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"