diff --git a/modules/servers/isso.nix b/modules/servers/isso.nix
index 7c584d8..b930341 100644
--- a/modules/servers/isso.nix
+++ b/modules/servers/isso.nix
@@ -18,13 +18,16 @@ in
       inherit (cfg) enable;
       settings = {
         guard.require-author = true;
-        server.listen = "http://${cfg.ip}:${toString cfg.port}/";
+        server = {
+          listen = "http://${cfg.ip}:${toString cfg.port}/";
+          public-endpoint = cfg.url;
+        };
         admin = {
           enabled = true;
           password = "$ISSO_ADMIN_PASSWORD";
         };
         general = {
-          host = cfg.url;
+          host = "https://blog.${cfg.domain}";
           max-age = "1h";
           notify = "smtp";
           reply-notifications = true;
@@ -41,6 +44,10 @@ in
         };
       };
     };
-    systemd.services.isso.serviceConfig.EnvironmentFile = config.sops.secrets.isso.path;
+    systemd.services.isso = {
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      serviceConfig.EnvironmentFile = config.sops.secrets.isso.path;
+    };
   };
 }
diff --git a/modules/servers/paperless.nix b/modules/servers/paperless.nix
index 7d9fe4b..751ceae 100644
--- a/modules/servers/paperless.nix
+++ b/modules/servers/paperless.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.paperless;
-  port = config.services.paperless.port;
+  inherit (config.services.paperless) port;
 in
 {
   options.my.servers.paperless.enable = lib.mkEnableOption "Paperless-ngx document management system";