diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base
index e21371ca4a..e0581bd46e 100644
--- a/Dockerfile.openpilot_base
+++ b/Dockerfile.openpilot_base
@@ -12,22 +12,28 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
+COPY tools/install_ubuntu_dependencies.sh /tmp/tools/
+RUN cd /tmp && \
+    tools/install_ubuntu_dependencies.sh && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    # remove unused architectures from gcc for panda
+    cd /usr/lib/gcc/arm-none-eabi/9.2.1 && \
+    rm -rf arm/ && \
+    rm -rf thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp
+
 ENV POETRY_VIRTUALENVS_CREATE=false
 ENV PYENV_VERSION=3.11.4
 ENV PYENV_ROOT="/root/.pyenv"
 ENV PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
 
 COPY pyproject.toml poetry.lock .python-version /tmp/
-COPY tools/ubuntu_setup.sh tools/install_ubuntu_dependencies.sh tools/install_python_dependencies.sh /tmp/tools/
+COPY tools/install_python_dependencies.sh /tmp/tools/
+
 RUN cd /tmp && \
-    tools/ubuntu_setup.sh && \
-    rm -rf /var/lib/apt/lists/* && \
+    tools/install_python_dependencies.sh && \
     rm -rf /tmp/* && \
     rm -rf /root/.cache && \
-    pip uninstall -y poetry && \
-    # remove unused architectures from gcc for panda
-    cd /usr/lib/gcc/arm-none-eabi/9.2.1 && \
-    rm -rf arm/ && \
-    rm -rf thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp
+    pip uninstall -y poetry
 
 RUN sudo git config --global --add safe.directory /tmp/openpilot