diff --git a/.github/workflows/build-emscripten.yml b/.github/workflows/build-emscripten.yml
index c71522d28..1090bc0ff 100644
--- a/.github/workflows/build-emscripten.yml
+++ b/.github/workflows/build-emscripten.yml
@@ -60,11 +60,11 @@ jobs:
 
             // List all artifacts for the repository
             const artifacts = await github.rest.actions.listArtifactsForRepo({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
+              owner: 'openframeworks',
+              repo: 'apothecary',
               sort: 'created_at',
               direction: 'desc',
-              per_page: 100
+              per_page: 50
             });
 
             const target = process.env.TARGET;
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
index f0a66acf7..34610488f 100644
--- a/.github/workflows/build-ios.yml
+++ b/.github/workflows/build-ios.yml
@@ -63,11 +63,11 @@ jobs:
 
             // List all artifacts for the repository
             const artifacts = await github.rest.actions.listArtifactsForRepo({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
+              owner: 'openframeworks',
+              repo: 'apothecary',
               sort: 'created_at',
               direction: 'desc',
-              per_page: 20
+              per_page: 50
             });
 
             const artifactNamesToDownload = ['libs-ios-ios-1', 'libs-ios-ios-2', 'libs-ios-ios-3'];
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 4bed78932..f97d5fbb5 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -63,11 +63,11 @@ jobs:
 
             // List all artifacts for the repository
             const artifacts = await github.rest.actions.listArtifactsForRepo({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
+              owner: 'openframeworks',
+              repo: 'apothecary',
               sort: 'created_at',
               direction: 'desc',
-              per_page: 20
+              per_page: 50
             });
             const max=3;
             const artifactNamesToDownload = ['libs-macos-osx-1', 'libs-macos-osx-2', 'libs-macos-osx-3'];
diff --git a/.github/workflows/build-tvos.yml b/.github/workflows/build-tvos.yml
index ce903e0b8..80a81f209 100644
--- a/.github/workflows/build-tvos.yml
+++ b/.github/workflows/build-tvos.yml
@@ -63,11 +63,11 @@ jobs:
 
             // List all artifacts for the repository
             const artifacts = await github.rest.actions.listArtifactsForRepo({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
+              owner: 'openframeworks',
+              repo: 'apothecary',
               sort: 'created_at',
               direction: 'desc',
-              per_page: 20
+              per_page: 50
             });
 
             const artifactNamesToDownload = ['libs-tvos-tvos-1', 'libs-tvos-tvos-2', 'libs-tvos-tvos-3'];
diff --git a/.github/workflows/build-vs2022-arm64.yml b/.github/workflows/build-vs2022-arm64.yml
index 248a34c75..4815c1f74 100644
--- a/.github/workflows/build-vs2022-arm64.yml
+++ b/.github/workflows/build-vs2022-arm64.yml
@@ -83,11 +83,11 @@ jobs:
 
           // List all artifacts for the repository
           const artifacts = await github.rest.actions.listArtifactsForRepo({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            sort: 'created_at',
-            direction: 'desc',
-            per_page: 48
+              owner: 'openframeworks',
+              repo: 'apothecary',
+              sort: 'created_at',
+              direction: 'desc',
+              per_page: 50
           });
 
           const target = process.env.TARGET;
diff --git a/.github/workflows/build-vs2022-arm64ec.yml b/.github/workflows/build-vs2022-arm64ec.yml
index 69afbc2e6..4653bd189 100644
--- a/.github/workflows/build-vs2022-arm64ec.yml
+++ b/.github/workflows/build-vs2022-arm64ec.yml
@@ -83,11 +83,11 @@ jobs:
 
           // List all artifacts for the repository
           const artifacts = await github.rest.actions.listArtifactsForRepo({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            sort: 'created_at',
-            direction: 'desc',
-            per_page: 30
+              owner: 'openframeworks',
+              repo: 'apothecary',
+              sort: 'created_at',
+              direction: 'desc',
+              per_page: 50
           });
 
           const target = process.env.TARGET;
diff --git a/.github/workflows/build-vs2022-x64.yml b/.github/workflows/build-vs2022-x64.yml
index 36874e6ae..4319745a3 100644
--- a/.github/workflows/build-vs2022-x64.yml
+++ b/.github/workflows/build-vs2022-x64.yml
@@ -82,11 +82,11 @@ jobs:
 
           // List all artifacts for the repository
           const artifacts = await github.rest.actions.listArtifactsForRepo({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            sort: 'created_at',
-            direction: 'desc',
-            per_page: 30
+              owner: 'openframeworks',
+              repo: 'apothecary',
+              sort: 'created_at',
+              direction: 'desc',
+              per_page: 50
           });
 
           const target = process.env.TARGET;
diff --git a/.github/workflows/build-xcframework.yml b/.github/workflows/build-xcframework.yml
index 1f82cce5b..c87bdced2 100644
--- a/.github/workflows/build-xcframework.yml
+++ b/.github/workflows/build-xcframework.yml
@@ -94,11 +94,11 @@ jobs:
 
             // List all artifacts for the repository
             const artifacts = await github.rest.actions.listArtifactsForRepo({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
+              owner: 'openframeworks',
+              repo: 'apothecary',
               sort: 'created_at',
               direction: 'desc',
-              per_page: 30
+              per_page: 50
             });
 
             const max=9;
diff --git a/.github/workflows/clean-up-artifacts.yml b/.github/workflows/clean-up-artifacts.yml
index 927f94412..c7f65d5ce 100644
--- a/.github/workflows/clean-up-artifacts.yml
+++ b/.github/workflows/clean-up-artifacts.yml
@@ -39,6 +39,7 @@ jobs:
         shell: msys2 {0}
     steps:
     - name: Log old artifacts for potential deletion
+      if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
       uses: actions/github-script@v7.0.1
       env:
         GH_TOKEN: ${{ secrets.CI_SECRET }}