diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 12f80f9..fb20ff2 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -10,12 +10,22 @@ rik.veenboer.xyz \
 	}
 }
 
-authentik.rik.veenboer.xyz {
-	route {
-		reverse_proxy host:19000
+(unprotected) {
+	{args[0]}.rik.veenboer.xyz {
+		route {
+			reverse_proxy {args[1]}
+		}
 	}
 }
 
+import unprotected authentik host:19000
+import unprotected jupyter host:9999
+import unprotected grafana host:3333
+import unprotected pgadmin host:5050
+import unprotected homarr host:17575
+import unprotected jellyseerr host:15055
+import unprotected sonarr host:18989
+
 (authentik) {
 	reverse_proxy /outpost.goauthentik.io/* http://host:19000
 	forward_auth http://host:19000 {
@@ -46,7 +56,7 @@ authentik.rik.veenboer.xyz {
 	}
 }
 
-(proxy) {
+(protected) {
 	{args[0]}.rik.veenboer.xyz {
 		route {
 			import authentik
@@ -55,13 +65,13 @@ authentik.rik.veenboer.xyz {
 	}
 }
 
-import proxy app host:12345
-import proxy dagster host:3000
-import proxy photoprism host:2342
-import proxy qbittorrent host:9092
-import proxy esp host:6052
-import proxy dsmr host:8888
-import proxy ha host:8123 # homeassistant
+import protected app host:12345
+import protected dagster host:3000
+import protected photoprism host:2342
+import protected qbittorrent host:9092
+import protected esp host:6052
+import protected dsmr host:8888
+import protected ha host:8123 # homeassistant
 
 insecure.rik.veenboer.xyz {
 	route {
diff --git a/nginx/etc/nginx/conf.d/global.conf b/nginx/etc/nginx/conf.d/global.conf
index e1ca0eb..7e5a503 100644
--- a/nginx/etc/nginx/conf.d/global.conf
+++ b/nginx/etc/nginx/conf.d/global.conf
@@ -31,16 +31,6 @@ server {
         proxy_pass http://host:16767;
         include /etc/nginx/conf/proxy.conf;
     }
-    location /jellyseerr {
-        # jellyseerr
-        proxy_pass http://host:15055;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /jellyfin {
-        # jellyfin
-        proxy_pass http://host:8097;
-        include /etc/nginx/conf/proxy.conf;
-    }
     location /droppy/ {
         # droppy
         proxy_pass http://host:8989/;
@@ -53,26 +43,6 @@ server {
     }
 }
 
-server {
-    # homarr
-    listen 80;
-    server_name homarr.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:17575;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
-server {
-    # jellyseerr
-    listen 80;
-    server_name jellyseerr.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:15055;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
 server {
     # minio
     listen 80;
@@ -96,36 +66,6 @@ server {
     }
 }
 
-server {
-    # jupyter
-    listen 80;
-    server_name jupyter.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:9999;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
-server {
-    # grafana
-    listen 80;
-    server_name grafana.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:3333;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
-server {
-    # pgadmin
-    listen 80;
-    server_name pgadmin.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:5050/;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
 server {
     # test
     listen 80;