diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
index a9c75e7d..33fb5547 100644
--- a/.github/workflows/Java.yml
+++ b/.github/workflows/Java.yml
@@ -2,6 +2,7 @@ name: Java JDBC
 on:
   push:
   pull_request:
+  workflow_call:
   workflow_dispatch:
   repository_dispatch:
 
diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml
index 38bd9aaa..955eb483 100644
--- a/.github/workflows/Nightly.yml
+++ b/.github/workflows/Nightly.yml
@@ -5,12 +5,7 @@ on:
     paths:
       - ".github/workflows/Nightly.yml"
       - "vendor.py"
-#  workflow_dispatch:
-#    inputs:
-#      # Git ref of the duckdb repo
-#      duckdb-ref:
-#        required: true
-#        type: string
+  workflow_dispatch:
   schedule:
     - cron: "17 0 * * *"
 
@@ -20,7 +15,7 @@ jobs:
   vendor:
     runs-on: ubuntu-latest
     outputs:
-      sha: ${{ steps.commit.outputs.sha }}
+      did_vendor: ${{ steps.vendor.outputs.vendor }}
 
     name: "Update vendored sources"
     if: github.repository == 'duckdb/duckdb-java'
@@ -61,4 +56,10 @@ jobs:
 
       - if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request'
         run: |
-          git push -u origin HEAD
\ No newline at end of file
+          git push -u origin HEAD
+
+  rebuild:
+    needs: vendor
+    if: ${{ needs.vendor.outputs.did_vendor != '' }}
+    uses: ./.github/workflows/Java.yml
+    secrets: inherit