diff --git a/.github/workflows/SkyHawk-SHRP.yml b/.github/workflows/SkyHawk-SHRP.yml
index 2b8b5bc..5ceb8d7 100644
--- a/.github/workflows/SkyHawk-SHRP.yml
+++ b/.github/workflows/SkyHawk-SHRP.yml
@@ -58,8 +58,7 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.event.repository.owner.id == github.event.sender.id
     env:
-      ANDROID_ROOT: ${{ github.workspace }}/android-recovery
-      OUT_DIR: ${{ github.workspace }}/android-recovery/out/target/product
+      OUT_DIR: android-recovery/out/target/product
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     permissions:
       contents: write
@@ -173,7 +172,7 @@ jobs:
         name: Unofficial SHRP For ${{ github.event.inputs.DEVICE_NAME }} // ${{ env.BUILD_DATE }}
         tag_name: ${{ github.run_id }}
         body: |
-          Build: ${{ github.event.inputs.MANIFEST_BRANCH }}
+          Build: ${{ env.MANIFEST_BRANCH }}
           Device: [Device Tree/Branch](${{ github.event.inputs.DEVICE_TREE }}/tree/${{ github.event.inputs.DEVICE_TREE_BRANCH }})
           Commit: Most recent [commit](${{ github.event.inputs.DEVICE_TREE }}/commit/${{ env.COMMIT_ID }}) during building.