diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index fd7fffabc55..822c0e3e8ae 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -57,8 +57,8 @@ jobs:
       id: git
       shell: cmake -P {0}
       run: |
-        execute_process(COMMAND git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git)
-        execute_process(COMMAND git submodule set-url -- qbs https://github.com/arBmind/qbs.git)
+        execute_process(COMMAND git submodule set-url -- src/tools/perfparser https://code.qt.io/qt-creator/perfparser.git)
+        execute_process(COMMAND git submodule set-url -- src/shared/qbs https://github.com/hicknhack-software/Qt-Qbs.git)
         execute_process(COMMAND git submodule update --init --recursive)
         file(MAKE_DIRECTORY release)
         if (${{github.ref}} MATCHES "tags/v([0-9.]+)")
diff --git a/.github/workflows/build_qbs.yml b/.github/workflows/build_qbs.yml
index 97267b9a398..2358ad480c9 100644
--- a/.github/workflows/build_qbs.yml
+++ b/.github/workflows/build_qbs.yml
@@ -77,8 +77,8 @@ jobs:
 
       - working-directory: Repo
         run: |
-          git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git
-          git submodule set-url -- qbs https://github.com/arBmind/qbs.git
+          git submodule set-url -- src/tools/perfparser https://code.qt.io/qt-creator/perfparser.git
+          git submodule set-url -- src/shared/qbs https://github.com/hicknhack-software/Qt-Qbs.git
           git submodule update --init --recursive
 
       - name: Build