diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 200a609c..9865062e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -116,7 +116,7 @@ jobs:
 
       - name: clean destination
         # Note: needed when changing a directory to a symlink, for example in
-        # https://github.com/teaxyz/pantry.extra/pull/435
+        # https://github.com/teaxyz/pantry/pull/435
         run: |
           tar tzf $GITHUB_WORKSPACE/artifacts.tgz | \
             awk '{ print length, $0 }' | \
@@ -162,7 +162,7 @@ jobs:
   stage:
     needs: [test]
     # this only works for PRs from our team to our repo (security! :( )
-    if: startsWith(github.ref, 'refs/pull/') && startsWith(github.repository, 'teaxyz/pantry.') && needs.test.outputs.HAS_SECRETS == 'true'
+    if: startsWith(github.ref, 'refs/pull/') && github.repository_owner == 'teaxyz' && needs.test.outputs.HAS_SECRETS == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index b4202e61..71dcecc1 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -11,8 +11,6 @@ jobs:
       has-artifacts: ${{ steps.has-artifacts.outputs.has-artifacts }}
     steps:
       - uses: actions/checkout@v3
-        with:
-          repo: teaxyz/pantry.core
 
       - uses: teaxyz/brewkit/actions/setup-brewkit@v0
 
@@ -91,7 +89,7 @@ jobs:
             RESULT="$RESULT $y"
           done
           echo "diff=$RESULT" >> $GITHUB_OUTPUT
-      - run: gh workflow run new-version.yml -R teaxyz/pantry.core -f "projects=$PROJECTS"
+      - run: gh workflow run new-version.yml -f "projects=$PROJECTS"
         if: ${{ steps.diff.outputs.diff != '' }}
         env:
           GITHUB_TOKEN: ${{ secrets.TEMP_JACOBS_GITHUB_PAT }}
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 3597def2..69a9208f 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -24,6 +24,6 @@ jobs:
           PR=$(echo ${{github.ref}} | sed -e 's_refs/pull/\(.*\)/merge_\1_')
 
           aws s3 rm --recursive s3://$AWS_S3_CACHE/pull-request/$REPO/$PR
-        if: startsWith(github.ref, 'refs/pull/') && startsWith(github.repository, 'teaxyz/pantry.')
+        if: startsWith(github.ref, 'refs/pull/') && github.repository_owner == 'teaxyz'
         env:
           AWS_S3_CACHE: ${{ secrets.AWS_S3_CACHE }}
\ No newline at end of file