diff --git a/Caddyfile b/Caddyfile
index 9036907..281c9e4 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,324 +1,219 @@
-# http://piholeslx.in {
-#     rewrite * /admin{uri}
-#     reverse_proxy * 10.8.1.3:80
-# }
-
-pihole.pi.rahulja.in {
-	# rewrite * /admin{uri}
-	reverse_proxy * 10.8.1.3:80
+(cloudflare) {
 	tls {
 		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
 	}
 }
 
-# http://wgslx.in {
-#     reverse_proxy * 10.8.1.2:51821
-# }
+pihole.pi.rahulja.in {
+	reverse_proxy * 10.8.1.3:80
+	import cloudflare
+}
 
 wg.pi.rahulja.in {
 	reverse_proxy * 10.8.1.2:51821
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
-# http://cloudflarednsslx.in {
-#     reverse_proxy * 10.8.1.4:43697
-# }
-
-
-
-# http://immichslx.in {
-#     reverse_proxy * 10.8.1.6:3001
-# }
-
 immich.pi.rahulja.in {
 	reverse_proxy * 10.8.1.6:2283
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
-# photoprism.pi.rahulja.in {
-#     reverse_proxy * 10.8.1.11:2342
-#      tls {
-#         dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-#     }
-# }
-
 watchtower.pi.rahulja.in {
 	reverse_proxy * 10.8.1.13:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 navidrome.pi.rahulja.in {
 	reverse_proxy * 10.8.1.14:4533
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 mikochi.pi.rahulja.in {
 	reverse_proxy * 10.8.1.15:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 jellyfin.pi.rahulja.in {
 	reverse_proxy * 10.8.1.16:8096
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 archivebox.pi.rahulja.in {
 	reverse_proxy * 10.8.1.17:8000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 prometheus.pi.rahulja.in {
 	reverse_proxy * 10.8.1.19:9090
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 grafana.pi.rahulja.in {
 	reverse_proxy * 10.8.1.20:3000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 wallabag.pi.rahulja.in {
 	reverse_proxy * 10.8.1.22:80
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 trans.pi.rahulja.in {
 	reverse_proxy * 10.8.1.23:9091
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 prowlarr.pi.rahulja.in {
 	reverse_proxy * 10.8.1.23:9696
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 flame.pi.rahulja.in {
 	reverse_proxy * 10.8.1.24:5005
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 plex.pi.rahulja.in {
 	reverse_proxy * 10.8.1.25:32400
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 ntfy.pi.rahulja.in {
 	reverse_proxy * 10.8.1.26:8000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 freshrss.pi.rahulja.in {
 	reverse_proxy * 10.8.1.27:80
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 miniflux.pi.rahulja.in {
 	reverse_proxy * 10.8.1.28:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 shiori.pi.rahulja.in {
 	reverse_proxy * 10.8.1.31:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 pngx.pi.rahulja.in {
 	reverse_proxy * 10.8.1.32:8000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 grocy.pi.rahulja.in {
 	reverse_proxy * 10.8.1.33:80
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 filebrowser.pi.rahulja.in {
 	reverse_proxy * 10.8.1.34:80
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 homarr.pi.rahulja.in {
 	reverse_proxy * 10.8.1.35:7575
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 dash.pi.rahulja.in {
 	reverse_proxy * 10.8.1.57:3000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 cyberchef.pi.rahulja.in {
 	reverse_proxy * 10.8.1.36:80
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 minio.pi.rahulja.in {
 	reverse_proxy * 10.8.1.37:35507
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 resume.pi.rahulja.in {
 	reverse_proxy * 10.8.1.39:3000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 languagetool.pi.rahulja.in {
 	reverse_proxy * 10.8.1.40:8010
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 memos.pi.rahulja.in {
 	reverse_proxy * 10.8.1.41:5230
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 linkding.pi.rahulja.in {
 	reverse_proxy * 10.8.1.42:9090
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 firefly.pi.rahulja.in {
 	reverse_proxy * 10.8.1.43:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 fireflyimporter.pi.rahulja.in {
 	reverse_proxy * 10.8.1.44:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 vikunja.pi.rahulja.in {
 	reverse_proxy * 10.8.1.46:3456
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 gramps.pi.rahulja.in {
 	reverse_proxy * 10.8.1.47:5000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 webtest.pi.rahulja.in {
 	reverse_proxy * 10.8.1.49:80
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 openproject.pi.rahulja.in {
 	reverse_proxy * 10.8.1.50:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 nc.pi.rahulja.in {
 	reverse_proxy * 10.8.1.51:11000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 n8n.pi.rahulja.in {
 	reverse_proxy * 10.8.1.53:5678 {
 		flush_interval -1
 	}
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 searxng.pi.rahulja.in {
 	reverse_proxy * 10.8.1.54:8080
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 storyteller.pi.rahulja.in {
 	reverse_proxy * 10.8.1.55:8001 {
 		flush_interval -1
 	}
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 paisa.pi.rahulja.in {
 	reverse_proxy * 10.8.1.56:7500
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }
 
 homepage.pi.rahulja.in {
 	reverse_proxy * 10.8.1.57:3000
-	tls {
-		dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-	}
+	import cloudflare
 }