diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base
index 44d8d95e95..4eba189057 100644
--- a/Dockerfile.openpilot_base
+++ b/Dockerfile.openpilot_base
@@ -66,6 +66,8 @@ ARG USER_UID=1001
 RUN useradd -m -s /bin/bash -u $USER_UID $USER
 RUN usermod -aG sudo $USER
 RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+COPY tools/adb_shell.sh /usr/local/bin/
+RUN echo "alias adb='/usr/local/bin/adb_shell.sh'" >> /home/$USER/.bashrc
 USER $USER
 
 COPY --chown=$USER pyproject.toml uv.lock /home/$USER
diff --git a/opendbc_repo b/opendbc_repo
index 81820502a0..2c5600f88f 160000
--- a/opendbc_repo
+++ b/opendbc_repo
@@ -1 +1 @@
-Subproject commit 81820502a038b64e97caae81377ac65a3b86703e
+Subproject commit 2c5600f88f16edcf5fedf46922414ad9b1c0feda
diff --git a/panda b/panda
index 8a583aaa8c..97e91d6fee 160000
--- a/panda
+++ b/panda
@@ -1 +1 @@
-Subproject commit 8a583aaa8c1a27a3d13747b7ecead6a3d73a4e81
+Subproject commit 97e91d6feefc3e96178e72fff743a8a36132b445
diff --git a/tools/op.sh b/tools/op.sh
index b4508f7ef7..c6abde67a3 100755
--- a/tools/op.sh
+++ b/tools/op.sh
@@ -273,11 +273,6 @@ function op_venv() {
   esac
 }
 
-function op_adb() {
-  op_before_cmd
-  op_run_command tools/adb_shell.sh
-}
-
 function op_check() {
   VERBOSE=1
   op_before_cmd
@@ -395,7 +390,6 @@ function op_default() {
   echo -e "  ${BOLD}juggle${NC}       Run PlotJuggler"
   echo -e "  ${BOLD}replay${NC}       Run Replay"
   echo -e "  ${BOLD}cabana${NC}       Run Cabana"
-  echo -e "  ${BOLD}adb${NC}          Run adb shell"
   echo ""
   echo -e "${BOLD}${UNDERLINE}Commands [Testing]:${NC}"
   echo -e "  ${BOLD}sim${NC}          Run openpilot in a simulator"
@@ -452,7 +446,6 @@ function _op() {
     stop )          shift 1; op_stop "$@" ;;
     restart )       shift 1; op_restart "$@" ;;
     post-commit )   shift 1; op_install_post_commit "$@" ;;
-    adb )           shift 1; op_adb "$@" ;;
     * ) op_default "$@" ;;
   esac
 }