diff --git a/tools/docker/core/Dockerfile b/tools/docker/core/Dockerfile
index c3e510bb1..0d3626853 100644
--- a/tools/docker/core/Dockerfile
+++ b/tools/docker/core/Dockerfile
@@ -42,5 +42,7 @@ RUN apk add --no-cache --virtual .build-deps \
         musl-dev \
         libffi-dev \
     && python tools/pipstrap.py \
-    && PIP_NO_BUILD_CACHE=no python tools/pip_install_editable.py src/acme src/certbot \
+    && python tools/pip_install.py --no-cache-dir \
+            --editable src/acme \
+            --editable src/certbot \
     && apk del .build-deps
diff --git a/tools/docker/plugin/Dockerfile b/tools/docker/plugin/Dockerfile
index 26eef1191..863efd105 100644
--- a/tools/docker/plugin/Dockerfile
+++ b/tools/docker/plugin/Dockerfile
@@ -11,4 +11,4 @@ COPY qemu-${QEMU_ARCH}-static /usr/bin/
 COPY . /opt/certbot/src/plugin
 
 # Install the DNS plugin
-RUN PIP_NO_BUILD_CACHE=no python tools/pip_install_editable.py /opt/certbot/src/plugin
+RUN python tools/pip_install.py --no-cache-dir --editable /opt/certbot/src/plugin