diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Vendor.yml
similarity index 78%
rename from .github/workflows/Nightly.yml
rename to .github/workflows/Vendor.yml
index 5ad8f7472..214510869 100644
--- a/.github/workflows/Nightly.yml
+++ b/.github/workflows/Vendor.yml
@@ -1,10 +1,5 @@
+name: Vendor
 on:
-  push:
-    branches:
-      - main
-    paths:
-      - ".github/workflows/Nightly.yml"
-      - "vendor.py"
   workflow_call:
     inputs:
       duckdb-sha:
@@ -19,10 +14,6 @@ on:
         required: false
         default: ''
         type: 'string'
-  schedule:
-    - cron: "17 0 * * *"
-
-name: Vendor upstream DuckDB sources
 
 jobs:
   vendor:
@@ -30,17 +21,14 @@ jobs:
     outputs:
       did_vendor: ${{ steps.vendor.outputs.vendor }}
 
-    name: "Update vendored sources"
+    name: "Update Vendored Sources"
     if: github.repository == 'duckdb/duckdb-java'
 
     steps:
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.PAT_TOKEN }}
 
       - uses: actions/checkout@v4
         with:
@@ -60,13 +48,14 @@ jobs:
       - name: Vendor sources
         id: vendor
         run: |
+          export REV=$(cd .git/duckdb && git rev-parse --short HEAD && cd ../..)
+          echo "Updating vendored DuckDB sources to $REV"
           git config --global user.email "github_bot@duckdblabs.com"
           git config --global user.name "DuckDB Labs GitHub Bot"
           git rm -rf src/duckdb
           python vendor.py --duckdb .git/duckdb
           git add src/duckdb CMakeLists.txt
           rm -rf .git/duckdb
-          export REV=`git rev-parse --short HEAD`
           git commit -m "Update vendored DuckDB sources to $REV"
           git push --dry-run
           # Check if ahead of upstream branch
@@ -79,9 +68,3 @@ jobs:
       - if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request'
         run: |
           git push -u origin HEAD
-
-  rebuild:
-    needs: vendor
-    if: ${{ needs.vendor.outputs.did_vendor != '' }}
-    uses: ./.github/workflows/Java.yml
-    secrets: inherit