diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 4f74ce1..f74c6f6 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -6,39 +6,6 @@
 	}
 }
 
-(site) {
-	@landing {
-		path / /contact* /about* /favicon.png
-	}
-	handle /_app/* {
-		reverse_proxy site:3000
-	}
-	handle @landing {
-		reverse_proxy site:3000 {
-			health_uri /health
-			health_interval 30s
-			health_timeout 10s
-			health_status 200
-		}
-	}
-	handle /repo* {
-		uri strip_prefix /repo
-		import repo_site
-	}
-}
-
-:80 {
-	import site
-}
-
-http://am-d-model.eu {
-	import site
-}
-
-am-d-model.eu {
-	import site
-}
-
 # Repo config
 (repo_cors) {
 	header {
@@ -108,3 +75,37 @@ am-d-model.eu {
 		file_server
 	}
 }
+
+# Main site config
+(site) {
+	@landing {
+		path / /contact* /about* /favicon.png
+	}
+	handle /_app/* {
+		reverse_proxy site:3000
+	}
+	handle @landing {
+		reverse_proxy site:3000 {
+			health_uri /health
+			health_interval 30s
+			health_timeout 10s
+			health_status 200
+		}
+	}
+	handle /repo* {
+		uri strip_prefix /repo
+		import repo_site
+	}
+}
+
+:80 {
+	import site
+}
+
+http://am-d-model.eu {
+	import site
+}
+
+am-d-model.eu {
+	import site
+}