diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 43d58673..71b797b3 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -107,7 +107,7 @@ jobs:
       run: |
         eval "$BUILD"
         docker pull $DOCKER_REGISTRY/$IMAGE_NAME:latest || true
-        docker build --cache-from $DOCKER_REGISTRY/$IMAGE_NAME:latest -t $DOCKER_REGISTRY/$IMAGE_NAME:latest -f tools/webcam/Dockerfile .
+        docker build --cache-from $DOCKER_REGISTRY/$BASE_IMAGE:latest --cache-from $DOCKER_REGISTRY/$IMAGE_NAME:latest -t $DOCKER_REGISTRY/$IMAGE_NAME:latest -f tools/webcam/Dockerfile .
     - name: Build openpilot
       run: docker run --shm-size 1G --rm -v $PWD:/tmp/openpilot -e PYTHONPATH=/tmp/openpilot $DOCKER_REGISTRY/$IMAGE_NAME /bin/sh -c "cd /tmp/openpilot && USE_WEBCAM=1 scons -j$(nproc)"
     - name: Push to container registry
diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
index 02d4758d..e39ac00e 100644
--- a/Dockerfile.openpilot
+++ b/Dockerfile.openpilot
@@ -1,4 +1,4 @@
-FROM commaai/openpilot-base:latest
+FROM ghcr.io/commaai/openpilot-base:latest
 
 ENV PYTHONUNBUFFERED 1
 
diff --git a/tools/sim/Dockerfile.sim b/tools/sim/Dockerfile.sim
index 9488a22b..ea37d737 100644
--- a/tools/sim/Dockerfile.sim
+++ b/tools/sim/Dockerfile.sim
@@ -1,4 +1,4 @@
-FROM commaai/openpilot-base:latest
+FROM ghcr.io/commaai/openpilot-base:latest
 
 RUN apt-get update && apt-get install -y \
     apt-utils \
diff --git a/tools/webcam/Dockerfile b/tools/webcam/Dockerfile
index 3babeaec..7de86a4a 100644
--- a/tools/webcam/Dockerfile
+++ b/tools/webcam/Dockerfile
@@ -1,4 +1,4 @@
-FROM commaai/openpilot-base:latest
+FROM ghcr.io/commaai/openpilot-base:latest
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /tmp/openpilot:${PYTHONPATH}