diff --git a/hosts/md/hedgedoc.nix b/hosts/md/hedgedoc.nix
index 4d54cc6..2226fa1 100644
--- a/hosts/md/hedgedoc.nix
+++ b/hosts/md/hedgedoc.nix
@@ -4,7 +4,7 @@
   services.hedgedoc = {
     enable = true;
     settings = {
-      domain = "${config.networking.hostName}.${config.networking.domain}";
+      domain = "${config.networking.fqdn}";
       #environmentFile = config.age.secrets.hedgedoc_settings.path;
       protocolUseSSL = true;
       db = {
diff --git a/hosts/md/nginx.nix b/hosts/md/nginx.nix
index dd7e9a9..53f39db 100644
--- a/hosts/md/nginx.nix
+++ b/hosts/md/nginx.nix
@@ -4,7 +4,7 @@ let
   cfg = config.services.hedgedoc.settings;
 in
 {
-  nginx.virtualHosts."${fqdn}" = {
+  nginx.virtualHosts."${config.networking.fqdn}" = {
     default = true;
     quic = true;
     kTLS = true;
diff --git a/hosts/www/default.nix b/hosts/www/default.nix
index d2ffd0c..fd41fe2 100644
--- a/hosts/www/default.nix
+++ b/hosts/www/default.nix
@@ -4,9 +4,9 @@
   imports = [
     ../common.nix
     ../../services/openssh.nix
+    ./openssh.nix
     ../../services/nginx.nix
     ./nginx.nix
-    ./ssh.nix
   ];
 
   networking = {
diff --git a/hosts/www/nginx.nix b/hosts/www/nginx.nix
index 8aad3d6..60302cf 100644
--- a/hosts/www/nginx.nix
+++ b/hosts/www/nginx.nix
@@ -4,7 +4,7 @@ let
   # TODO: mkVHost
 in
 {
-  services.nginx.virtualHosts."${config.networking.hostName}.${config.networking.domain}" = {
+  services.nginx.virtualHosts."${config.networking.fqdn}" = {
     default = true;
     serverAliases = [config.networking.domain];
     quic = true;
diff --git a/hosts/www/ssh.nix b/hosts/www/openssh.nix
similarity index 100%
rename from hosts/www/ssh.nix
rename to hosts/www/openssh.nix