diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 5d9c98fa..c8f9d801 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -14,7 +14,7 @@ permissions:
 
 env:
   # Expected format {owner}/{repo}.
-  DEPS_REPO: 'otavepto/gbe_fork-deps'
+  DEPS_REPO: 'otavepto/gbe_fork'
   THIRD_PARTY_BASE_DIR: 'third-party'
   DEPS_CACHE_KEY: emu-deps-linux
   DEPS_CACHE_DIR: build-linux-deps
@@ -42,7 +42,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: "${{env.DEPS_REPO}}"
-        ref: 'deps/linux'
+        ref: 'third-party/deps/linux'
         path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/linux"
         lfs: true
 
@@ -51,7 +51,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: "${{env.DEPS_REPO}}"
-        ref: 'deps/common'
+        ref: 'third-party/deps/common'
         path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common"
         lfs: true
 
@@ -86,7 +86,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: "${{env.DEPS_REPO}}"
-        ref: 'build/linux'
+        ref: 'third-party/build/linux'
         path: "${{env.THIRD_PARTY_BASE_DIR}}/build/linux"
         lfs: true
 
diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
index 55668c52..fc01d436 100644
--- a/.github/workflows/build-win.yml
+++ b/.github/workflows/build-win.yml
@@ -14,7 +14,7 @@ permissions:
 
 env:
   # Expected format {owner}/{repo}.
-  DEPS_REPO: 'otavepto/gbe_fork-deps'
+  DEPS_REPO: 'otavepto/gbe_fork'
   THIRD_PARTY_BASE_DIR: 'third-party'
   DEPS_CACHE_KEY: emu-deps-win
   DEPS_CACHE_DIR: build-win-deps
@@ -42,7 +42,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: "${{env.DEPS_REPO}}"
-        ref: 'deps/win'
+        ref: 'third-party/deps/win'
         path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/win"
         lfs: true
 
@@ -51,7 +51,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: "${{env.DEPS_REPO}}"
-        ref: 'deps/common'
+        ref: 'third-party/deps/common'
         path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common"
         lfs: true
 
@@ -60,7 +60,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: "${{env.DEPS_REPO}}"
-        ref: 'common/win'
+        ref: 'third-party/common/win'
         path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win"
         lfs: true
 
@@ -92,7 +92,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: "${{env.DEPS_REPO}}"
-        ref: 'common/win'
+        ref: 'third-party/common/win'
         path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win"
         lfs: true
 
diff --git a/.gitmodules b/.gitmodules
index 5c962382..433c0f8a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,20 @@
 [submodule "third-party/build/linux"]
 	path = third-party/build/linux
-	url = git@github.com:otavepto/gbe_fork-deps.git
-	branch = build/linux
+url=git@github.com:otavepto/gbe_fork.git
+	branch = third-party/build/linux
 [submodule "third-party/common/win"]
 	path = third-party/common/win
-	url = git@github.com:otavepto/gbe_fork-deps.git
-	branch = common/win
+url=git@github.com:otavepto/gbe_fork.git
+	branch = third-party/common/win
 [submodule "third-party/deps/common"]
 	path = third-party/deps/common
-	url = git@github.com:otavepto/gbe_fork-deps.git
-	branch = deps/common
+url=git@github.com:otavepto/gbe_fork.git
+	branch = third-party/deps/common
 [submodule "third-party/deps/linux"]
 	path = third-party/deps/linux
-	url = git@github.com:otavepto/gbe_fork-deps.git
-	branch = deps/linux
+url=git@github.com:otavepto/gbe_fork.git
+	branch = third-party/deps/linux
 [submodule "third-party/deps/win"]
 	path = third-party/deps/win
-	url = git@github.com:otavepto/gbe_fork-deps.git
-	branch = deps/win
+url=git@github.com:otavepto/gbe_fork.git
+	branch = third-party/deps/win
diff --git a/third-party/build/linux b/third-party/build/linux
index 29c508dd..754742c6 160000
--- a/third-party/build/linux
+++ b/third-party/build/linux
@@ -1 +1 @@
-Subproject commit 29c508dd14df6a24a72edc305b3a10a910bba252
+Subproject commit 754742c6fc3f9a34b3fe75f26f8f99da9adee300
diff --git a/third-party/common/win b/third-party/common/win
index fcd4f58e..32c8c7e7 160000
--- a/third-party/common/win
+++ b/third-party/common/win
@@ -1 +1 @@
-Subproject commit fcd4f58e97435739e3dc1c8e2db564c474b37b7f
+Subproject commit 32c8c7e7308f84dac9d94977f9297e5489a93611
diff --git a/third-party/deps/common b/third-party/deps/common
index a579dfd2..488955b3 160000
--- a/third-party/deps/common
+++ b/third-party/deps/common
@@ -1 +1 @@
-Subproject commit a579dfd2f050c64d3b154c35e6152b01c1913663
+Subproject commit 488955b33cc330d1aa1469a94b88238c8b8c9ee1
diff --git a/third-party/deps/linux b/third-party/deps/linux
index e1325643..b523ab22 160000
--- a/third-party/deps/linux
+++ b/third-party/deps/linux
@@ -1 +1 @@
-Subproject commit e13256435775941ff1251ac7e8c413f2bb14a523
+Subproject commit b523ab22a1d26414f821daf8eae11ced6736ecc8
diff --git a/third-party/deps/win b/third-party/deps/win
index aebf5a18..2807eea5 160000
--- a/third-party/deps/win
+++ b/third-party/deps/win
@@ -1 +1 @@
-Subproject commit aebf5a180358592d669e2cffcff1b14d67545777
+Subproject commit 2807eea527d518f49f5d2d38ff19440467553c8f