diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2a0993..9e4b38f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: true
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4
@@ -45,6 +47,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: true
 
     - name: Install the dependencies
       run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7073f68..784b2af 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Clone
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install the dependencies
         run: |
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5243197
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,8 @@
+[submodule "girs"]
+	path = girs
+	url = https://github.com/nemequ/vala-girs.git
+	shallow = true
+[submodule "extra-vapis"]
+	path = extra-vapis
+	url = https://gitlab.gnome.org/GNOME/vala-extra-vapis.git
+	shallow = true
diff --git a/Makefile b/Makefile
index 31ade8b..a23a44e 100644
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,7 @@ configgen: src/configgen.vala
 
 
 update-girs:
-	[ -d girs ]        && git -C girs pull        || git clone https://github.com/nemequ/vala-girs.git girs --depth 1
-	[ -d extra-vapis ] && git -C extra-vapis pull || git clone https://gitlab.gnome.org/GNOME/vala-extra-vapis.git extra-vapis --depth 1
+	git submodule update --remote --init
 
 
 #
diff --git a/extra-vapis b/extra-vapis
new file mode 160000
index 0000000..a53319e
--- /dev/null
+++ b/extra-vapis
@@ -0,0 +1 @@
+Subproject commit a53319e7cd8564712ddd550867b1a1af9317b75b
diff --git a/girs b/girs
new file mode 160000
index 0000000..167d367
--- /dev/null
+++ b/girs
@@ -0,0 +1 @@
+Subproject commit 167d367f42d6d3e218480b87c91fc4f3dcbc4107