diff --git a/.github/workflows/external-prs-handle-comment.yml b/.github/workflows/external-prs-handle-comment.yml
index c710e23dc..0c47f9f73 100644
--- a/.github/workflows/external-prs-handle-comment.yml
+++ b/.github/workflows/external-prs-handle-comment.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Parse the comment to see if it's a deploy comment
         id: parse_comment
         run: |
-          cd ops/external-prs && pnpm tools parse-comment ${{ github.repository }} ${{ github.event.comment.id }} $GITHUB_OUTPUT 
+          cd ops/external-prs && pnpm tools oso parse-comment --repo ${{ github.repository }} ${{ github.event.comment.id }} $GITHUB_OUTPUT 
 
       # - name: Deploy if the deployment is eligible
       #   run: |
diff --git a/.github/workflows/refresh-test-credentials.yml b/.github/workflows/refresh-test-credentials.yml
index d5ef23b71..ee76728a7 100644
--- a/.github/workflows/refresh-test-credentials.yml
+++ b/.github/workflows/refresh-test-credentials.yml
@@ -8,6 +8,8 @@
 # This workflow will run every 30 mins to hopefully ensure that credentials
 # don't expire even if this script errors.
 name: refresh-test-credentials 
+env:
+  PR_TOOLS_REPO: ${{ github.repository }}
 
 # For now this only runs on a schedule once a day. Once we have made some of the
 # plugin workflows more incremental we will run this on _every_ commit to main
@@ -54,7 +56,8 @@ jobs:
         run: |
           cd ops/external-prs &&
           bash scripts/rotate-service-account.sh oso-test-dummy@oso-pull-requests.iam.gserviceaccount.com dummy.json && 
-          pnpm tools refresh-gcp-credentials --secret=false ${{ github.repository }} testing dummy.json GOOGLE_TEST_DUMMY_CREDENTIALS_JSON
+          pnpm tools oso refresh-gcp-credentials --secret=false testing dummy.json GOOGLE_TEST_DUMMY_CREDENTIALS_JSON
+        
       
       # These credentials are intended to be secret
       - name: Refresh credentials for the bigquery-admin user on the external-prs-app environment
@@ -62,7 +65,7 @@ jobs:
         run: |
           cd ops/external-prs &&
           bash scripts/rotate-service-account.sh bigquery-admin@oso-pull-requests.iam.gserviceaccount.com bigquery-admin.json && 
-          pnpm tools refresh-gcp-credentials ${{ github.repository }} external-prs-app bigquery-admin.json GOOGLE_BQ_ADMIN_CREDENTIALS_JSON
+          pnpm tools oso refresh-gcp-credentials external-prs-app bigquery-admin.json GOOGLE_BQ_ADMIN_CREDENTIALS_JSON
 
   rebuild-docker-public-vars:
     name: rebuild-docker-public-vars
diff --git a/.github/workflows/test-deploy-clean.yml b/.github/workflows/test-deploy-clean.yml
index 97a5020b0..e77a112be 100644
--- a/.github/workflows/test-deploy-clean.yml
+++ b/.github/workflows/test-deploy-clean.yml
@@ -39,5 +39,5 @@ jobs:
 
       - name: Clean up datasets that are older than 1 day
         run: |
-          cd ops/external-ops && pnpm tools test-deploy clean --project-id ${{ vars.GOOGLE_PROJECT_ID }} opensource-observer/oso 86400
+          cd ops/external-ops && pnpm tools oso test-deploy clean --project-id ${{ vars.GOOGLE_PROJECT_ID }} --repo opensource-observer/oso 86400
           
\ No newline at end of file
diff --git a/.github/workflows/test-deploy-owners.yml b/.github/workflows/test-deploy-owners.yml
index 907ca2d40..0ad739868 100644
--- a/.github/workflows/test-deploy-owners.yml
+++ b/.github/workflows/test-deploy-owners.yml
@@ -11,6 +11,7 @@ env:
   # should not be set to a legitimate value for testing. This will use up API
   # quota otherwise
   DUNE_API_KEY: "none"
+  PR_TOOLS_REPO: ${{ github.repository }}
 
 # Trigger the workflow when:
 on:
@@ -40,7 +41,7 @@ jobs:
       - name: Initialize check
         run: |
           cd ops/external-prs &&
-          pnpm tools initialize-check ${{ github.repository }} ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.user.login }}
+          pnpm tools oso initialize-check ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.user.login }}
 
       - name: Author association debug
         run: |
diff --git a/.github/workflows/test-deploy/action.yml b/.github/workflows/test-deploy/action.yml
index 2afac462b..66a5df73c 100644
--- a/.github/workflows/test-deploy/action.yml
+++ b/.github/workflows/test-deploy/action.yml
@@ -43,7 +43,7 @@ runs:
     # - name: Evaluate if this is eligible for deployment
     #   id: is_eligible
     #   run: |
-    #     cd ops/external-prs && pnpm tools test-deploy is-eligible $GITHUB_OUTPUT
+    #     cd ops/external-prs && pnpm tools oso test-deploy is-eligible $GITHUB_OUTPUT
 
     - name: checkout the PR
       uses: actions/checkout@v3
@@ -72,6 +72,8 @@ runs:
       shell: bash
       run: |
         mkdir -p $HOME/.dbt &&
-        cd ops/external-prs && pnpm tools test-deploy --project-id ${{ inputs.google_project_id }} setup ${{ github.repository }} ${{ inputs.pr }} ${{ inputs.sha }} $HOME/.dbt/profiles.yml ${{ inputs.gcp_service_account_path }} pr-clone
+        cd ops/external-prs && pnpm tools oso test-deploy --project-id ${{ inputs.google_project_id }} setup ${{ inputs.pr }} ${{ inputs.sha }} $HOME/.dbt/profiles.yml ${{ inputs.gcp_service_account_path }} pr-clone
+      env:
+        PR_TOOLS_REPO: ${{ github.repository }}
       
     
\ No newline at end of file