diff --git a/Dockerfile b/Dockerfile
index 278a5d3..4016a5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -364,7 +364,7 @@ WORKDIR /
 #            https://github.com/sgerrand/alpine-pkg-glibc
 # caddy    : an excellent web server we use to serve fast-data-dev UI, proxy various REST
 #            endpoints, etc
-#            https://github.com/mholt/caddy
+#            https://github.com/caddyserver/caddy
 ARG CHECKPORT_URL="https://gitlab.com/andmarios/checkport/uploads/3903dcaeae16cd2d6156213d22f23509/checkport"
 ARG QUICKCERT_URL="https://github.com/andmarios/quickcert/releases/download/1.0/quickcert-1.0-linux-amd64-alpine"
 ARG GLIBC_INST_VERSION="2.32-r0"
diff --git a/Dockerfile-singlestage b/Dockerfile-singlestage
index 029a6d9..5f768c7 100644
--- a/Dockerfile-singlestage
+++ b/Dockerfile-singlestage
@@ -47,11 +47,11 @@ RUN wget "$FDD_LKD_URL" -O /lkd.tgz \
 #            https://github.com/sgerrand/alpine-pkg-glibc
 # caddy    : an excellent web server we use to serve fast-data-dev UI, proxy various REST
 #            endpoints, etc
-#            https://github.com/mholt/caddy
+#            https://github.com/caddyserver/caddy
 ARG CHECKPORT_URL="https://gitlab.com/andmarios/checkport/uploads/3903dcaeae16cd2d6156213d22f23509/checkport"
 ARG QUICKCERT_URL="https://github.com/andmarios/quickcert/releases/download/1.0/quickcert-1.0-linux-amd64-alpine"
 ARG GLIBC_INST_VERSION="2.27-r0"
-ARG CADDY_URL=https://github.com/mholt/caddy/releases/download/v0.10.10/caddy_v0.10.10_linux_amd64.tar.gz
+ARG CADDY_URL=https://github.com/caddyserver/caddy/releases/download/v0.10.10/caddy_v0.10.10_linux_amd64.tar.gz
 RUN wget "$CHECKPORT_URL" -O /usr/local/bin/checkport \
     && wget "$QUICKCERT_URL" -O /usr/local/bin/quickcert \
     && chmod 0755 /usr/local/bin/quickcert /usr/local/bin/checkport \