diff --git a/docker/Dockerfile b/docker/Dockerfile
index a8a08f75..a6268237 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@
 # This file assumes that these scripts have been run first:
 # - ./scripts/ci/build-frontend
 
-FROM nginxproxymanager/testca as testca
+FROM jc21/testca as testca
 FROM letsencrypt/pebble as pebbleca
 FROM jc21/gotools:latest AS gobuild
 
@@ -35,7 +35,7 @@ RUN mkdir -p /dist \
 # Final image
 #===============
 
-FROM nginxproxymanager/nginx-full:acmesh AS final
+FROM jc21/nginx-full:acmesh AS final
 
 COPY --from=gobuild /dist/server /app/bin/server
 # these certs are used for testing in CI
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 8065e065..4ca156b5 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,6 +1,6 @@
-FROM nginxproxymanager/testca as testca
+FROM jc21/testca as testca
 FROM letsencrypt/pebble as pebbleca
-FROM nginxproxymanager/nginx-full:acmesh-golang
+FROM jc21/nginx-full:acmesh-golang
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/docker/docker-compose.ci.yml b/docker/docker-compose.ci.yml
index acc0dbef..a9ccd01f 100644
--- a/docker/docker-compose.ci.yml
+++ b/docker/docker-compose.ci.yml
@@ -20,7 +20,7 @@ services:
           - website3.example.com
 
   stepca:
-    image: nginxproxymanager/testca
+    image: jc21/testca
     volumes:
       - ./dev/resolv.conf:/etc/resolv.conf:ro
       - '/etc/localtime:/etc/localtime:ro'
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 3c1f9f46..25e60eb4 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -39,7 +39,7 @@ services:
     restart: unless-stopped
 
   npm-stepca:
-    image: nginxproxymanager/testca
+    image: jc21/testca
     container_name: "npm.stepca"
     volumes:
       - ./dev/resolv.conf:/etc/resolv.conf:ro