diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base
index 2ea26b854f..c5a024db82 100644
--- a/Dockerfile.openpilot_base
+++ b/Dockerfile.openpilot_base
@@ -25,8 +25,9 @@ RUN cd /tmp && \
     rm -rf /tmp/* && \
     rm -rf /root/.cache && \
     pip uninstall -y pipenv && \
-
     # 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
+RUN sudo git config --global --add safe.directory /tmp/openpilot
+
diff --git a/Pipfile b/Pipfile
index 0b22be23f0..06db9864aa 100644
--- a/Pipfile
+++ b/Pipfile
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08a5ff9631cfadc63a5c7ebdf227eb390cafab2e3af77554b2a41005a618ac31
-size 1410
+oid sha256:2cfa7fc048887c39c0e3ee0adf53bff6dfec55483056b174a5d9d5f86d7cfe23
+size 1429
diff --git a/Pipfile.lock b/Pipfile.lock
index e2767a418c..da693e1137 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff47c83e09bd8030db7c4c7ba64f2db52c22af9003414ef09acbcc25c92ffa3b
-size 141871
+oid sha256:3ca9720d3cfc197e195efa0ec558113ad59dbce48c33ffa7147afd41fc5e9f85
+size 142639
diff --git a/tools/openpilot_build.sh b/tools/openpilot_build.sh
deleted file mode 100644
index f0f89d936e..0000000000
--- a/tools/openpilot_build.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker run --rm -v $(pwd):/tmp/openpilot -it commaai/openpilot bash -c 'cd /tmp/openpilot && scons -j$(nproc)'
diff --git a/tools/sim/Dockerfile.sim b/tools/sim/Dockerfile.sim
index 2e36085b7e..921e546d0c 100644
--- a/tools/sim/Dockerfile.sim
+++ b/tools/sim/Dockerfile.sim
@@ -36,10 +36,6 @@ ENV QTWEBENGINE_DISABLE_SANDBOX 1
 
 RUN dbus-uuidgen > /etc/machine-id
 
-# Install CARLA python api
-RUN pip install --upgrade pip && \
-    pip install --no-cache-dir carla==0.9.12
-
 # get same tmux config used on NEOS for debugging
 RUN cd $HOME && \
     curl -O https://raw.githubusercontent.com/commaai/eon-neos-builder/master/devices/eon/home/.tmux.conf