diff --git a/.gitmodules b/.gitmodules
index 95e478b8..8dd7926e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,3 +21,6 @@
 [submodule "libs/glfw/libs/xcode-frameworks"]
 	path = libs/glfw/libs/xcode-frameworks
 	url = https://github.com/hexops/xcode-frameworks
+[submodule "libs/gpu/libs/mach-gpu-dawn"]
+	path = libs/gpu/libs/mach-gpu-dawn
+	url = https://github.com/hexops/mach-gpu-dawn
diff --git a/libs/gpu/.github/workflows/ci.yml b/libs/gpu/.github/workflows/ci.yml
index f64cc37a..df7104fa 100644
--- a/libs/gpu/.github/workflows/ci.yml
+++ b/libs/gpu/.github/workflows/ci.yml
@@ -15,12 +15,7 @@ jobs:
           sudo apt install xz-utils
           sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.11.0-dev.3883+7166407d8.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: build
-        run: |
-          rm -rf libs/mach-glfw
-          rm -rf libs/mach-gpu-dawn
-          git clone --recursive https://github.com/hexops/mach-glfw libs/mach-glfw
-          git clone --recursive https://github.com/hexops/mach-gpu-dawn libs/mach-gpu-dawn
-          zig build
+        run: zig build
       - name: test
         run: zig build test
   x86_64-windows:
@@ -38,12 +33,7 @@ jobs:
           7z x zig.zip
           Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.11.0-dev.3883+7166407d8\"
       - name: build
-        run: |
-          Remove-Item -Recurse -Force libs/mach-glfw
-          Remove-Item -Recurse -Force libs/mach-gpu-dawn
-          git clone --recursive https://github.com/hexops/mach-glfw libs/mach-glfw
-          git clone --recursive https://github.com/hexops/mach-gpu-dawn libs/mach-gpu-dawn
-          zig build
+        run: zig build
       - name: test
         run: zig build test
   x86_64-macos:
@@ -58,11 +48,6 @@ jobs:
           brew install xz
           sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.11.0-dev.3883+7166407d8.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: build
-        run: |
-          rm -rf libs/mach-glfw
-          rm -rf libs/mach-gpu-dawn
-          git clone --recursive https://github.com/hexops/mach-glfw libs/mach-glfw
-          git clone --recursive https://github.com/hexops/mach-gpu-dawn libs/mach-gpu-dawn
-          zig build
+        run: zig build
       - name: test
         run: zig build test
diff --git a/libs/gpu/.gitmodules b/libs/gpu/.gitmodules
new file mode 100644
index 00000000..6a6fe2ab
--- /dev/null
+++ b/libs/gpu/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "libs/mach-gpu-dawn"]
+       path = libs/mach-gpu-dawn
+       url = https://github.com/hexops/mach-gpu-dawn
+
diff --git a/libs/gpu/libs/mach-glfw b/libs/gpu/libs/mach-glfw
deleted file mode 120000
index 0d47f286..00000000
--- a/libs/gpu/libs/mach-glfw
+++ /dev/null
@@ -1 +0,0 @@
-../../glfw
\ No newline at end of file
diff --git a/libs/gpu/libs/mach-gpu-dawn b/libs/gpu/libs/mach-gpu-dawn
deleted file mode 120000
index c033c781..00000000
--- a/libs/gpu/libs/mach-gpu-dawn
+++ /dev/null
@@ -1 +0,0 @@
-../../gpu-dawn
\ No newline at end of file
diff --git a/libs/gpu/libs/mach-gpu-dawn b/libs/gpu/libs/mach-gpu-dawn
new file mode 160000
index 00000000..a33e4030
--- /dev/null
+++ b/libs/gpu/libs/mach-gpu-dawn
@@ -0,0 +1 @@
+Subproject commit a33e4030dcc0d6fa6c0abf3419000b504074511a