diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index 25fc258634..36ecf29f3f 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -232,6 +232,9 @@ jobs:
       with:
         path: .ci_cache/comma_download_cache
         key: car_models-${{ hashFiles('selfdrive/car/tests/test_models.py', 'opendbc/car/tests/routes.py') }}-${{ matrix.job }}
+    - name: Check submodules
+      timeout-minutes: 3
+      run: release/check-submodules.sh
     - name: Build openpilot
       run: ${{ env.RUN }} "scons -j$(nproc)"
     - name: Test car models
diff --git a/.gitmodules b/.gitmodules
index 06c6a1304a..c56250ab91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,9 @@
 [submodule "panda"]
   path = panda
-  url = ../../commaai/panda.git
+  url = https://github.com/aubsw/panda.git
 [submodule "opendbc"]
   path = opendbc_repo
   url = https://github.com/aubsw/opendbc.git
-  branch = ignition-can-move
 [submodule "msgq"]
   path = msgq_repo
   url = ../../commaai/msgq.git
diff --git a/release/check-submodules.sh b/release/check-submodules.sh
index 2111184505..4a99c7043c 100755
--- a/release/check-submodules.sh
+++ b/release/check-submodules.sh
@@ -8,8 +8,16 @@ while read hash submodule ref; do
   fi
 
   if [ "$submodule" = "opendbc_repo" ]; then
-    git -C $submodule remote show origin
-    git -C $submodule fetch origin 0c6fd651735615ec9c7f1babb1812addc4994980
+    git -C $submodule fetch origin e932b98abd16554246012c79007657d8903805bd
+    git -C $submodule checkout FETCH_HEAD
+    cat opendbc_repo/opendbc/safety/tests/libsafety/safety_helpers.py | grep ignition
+    ls -la opendbc
+    echo "$submodule ok (custom Aubrey version)"
+    continue
+  fi
+
+  if [ "$submodule" = "panda" ]; then
+    git -C $submodule fetch origin c66e9a46349d152199a4a0997f82f0bea3c9b5a6
     git -C $submodule checkout FETCH_HEAD
     echo "$submodule ok (custom Aubrey version)"
     continue