diff --git a/.github/workflows/deployment-staging.yml b/.github/workflows/deployment-staging.yml
index d972d30f..736a2621 100644
--- a/.github/workflows/deployment-staging.yml
+++ b/.github/workflows/deployment-staging.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   deploy_web:
-    if: ${{ github.ref == 'CATcher-org/WATcher-staging' }}
+    if: ${{ github.repository == 'CATcher-org/WATcher-staging' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
diff --git a/.github/workflows/staging-fetch.yml b/.github/workflows/staging-fetch.yml
index 028df14b..6e25936a 100644
--- a/.github/workflows/staging-fetch.yml
+++ b/.github/workflows/staging-fetch.yml
@@ -19,8 +19,9 @@ jobs:
       - name: Checkout Upstream
         uses: actions/checkout@v2
         with:
-          ref: deploy
-          token: ${{ secrets.DEPLOY_TOKEN }}
+          repository: CATcher-org/WATcher-staging
+          ref: master
+          token: ${{ secrets.STAGING_TOKEN }}
           fetch-depth: 0
       - name: Merge Upstream
         run: |
diff --git a/package.json b/package.json
index cea32036..15c039c8 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "ng": "ng",
     "build:staging": "npm run codegen:gql && ng build --c staging --base-href=https://catcher-org.github.io/WATcher-staging/",
-    "build:prod:web": "npm run codegen:gql && ng build --prod --base-href=https://catcher-org.github.io/WATcher/",
+    "build:prod:web": "npm run codegen:gql && ng build --prod --base-href=https://CATcher-org.github.io/WATcher/",
     "ng:serve": "npm run codegen:gql && ng serve",
     "ng:serve:web": "npm run ng:serve -- -o",
     "deploy:staging": "npm run build:staging && ngh --dir=dist --name=WATcher --email=se-edu@comp.nus.edu.sg --no-silent",