diff --git a/.zuul.yaml b/.zuul.yaml
index d060d591c..035390e81 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -177,9 +177,6 @@
     description: Build Docker images.
     vars: &nodepool_image_vars
       docker_images:
-        - context: .
-          repository: zuul/nodepool-base
-          target: nodepool-base
         - context: .
           repository: zuul/nodepool
           target: nodepool
diff --git a/Dockerfile b/Dockerfile
index f6d6bf290..2d313b85e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,16 +18,14 @@ FROM opendevorg/python-builder as builder
 COPY . /tmp/src
 RUN assemble
 
-FROM opendevorg/python-base as nodepool-base
+FROM opendevorg/python-base as nodepool
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
-
-FROM nodepool-base as nodepool
 CMD ["/usr/local/bin/nodepool"]
 
-FROM nodepool-base as nodepool-launcher
+FROM nodepool as nodepool-launcher
 CMD ["/usr/local/bin/nodepool-launcher"]
 
-FROM nodepool-base as nodepool-builder
+FROM nodepool as nodepool-builder
 CMD ["/usr/local/bin/nodepool-builder"]