diff --git a/internal-only.caddy b/akanealw-subdomains.caddy
similarity index 60%
rename from internal-only.caddy
rename to akanealw-subdomains.caddy
index 1820d8f..12650a2 100644
--- a/internal-only.caddy
+++ b/akanealw-subdomains.caddy
@@ -1,4 +1,257 @@
 *.akanealw.com {
+
+	# --------------------------------------------------
+	# external subdomains without authelia
+	#
+	#
+	#        @ host .akanealw.com
+	#        handle @ {
+	#                reverse_proxy 192.168.1.
+	#        }
+	#
+	#
+	#       @ host .akanealw.com
+	#       handle @ {
+    #               reverse_proxy https://192.168.1. {
+    #                   transport http {
+    #                       tls_insecure_skip_verify
+    #                       }
+    #                   }
+    #       }
+    #
+    #
+	# --------------------------------------------------
+    
+	@internal client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
+	@external not client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
+	import cloudflare
+
+
+	@bitwarden host bitwarden.akanealw.com
+	handle @bitwarden {
+		reverse_proxy 192.168.1.4:8089
+	}
+
+	@giteadocker host gitea-docker.akanealw.com
+	handle @giteadocker {
+		reverse_proxy 192.168.1.4:3001
+	}
+
+	@gitea host gitea.akanealw.com
+	handle @gitea {
+		reverse_proxy 192.168.1.50:3000
+	}
+
+	@jellyfin host jellyfin.akanealw.com
+	handle @jellyfin {
+		reverse_proxy 192.168.1.42:8096
+	}
+
+
+	# --------------------------------------------------
+	# external subdomains with authelia
+	#
+	#
+	#       @ host .akanealw.com
+	#       handle @ {
+	#               import auth
+	#               reverse_proxy 192.168.1.
+	#       }
+	#        
+	#       @ host .akanealw.com
+	#       handle @ {
+	#				import auth
+    #               reverse_proxy https://192.168.1. {
+    #                   transport http {
+    #                       tls_insecure_skip_verify
+    #                       }
+    #                   }
+    #       		}
+    #
+	#
+	# --------------------------------------------------
+
+	@docmost host docmost.akanealw.com
+	handle @docmost {
+		import auth
+		reverse_proxy 192.168.1.4:3300
+	}
+
+	@memos host memos.akanealw.com
+	handle @memos {
+		import auth
+		reverse_proxy 192.168.1.4:5230
+	}
+
+	@whoami host whoami.akanealw.com
+	handle @whoami {
+		import auth
+		reverse_proxy localhost:80
+	}
+
+	@wallos host wallos.akanealw.com
+	handle @wallos {
+		import auth
+		reverse_proxy 192.168.1.4:8389
+	}
+
+	@homepage host www.akanealw.com
+	handle @homepage {
+		import auth
+		reverse_proxy 192.168.1.4:3005
+	}
+
+	@filebrowser host filebrowser.akanealw.com
+	handle @filebrowser {
+		import auth
+		reverse_proxy 192.168.1.30:8484
+	}
+
+	@archive host archive.akanealw.com
+	handle @archive {
+		import auth
+		reverse_proxy 192.168.1.30:8283
+	}
+
+	@archivebox host archivebox.akanealw.com
+	handle @archivebox {
+		import auth
+		reverse_proxy 192.168.1.30:8283
+	}
+
+	@codeserver host codeserver.akanealw.com
+	handle @codeserver {
+		import auth
+		reverse_proxy 192.168.1.50:3001
+	}
+
+	@freshrss host freshrss.akanealw.com
+	handle @freshrss {
+		import auth
+		reverse_proxy 192.168.1.30:8088
+	}
+
+	@jackett host jackett.akanealw.com
+	handle @jackett {
+		import auth
+		reverse_proxy 192.168.1.30:9117
+	}
+
+	@jdownloader host jdownloader.akanealw.com
+	handle @jdownloader {
+		import auth
+		reverse_proxy 192.168.1.30:5800
+	}
+
+	@jellyseerr host jellyseerr.akanealw.com
+	handle @jellyseerr {
+		import auth
+		reverse_proxy 192.168.1.30:5056
+	}
+
+	@kavita host kavita.akanealw.com
+	handle @kavita {
+		import auth
+		reverse_proxy 192.168.1.30:5002
+	}
+
+	@lidarr host lidarr.akanealw.com
+	handle @lidarr {
+		import auth
+		reverse_proxy 192.168.1.30:8686
+	}
+
+	@metube host metube.akanealw.com
+	handle @metube {
+		import auth
+		reverse_proxy 192.168.1.30:8082
+	}
+
+	@mstream host mstream.akanealw.com
+	handle @mstream {
+		import auth
+		reverse_proxy 192.168.1.30:3001
+	}
+
+	@nzbhydra host nzbhydra.akanealw.com
+	handle @nzbhydra {
+		import auth
+		reverse_proxy 192.168.1.30:5076
+	}
+
+	@olivetin host olivetin.akanealw.com
+	handle @olivetin {
+		import auth
+		reverse_proxy 192.168.1.30:1337
+	}
+
+	@opengist host opengist.akanealw.com
+	handle @opengist {
+		import auth
+		reverse_proxy 192.168.1.4:6157
+	}
+
+	@paperless host paperless.akanealw.com
+	handle @paperless {
+		import auth
+		reverse_proxy 192.168.1.30:8112
+	}
+
+	@prowlarr host prowlarr.akanealw.com
+	handle @prowlarr {
+		import auth
+		reverse_proxy 192.168.1.30:9696
+	}
+
+	@qbittorrent host qbittorrent.akanealw.com
+	handle @qbittorrent {
+		import auth
+		reverse_proxy 192.168.1.30:8282
+	}
+
+	@radarr host radarr.akanealw.com
+	handle @radarr {
+		import auth
+		reverse_proxy 192.168.1.30:7878
+	}
+
+	@sabnzbd host sabnzbd.akanealw.com
+	handle @sabnzbd {
+		import auth
+		reverse_proxy 192.168.1.30:8181
+	}
+
+	@shlinkweb host shlink.akanealw.com
+	handle @shlinkweb {
+		import auth
+		reverse_proxy 192.168.1.30:8381
+	}
+
+	@sonarr host sonarr.akanealw.com
+	handle @sonarr {
+		import auth
+		reverse_proxy 192.168.1.30:8989
+	}
+
+	@spdf host spdf.akanealw.com
+	handle @spdf {
+		import auth
+		reverse_proxy 192.168.1.30:8086
+	}
+
+	@ittools host it-tools.akanealw.com
+	handle @ittools {
+		import auth
+		reverse_proxy 192.168.1.30:8383
+	}
+
+	@wikidocs host wiki.akanealw.com
+	handle @wikidocs {
+		import auth
+		reverse_proxy 192.168.1.30:8022
+	}
+
+
 	# --------------------------------------------------
 	# internal only subdomains
 	#
@@ -26,10 +279,6 @@
 	#
 	#
 	# --------------------------------------------------
-    
-	@internal client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
-	@external not client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
-	import cloudflare
 
 	@checkmk host checkmk.akanealw.com
 	handle @checkmk {
@@ -342,4 +591,5 @@
 		}
 		respond "ip range not allowed"
 	}
-}
\ No newline at end of file
+
+}
diff --git a/external-no-auth.caddy b/external-no-auth.caddy
deleted file mode 100644
index a1994cf..0000000
--- a/external-no-auth.caddy
+++ /dev/null
@@ -1,48 +0,0 @@
-*.akanealw.com {
-	# --------------------------------------------------
-	# external subdomains without authelia
-	#
-	#
-	#        @ host .akanealw.com
-	#        handle @ {
-	#                reverse_proxy 192.168.1.
-	#        }
-	#
-	#
-	#       @ host .akanealw.com
-	#       handle @ {
-    #               reverse_proxy https://192.168.1. {
-    #                   transport http {
-    #                       tls_insecure_skip_verify
-    #                       }
-    #                   }
-    #       }
-    #
-    #
-	# --------------------------------------------------
-    
-	@internal client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
-	@external not client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
-	import cloudflare
-
-
-	@bitwarden host bitwarden.akanealw.com
-	handle @bitwarden {
-		reverse_proxy 192.168.1.4:8089
-	}
-
-	@giteadocker host gitea-docker.akanealw.com
-	handle @giteadocker {
-		reverse_proxy 192.168.1.4:3001
-	}
-
-	@gitea host gitea.akanealw.com
-	handle @gitea {
-		reverse_proxy 192.168.1.50:3000
-	}
-
-	@jellyfin host jellyfin.akanealw.com
-	handle @jellyfin {
-		reverse_proxy 192.168.1.42:8096
-	}
-}
diff --git a/external-with-auth.caddy b/external-with-auth.caddy
deleted file mode 100644
index e87aef8..0000000
--- a/external-with-auth.caddy
+++ /dev/null
@@ -1,209 +0,0 @@
-*.akanealw.com {
-	# --------------------------------------------------
-	# external subdomains with authelia
-	#
-	#
-	#       @ host .akanealw.com
-	#       handle @ {
-	#               import auth
-	#               reverse_proxy 192.168.1.
-	#       }
-	#        
-	#       @ host .akanealw.com
-	#       handle @ {
-	#				import auth
-    #               reverse_proxy https://192.168.1. {
-    #                   transport http {
-    #                       tls_insecure_skip_verify
-    #                       }
-    #                   }
-    #       		}
-	#		}
-    #
-	#
-	# --------------------------------------------------
-
-	@internal client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
-	@external not client_ip 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 127.0.0.1/8
-	import cloudflare
-
-	@docmost host docmost.akanealw.com
-	handle @docmost {
-		import auth
-		reverse_proxy 192.168.1.4:3300
-	}
-
-	@memos host memos.akanealw.com
-	handle @memos {
-		import auth
-		reverse_proxy 192.168.1.4:5230
-	}
-
-	@whoami host whoami.akanealw.com
-	handle @whoami {
-		import auth
-		reverse_proxy localhost:80
-	}
-
-	@wallos host wallos.akanealw.com
-	handle @wallos {
-		import auth
-		reverse_proxy 192.168.1.4:8389
-	}
-
-	@homepage host www.akanealw.com
-	handle @homepage {
-		import auth
-		reverse_proxy 192.168.1.4:3005
-	}
-
-	@filebrowser host filebrowser.akanealw.com
-	handle @filebrowser {
-		import auth
-		reverse_proxy 192.168.1.30:8484
-	}
-
-	@archive host archive.akanealw.com
-	handle @archive {
-		import auth
-		reverse_proxy 192.168.1.30:8283
-	}
-
-	@archivebox host archivebox.akanealw.com
-	handle @archivebox {
-		import auth
-		reverse_proxy 192.168.1.30:8283
-	}
-
-	@codeserver host codeserver.akanealw.com
-	handle @codeserver {
-		import auth
-		reverse_proxy 192.168.1.50:3001
-	}
-
-	@freshrss host freshrss.akanealw.com
-	handle @freshrss {
-		import auth
-		reverse_proxy 192.168.1.30:8088
-	}
-
-	@jackett host jackett.akanealw.com
-	handle @jackett {
-		import auth
-		reverse_proxy 192.168.1.30:9117
-	}
-
-	@jdownloader host jdownloader.akanealw.com
-	handle @jdownloader {
-		import auth
-		reverse_proxy 192.168.1.30:5800
-	}
-
-	@jellyseerr host jellyseerr.akanealw.com
-	handle @jellyseerr {
-		import auth
-		reverse_proxy 192.168.1.30:5056
-	}
-
-	@kavita host kavita.akanealw.com
-	handle @kavita {
-		import auth
-		reverse_proxy 192.168.1.30:5002
-	}
-
-	@lidarr host lidarr.akanealw.com
-	handle @lidarr {
-		import auth
-		reverse_proxy 192.168.1.30:8686
-	}
-
-	@metube host metube.akanealw.com
-	handle @metube {
-		import auth
-		reverse_proxy 192.168.1.30:8082
-	}
-
-	@mstream host mstream.akanealw.com
-	handle @mstream {
-		import auth
-		reverse_proxy 192.168.1.30:3001
-	}
-
-	@nzbhydra host nzbhydra.akanealw.com
-	handle @nzbhydra {
-		import auth
-		reverse_proxy 192.168.1.30:5076
-	}
-
-	@olivetin host olivetin.akanealw.com
-	handle @olivetin {
-		import auth
-		reverse_proxy 192.168.1.30:1337
-	}
-
-	@opengist host opengist.akanealw.com
-	handle @opengist {
-		import auth
-		reverse_proxy 192.168.1.4:6157
-	}
-
-	@paperless host paperless.akanealw.com
-	handle @paperless {
-		import auth
-		reverse_proxy 192.168.1.30:8112
-	}
-
-	@prowlarr host prowlarr.akanealw.com
-	handle @prowlarr {
-		import auth
-		reverse_proxy 192.168.1.30:9696
-	}
-
-	@qbittorrent host qbittorrent.akanealw.com
-	handle @qbittorrent {
-		import auth
-		reverse_proxy 192.168.1.30:8282
-	}
-
-	@radarr host radarr.akanealw.com
-	handle @radarr {
-		import auth
-		reverse_proxy 192.168.1.30:7878
-	}
-
-	@sabnzbd host sabnzbd.akanealw.com
-	handle @sabnzbd {
-		import auth
-		reverse_proxy 192.168.1.30:8181
-	}
-
-	@shlinkweb host shlink.akanealw.com
-	handle @shlinkweb {
-		import auth
-		reverse_proxy 192.168.1.30:8381
-	}
-
-	@sonarr host sonarr.akanealw.com
-	handle @sonarr {
-		import auth
-		reverse_proxy 192.168.1.30:8989
-	}
-
-	@spdf host spdf.akanealw.com
-	handle @spdf {
-		import auth
-		reverse_proxy 192.168.1.30:8086
-	}
-
-	@ittools host it-tools.akanealw.com
-	handle @ittools {
-		import auth
-		reverse_proxy 192.168.1.30:8383
-	}
-
-	@wikidocs host wiki.akanealw.com
-	handle @wikidocs {
-		import auth
-		reverse_proxy 192.168.1.30:8022
-	}
-}