diff --git a/.github/workflows/build_twrp.yml b/.github/workflows/build_twrp.yml
index 7542922..78525cc 100644
--- a/.github/workflows/build_twrp.yml
+++ b/.github/workflows/build_twrp.yml
@@ -41,8 +41,8 @@ jobs:
       uses: actions/checkout@v3
     - name: Move files to workspace
       run: |
-        mkdir workspace
-        ls | grep -v workspace | xargs -I{} mv {} workspace
+        mkdir -p workspace/${{ github.event.inputs.DEVICE_PATH }}
+        ls | grep -v workspace | xargs -I{} mv {} workspace/${{ github.event.inputs.DEVICE_PATH }}
 
     # Cleanup The Actions Workspace Using Custom Composite Run Actions
     - name: Cleanup