diff --git a/nix/hosts/hetznix/services/caddy/default.nix b/nix/hosts/hetznix/services/caddy/default.nix
index 1428ef3..8fb54d3 100644
--- a/nix/hosts/hetznix/services/caddy/default.nix
+++ b/nix/hosts/hetznix/services/caddy/default.nix
@@ -1,20 +1,5 @@
 {
   services.caddy.enable = true;
 
-  imports = [
-    ./vhosts/2020.oliverdavies.uk.nix
-    ./vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix
-    ./vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
-    ./vhosts/luke.oliverdavies.uk.nix
-    ./vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix
-    ./vhosts/rebuilding-acquia.oliverdavies.uk.nix
-    ./vhosts/rebuilding-bartik.oliverdavies.uk.nix
-    ./vhosts/rebuilding-bristol-js.oliverdavies.uk.nix
-    ./vhosts/rebuilding-symfony.oliverdavies.uk.nix
-    ./vhosts/tailwindcss-demo.oliverdavies.uk.nix
-    ./vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix
-    ./vhosts/wp-tailwind.oliverdavies.uk.nix
-    ./vhosts/www.oliverdavies.uk.nix
-    ./vhosts/zet.oliverdavies.uk.nix
-  ];
+  imports = [ ./vhosts ];
 }
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/default.nix b/nix/hosts/hetznix/services/caddy/vhosts/default.nix
new file mode 100644
index 0000000..41e605e
--- /dev/null
+++ b/nix/hosts/hetznix/services/caddy/vhosts/default.nix
@@ -0,0 +1,18 @@
+{
+  imports = [
+    ./2020.oliverdavies.uk.nix
+    ./bootstrap-with-tailwind.oliverdavies.uk.nix
+    ./florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
+    ./luke.oliverdavies.uk.nix
+    ./phpsw-sculpin-demo.oliverdavies.uk.nix
+    ./rebuilding-acquia.oliverdavies.uk.nix
+    ./rebuilding-bartik.oliverdavies.uk.nix
+    ./rebuilding-bristol-js.oliverdavies.uk.nix
+    ./rebuilding-symfony.oliverdavies.uk.nix
+    ./tailwindcss-demo.oliverdavies.uk.nix
+    ./talking-drupal-tailwindcss.oliverdavies.uk.nix
+    ./wp-tailwind.oliverdavies.uk.nix
+    ./www.oliverdavies.uk.nix
+    ./zet.oliverdavies.uk.nix
+  ];
+}