diff --git a/src/admin/Dockerfile b/src/admin/Dockerfile
index 451373974..0c0b05463 100644
--- a/src/admin/Dockerfile
+++ b/src/admin/Dockerfile
@@ -1,4 +1,5 @@
-FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/caddy:latest
+#FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/caddy:latest
+FROM caddy:2.6.2-alpine
 
 ENV APP_ROOT=/usr/share/caddy
 ENV XDG_CONFIG_HOME=/tmp/config
diff --git a/src/gatsby/Builder.Dockerfile b/src/gatsby/Builder.Dockerfile
index db0351378..49402b0bb 100644
--- a/src/gatsby/Builder.Dockerfile
+++ b/src/gatsby/Builder.Dockerfile
@@ -1,4 +1,5 @@
-FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/node:18-slim
+#FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/node:18-slim
+FROM node:18.20-slim
 
 ENV GATSBY_HOME=/gatsby
 
diff --git a/src/gatsby/Dockerfile b/src/gatsby/Dockerfile
index e5ee3e5db..03c900c3f 100644
--- a/src/gatsby/Dockerfile
+++ b/src/gatsby/Dockerfile
@@ -1,4 +1,5 @@
-FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/caddy:latest
+#FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/caddy:latest
+FROM caddy:2.6.2-alpine
 
 ENV APP_ROOT=/usr/share/caddy
 ENV XDG_CONFIG_HOME=/tmp/config
diff --git a/src/maintenance/Dockerfile b/src/maintenance/Dockerfile
index 276c3162c..9864e2b4b 100644
--- a/src/maintenance/Dockerfile
+++ b/src/maintenance/Dockerfile
@@ -1,4 +1,5 @@
-FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/caddy:latest
+#FROM image-registry.apps.silver.devops.gov.bc.ca/61d198-tools/caddy:latest
+FROM caddy:2.6.2-alpine
 
 ENV APP_ROOT=/usr/share/caddy
 ENV XDG_CONFIG_HOME=/tmp/config