diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 9950ab3a..14e77330 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -29,18 +29,22 @@ jobs:
       run:  bash ./gradlew zipRelease zipDebug
     - name: Prepare artifact
       if: success()
-      run: unzip core/release/LSPosed-v*-release.zip -d LSPosed-release;
-           unzip core/release/LSPosed-v*-debug.zip -d LSPosed-debug;
+      id: prepareArtifact
+      run: |
+        releaseName=`ls core/release/LSPosed-v*-release.zip | awk -F '(/|.zip)' '{print $3}'` && echo "::set-output name=releaseName::$releaseName"
+        debugName=`ls core/release/LSPosed-v*-debug.zip | awk -F '(/|.zip)' '{print $3}'` && echo "::set-output name=debugName::$debugName"
+        unzip core/release/LSPosed-v*-release.zip -d LSPosed-release
+        unzip core/release/LSPosed-v*-debug.zip -d LSPosed-debug
     - name: Upload release
       uses: actions/upload-artifact@v2
       with:
-        name: LSPosed-release
+        name: ${{ steps.prepareArtifact.outputs.releaseName }}
         path: './LSPosed-release/*'
     - name: Upload debug
 #      if: ${{ github.event_name == 'pull_request' && success() }}
       uses: actions/upload-artifact@v2
       with:
-        name: LSPosed-debug
+        name: ${{ steps.prepareArtifact.outputs.debugName }}
         path: './LSPosed-debug/*'
     - name: Post to channel
       if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
diff --git a/.github/workflows/manager.yml b/.github/workflows/manager.yml
index 1e315e34..2cdcfd02 100644
--- a/.github/workflows/manager.yml
+++ b/.github/workflows/manager.yml
@@ -25,7 +25,10 @@ jobs:
         with:
           java-version: 1.8
       - name: Build with Gradle
-        run:  bash ./gradlew :app:assembleRelease
+        id: buildRelease
+        run: |
+          bash ./gradlew :app:assembleRelease
+          echo "::set-output name=releaseName::`ls app/build/outputs/apk/release/LSPosed*-v*-release.apk | awk -F '(/|.apk)' '{print $6}'`"
       - name: Sign Manager Release
         if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
         id: sign
@@ -42,13 +45,13 @@ jobs:
         if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
         uses: actions/upload-artifact@v2
         with:
-          name: manager
+          name: '${{ steps.buildRelease.outputs.releaseName }}-signed'
           path: ${{ steps.sign.outputs.signedReleaseFile }}
       - name: Upload unsigned apk
         if: ${{ github.event_name == 'pull_request' || failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: manager-unsigned
+          name: '${{ steps.buildRelease.outputs.releaseName }}-unsigned'
           path: "app/build/outputs/apk/release/*.apk"
       - name: Upload mappings
         uses: actions/upload-artifact@v2