diff --git a/caddyfile/dev/Caddyfile b/caddyfile/dev/Caddyfile
index b0e2893..6b6eab1 100644
--- a/caddyfile/dev/Caddyfile
+++ b/caddyfile/dev/Caddyfile
@@ -97,20 +97,29 @@
 
     route /v2* {
         reverse_proxy https://registry-1.docker.io {
-            header_up Host registry-1.docker.io
+            header_up Host {reverse_proxy.upstream.hostport}
             header_up X-Real-IP {remote}
             header_up X-Forwarded-For {http.request.header.X-Forwarded-For}
             header_up X-Forwarded-Proto {scheme}
             header_up Authorization {http.request.header.Authorization}
-        }
-        header {
-                www-authenticate 'Bearer realm="https://${host}/token",service="registry.docker.io"'
+            header_down WWW-Authenticate "https://auth.docker.io" "https://{host}"
+            header_down Location "https://production.cloudflare.docker.com" "https://{host}"
         }
     }
 
     route /token* {
         reverse_proxy https://auth.docker.io {
-            header_up Host auth.docker.io
+            header_up Host {reverse_proxy.upstream.hostport}
+            header_up X-Real-IP {remote}
+            header_up X-Forwarded-For {http.request.header.X-Forwarded-For}
+            header_up X-Forwarded-Proto {scheme}
+            header_up Authorization {http.request.header.Authorization}
+        }
+    }
+
+    route /registry-v2* {
+        reverse_proxy https://production.cloudflare.docker.com {
+            header_up Host {reverse_proxy.upstream.hostport}
             header_up X-Real-IP {remote}
             header_up X-Forwarded-For {http.request.header.X-Forwarded-For}
             header_up X-Forwarded-Proto {scheme}