diff --git a/opendbc_repo b/opendbc_repo
index c1a8eaec70..2ecc45c4ed 160000
--- a/opendbc_repo
+++ b/opendbc_repo
@@ -1 +1 @@
-Subproject commit c1a8eaec70f459b6f5be9b6d3433ba148b96cfa4
+Subproject commit 2ecc45c4eda285aa0135624a890fd3a17146cae5
diff --git a/panda b/panda
index 6ee9c8d85a..045fc443ab 160000
--- a/panda
+++ b/panda
@@ -1 +1 @@
-Subproject commit 6ee9c8d85a0e27ef72df685195d59d951a8b9c45
+Subproject commit 045fc443ab86018764295e0da81d4c4343fe825e
diff --git a/selfdrive/debug/clear_dtc.py b/selfdrive/debug/clear_dtc.py
index a931c423a9..55e2bb47de 100755
--- a/selfdrive/debug/clear_dtc.py
+++ b/selfdrive/debug/clear_dtc.py
@@ -2,8 +2,8 @@
 import sys
 import argparse
 from subprocess import check_output, CalledProcessError
+from opendbc.car.uds import UdsClient, MessageTimeoutError, SESSION_TYPE, DTC_GROUP_TYPE
 from panda import Panda
-from panda.python.uds import UdsClient, MessageTimeoutError, SESSION_TYPE, DTC_GROUP_TYPE
 
 parser = argparse.ArgumentParser(description="clear DTC status")
 parser.add_argument("addr", type=lambda x: int(x,0), nargs="?", default=0x7DF) # default is functional (broadcast) address
diff --git a/selfdrive/debug/debug_fw_fingerprinting_offline.py b/selfdrive/debug/debug_fw_fingerprinting_offline.py
index 3df2924738..2c6a946b6f 100755
--- a/selfdrive/debug/debug_fw_fingerprinting_offline.py
+++ b/selfdrive/debug/debug_fw_fingerprinting_offline.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 import argparse
 
+from opendbc.car import uds
 from openpilot.tools.lib.live_logreader import live_logreader
 from openpilot.tools.lib.logreader import LogReader, ReadMode
-from panda.python import uds
 
 
 def main(route: str | None, addrs: list[int]):
diff --git a/selfdrive/debug/hyundai_enable_radar_points.py b/selfdrive/debug/hyundai_enable_radar_points.py
index 5e7080ef64..298a719e86 100755
--- a/selfdrive/debug/hyundai_enable_radar_points.py
+++ b/selfdrive/debug/hyundai_enable_radar_points.py
@@ -16,8 +16,8 @@ import argparse
 from typing import NamedTuple
 from subprocess import check_output, CalledProcessError
 
+from opendbc.car.uds import UdsClient, SESSION_TYPE, DATA_IDENTIFIER_TYPE
 from panda.python import Panda
-from panda.python.uds import UdsClient, SESSION_TYPE, DATA_IDENTIFIER_TYPE
 
 class ConfigValues(NamedTuple):
   default_config: bytes
diff --git a/selfdrive/debug/read_dtc_status.py b/selfdrive/debug/read_dtc_status.py
index 2d27dd2bb2..80f7ef0cd0 100755
--- a/selfdrive/debug/read_dtc_status.py
+++ b/selfdrive/debug/read_dtc_status.py
@@ -2,9 +2,8 @@
 import sys
 import argparse
 from subprocess import check_output, CalledProcessError
+from opendbc.car.uds import UdsClient, SESSION_TYPE, DTC_REPORT_TYPE, DTC_STATUS_MASK_TYPE, get_dtc_num_as_str, get_dtc_status_names
 from panda import Panda
-from panda.python.uds import UdsClient, SESSION_TYPE, DTC_REPORT_TYPE, DTC_STATUS_MASK_TYPE
-from panda.python.uds import get_dtc_num_as_str, get_dtc_status_names
 
 parser = argparse.ArgumentParser(description="read DTC status")
 parser.add_argument("addr", type=lambda x: int(x,0))
diff --git a/selfdrive/debug/vw_mqb_config.py b/selfdrive/debug/vw_mqb_config.py
index 6df1e57ce3..0cd9534d0e 100755
--- a/selfdrive/debug/vw_mqb_config.py
+++ b/selfdrive/debug/vw_mqb_config.py
@@ -3,9 +3,9 @@
 import argparse
 import struct
 from enum import IntEnum
-from panda import Panda
-from panda.python.uds import UdsClient, MessageTimeoutError, NegativeResponseError, SESSION_TYPE,\
+from opendbc.car.uds import UdsClient, MessageTimeoutError, NegativeResponseError, SESSION_TYPE,\
   DATA_IDENTIFIER_TYPE, ACCESS_TYPE
+from panda import Panda
 from datetime import date
 
 # TODO: extend UDS library to allow custom/vendor-defined data identifiers without ignoring type checks