diff --git a/.github/workflows/pbrp-organization-ci.yml b/.github/workflows/pbrp-organization-ci.yml
index 440d5e8..b821c2f 100644
--- a/.github/workflows/pbrp-organization-ci.yml
+++ b/.github/workflows/pbrp-organization-ci.yml
@@ -10,6 +10,8 @@ on:
         description: 'Build ChangeLogs'
         required: true
         default: 'Sync Latest Source'
+  watch:
+    types: [started]
 
 env:
   BUILD_RELEASE_TYPE: ${{ github.event.inputs.DEPLOY_TYPE }}
@@ -30,21 +32,34 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-       - name: Cleaning Up Runner
-         uses: rokibhasansagar/slimhub_actions@main
-
        - name: Auto Adapt Manifest
-         # /* if your branch name is other than the one which you dispatched workflow from then set it manually in the place of ${GITHUB_REF##*/}" */ 
-         run: echo "MANIFEST=https://github.com/PitchBlackRecoveryProject/manifest_pb -b ${GITHUB_REF##*/}" >> $GITHUB_ENV
+         run: echo "MANIFEST=https://github.com/PitchBlackRecoveryProject/manifest_pb -b android-9.0" >> $GITHUB_ENV
 
        - name: Export Vars
          run: |
               if [[ ${BUILD_RELEASE_TYPE} == "TEST" ]]; then echo "TEST_BUILD=true"  >> $GITHUB_ENV;fi
               if [[ ${BUILD_RELEASE_TYPE} == "BETA" ]]; then echo "BETA_BUILD=true"  >> $GITHUB_ENV;fi
               if [[ ${BUILD_RELEASE_TYPE} == "OFFICIAL" ]]; then echo "PB_OFFICIAL=true"  >> $GITHUB_ENV;fi
+       - name: Checkout Cleaning Up Runner Repo
+         uses: actions/checkout@v2
+         with:
+           repository: PitchBlackRecoveryProject/Cleaner
+           ref: main
+           token: ${{ secrets.GH_BOT_TOKEN }}
+           path: .github/actions/Cleaner
+       - name: Cleaning
+         uses: ./.github/actions/Cleaner
+
+       - name: Checkout Recovery Compiler Repo
+         uses: actions/checkout@v2
+         with:
+           repository: PitchBlackRecoveryProject/Compiler
+           ref: production
+           token: ${{ secrets.GH_BOT_TOKEN }}
+           path: .github/actions/Compiler
 
        - name: Recovery Compilation
-         uses: PitchBlackRecoveryProject/Recovery-Compiler@production
+         uses: ./.github/actions/Compiler
        
        - name: Release Builds 
          run: |