diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml
index df9785d61..fdb313d27 100644
--- a/.github/workflows/update-public-instances.yml
+++ b/.github/workflows/update-public-instances.yml
@@ -26,11 +26,23 @@ jobs:
           cd piu && yarn && yarn run update && cd ..
           cp piu/instances.toml morg/content/public-instances/instances.toml
 
-      - name: Commit and push data
+      - name: Commit and push data (within PR)
+        if: ${{ github.event_name == 'pull_request' }}
         run: |
-          cd morg
           git config --global user.name "GitHub CI"
           git config --global user.email "noreply@matrix.org"
-          git add ecosystem/public-instances/instances.toml
+          git switch ${ github.ref_name }
+          git add public-instances/instances.toml
           git commit -m "Update instances.toml"
           git push
+        working-directory: morg
+
+      - name: Commit and push data (scheduled)
+        if: ${{ github.event_name == 'schedule' }}
+        run: |
+          git config --global user.name "GitHub CI"
+          git config --global user.email "noreply@matrix.org"
+          git add public-instances/instances.toml
+          git commit -m "Update instances.toml"
+          git push
+        working-directory: morg