diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index dddf1fce..4e3ebf61 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -6,9 +6,6 @@ on:
 
   pull_request:
 
-  # Used to trigger the flow from Npgsql/EFCore.PG via HTTP POST
-  repository_dispatch:
-
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -23,6 +20,8 @@ jobs:
     steps:
     - name: Checkout repo
       uses: actions/checkout@v6
+      with:
+        submodules: true
 
     - name: Use Node.js
       uses: actions/setup-node@v6.4.0
@@ -41,26 +40,12 @@ jobs:
       with:
         dotnet-version: 10.0.x
 
-    - name: Checkout Npgsql
-      uses: actions/checkout@v6
-      with:
-        repository: npgsql/npgsql
-        ref: docs
-        path: Npgsql
-
     # docfx has issues specifically with analyzer/sourcegen projects; build manually before.
     - name: Build Npgsql
       run: dotnet build -c Release
       shell: bash
       working-directory: Npgsql
 
-    - name: Checkout EFCore.PG
-      uses: actions/checkout@v6
-      with:
-        repository: npgsql/Npgsql.EntityFrameworkCore.PostgreSQL
-        ref: docs
-        path: EFCore.PG
-
     - name: Build EFCore.PG
       run: dotnet build -c Release
       shell: bash
diff --git a/.gitignore b/.gitignore
index 6114fe90..d069b0a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 obj
-/EFCore.PG
-/Npgsql
 /_site
 /_exported_templates
diff --git a/.gitmodules b/.gitmodules
index e69de29b..79b5f1c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "Npgsql"]
+	path = Npgsql
+	url = https://github.com/npgsql/npgsql.git
+[submodule "EFCore.PG"]
+	path = EFCore.PG
+	url = https://github.com/npgsql/Npgsql.EntityFrameworkCore.PostgreSQL.git
diff --git a/EFCore.PG b/EFCore.PG
new file mode 160000
index 00000000..2679a9d7
--- /dev/null
+++ b/EFCore.PG
@@ -0,0 +1 @@
+Subproject commit 2679a9d768d14f34d077e037311f80acb6f6b3b4
diff --git a/Npgsql b/Npgsql
new file mode 160000
index 00000000..4d57e27b
--- /dev/null
+++ b/Npgsql
@@ -0,0 +1 @@
+Subproject commit 4d57e27b370e2ab2a350ad8bcef78d7ddd97e5ea