diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b3151cb..55503642 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,49 +42,29 @@ jobs:
       - store_artifacts:
           path: app/build/outputs/mapping/release/
           destination: mapping/
-
-  upload_apk:
-    working_directory: ~/code/app/build/outputs/apk/release
-
-    docker:
-      - image: circleci/android:api-30-ndk
-
-    environment:
-      JVM_OPTS: -Xmx4G
-
-    steps:
       - run:
           name: Define Environment Variable at Runtime
           command: |
-            echo "export APP_VERSION_NAME=\$(cat output-metadata.json | jq '.elements[0].versionName' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
-            echo "export APP_OUTPUT_FILE=\$(cat output-metadata.json | jq '.elements[0].outputFile' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
-            echo "export APP_VERSION_CODE=\$(cat output-metadata.json | jq '.elements[0].versionCode'" >> $BASH_ENV
+            echo "export APP_VERSION_NAME=\$(cat ./app/build/outputs/apk/release/output-metadata.json | jq '.elements[0].versionName' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
+            echo "export APP_OUTPUT_FILE=\$(cat ./app/build/outputs/apk/release/output-metadata.json | jq '.elements[0].outputFile' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
+            echo "export APP_VERSION_CODE=\$(cat ./app/build/outputs/apk/release/output-metadata.json | jq '.elements[0].versionCode'" >> $BASH_ENV
             source $BASH_ENV
-      - publish:
+
+workflows:
+  version: 2
+  build_and_upload:
+    jobs:
+      - build
+      - app-center/publish:
+          working_directory: ~/code/app/build/outputs/apk/release
           name: Publish to App Center
           group: HuanCheng65
           file: $APP_OUTPUT_FILE
           app: TiebaLite
           token: $APP_CENTER_TOKEN
           notes: $APP_VERSION_NAME
-
-  upload_mapping:
-    working_directory: ~/code/app/build/outputs/mapping/release
-
-    docker:
-      - image: circleci/android:api-30-ndk
-
-    environment:
-      JVM_OPTS: -Xmx4G
-
-    steps:
-      - run:
-          name: Define Environment Variable at Runtime
-          command: |
-            echo "export APP_VERSION_NAME=\$(cat output-metadata.json | jq '.elements[0].versionName' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
-            echo "export APP_VERSION_CODE=\$(cat output-metadata.json | jq '.elements[0].versionCode'" >> $BASH_ENV
-            source $BASH_ENV
-      - mapping:
+      - app-center/mapping:
+          working_directory: ~/code/app/build/outputs/mapping/release
           name: Upload to App Center
           file: mapping.txt
           app: TiebaLite