diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index dd2f1edeb..190b891e1 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -90,6 +90,9 @@ jobs:
           echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
           echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
 
+      - name: Rename app
+        run: sed -i -e "s/\${APP_NAME}/$GITHUB_HEAD_REF/g" /opt/android/cake_wallet/android/app/src/main/AndroidManifest.xml
+
       - name: Build
         run: |
           cd /opt/android/cake_wallet
@@ -111,6 +114,16 @@ jobs:
       - name: Send Test APK
         run: |
           cd /opt/android/cake_wallet
-          var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/app-release.apk)
+          var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/$GITHUB_HEAD_REF.apk -H "Max-Days: 10")
           curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
 
+      - name: Rename apk file
+        run: |
+          cd /opt/android/cake_wallet/build/app/outputs/apk/release
+          mkdir test-apk
+          mv app-release.apk test-apk/$GITHUB_HEAD_REF.apk
+
+      - name: Upload Artifact
+        uses: kittaakos/upload-artifact-as-is@v0
+        with:
+          path: /opt/android/cake_wallet/build/app/outputs/apk/release/test-apk/