diff --git a/home-manager/homeserver/containers/caddy.nix b/home-manager/homeserver/containers/caddy.nix
index e12a6d2..a67e324 100644
--- a/home-manager/homeserver/containers/caddy.nix
+++ b/home-manager/homeserver/containers/caddy.nix
@@ -20,8 +20,9 @@
       volumes = [
         "/home/cianh/caddy/config:/etc/caddy"
         "/home/cianh/caddy/data:/data:Z"
-        # "/home/cianh/caddy/placeholder_site/:/srv:ro"
       ];
     };
   };
+
+  home.file."caddy/config/Caddyfile".source = ./caddy_config/Caddyfile;
 }
diff --git a/home-manager/homeserver/containers/caddy_config/Caddyfile b/home-manager/homeserver/containers/caddy_config/Caddyfile
new file mode 100644
index 0000000..c5eb223
--- /dev/null
+++ b/home-manager/homeserver/containers/caddy_config/Caddyfile
@@ -0,0 +1,5 @@
+{
+	admin off
+}
+
+import subdomains/*
diff --git a/home-manager/homeserver/containers/caddy_config/subdomains/freshrss.caddyfile b/home-manager/homeserver/containers/caddy_config/subdomains/freshrss.caddyfile
new file mode 100644
index 0000000..2546798
--- /dev/null
+++ b/home-manager/homeserver/containers/caddy_config/subdomains/freshrss.caddyfile
@@ -0,0 +1,3 @@
+freshrss.bulba.space {
+	reverse_proxy freshrss:80
+}
diff --git a/home-manager/homeserver/containers/caddy_config/subdomains/site.caddyfile b/home-manager/homeserver/containers/caddy_config/subdomains/site.caddyfile
new file mode 100644
index 0000000..3e46b9f
--- /dev/null
+++ b/home-manager/homeserver/containers/caddy_config/subdomains/site.caddyfile
@@ -0,0 +1,3 @@
+bulba.space {
+	reverse_proxy bulbaspace-site:80
+}
diff --git a/home-manager/homeserver/containers/caddy_config/subdomains/vikunja.caddyfile b/home-manager/homeserver/containers/caddy_config/subdomains/vikunja.caddyfile
new file mode 100644
index 0000000..a6fb8e2
--- /dev/null
+++ b/home-manager/homeserver/containers/caddy_config/subdomains/vikunja.caddyfile
@@ -0,0 +1,3 @@
+vikunja.bulba.space {
+	reverse_proxy vikunja:3456
+}
diff --git a/home-manager/homeserver/containers/site.nix b/home-manager/homeserver/containers/site.nix
index b8d5648..b1eefe4 100644
--- a/home-manager/homeserver/containers/site.nix
+++ b/home-manager/homeserver/containers/site.nix
@@ -17,4 +17,6 @@
       ];
     };
   };
+
+  home.file."caddy/config/subdomains/site.caddyfile".source = ./caddy_config/subdomains/site.caddyfile;
 }
diff --git a/home-manager/homeserver/containers/work_tools.nix b/home-manager/homeserver/containers/work_tools.nix
index 0f531fc..c925123 100644
--- a/home-manager/homeserver/containers/work_tools.nix
+++ b/home-manager/homeserver/containers/work_tools.nix
@@ -21,9 +21,9 @@
         ];
         environment = {
           VIKUNJA_SERVICE_JWTSECRET = config.sops.secrets.vikunja_jwtsecret.path;
-          VIKUNJA_SERVICE_PUBLICURL = "https://bulba.space/vikunja";
+          VIKUNJA_SERVICE_PUBLICURL = "https://vikunja.bulba.space";
           VIKUNJA_FRONTEND_BASE = "/vikunja";
-          VIKUNJA_SERVICE_FRONTENDURL = "https://bulba.space/vikunja";
+          VIKUNJA_SERVICE_FRONTENDURL = "https://vikunja.bulba.space";
           VIKUNJA_DATABASE_PATH = "/db/vikunja.db";
           VIKUNJA_DATABASE_TYPE = "mysql";
           VIKUNJA_DATABASE_DATABASE = "vikunja";
@@ -65,7 +65,7 @@
           TZ = "Europe/Dublin";
           CRON_MIN = "1,31";
           TRUSTED_PROXY = "caddy";
-          FRESHRSS_SUBFOLDER = "/freshrss";
+          FRESHRSS_ENV = "production";
         };
         volumes = [
           "/home/cianh/freshrss/data:/var/www/FreshRSS/data"
@@ -78,4 +78,7 @@
       };
     };
   };
+
+  home.file."caddy/config/subdomains/vikunja.caddyfile".source = ./caddy_config/subdomains/vikunja.caddyfile;
+  home.file."caddy/config/subdomains/freshrss.caddyfile".source = ./caddy_config/subdomains/freshrss.caddyfile;
 }