diff --git a/services/caddy.nix b/services/caddy.nix
index 8f7ebed..7a6895c 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -9,7 +9,7 @@
 {
   imports = [
     (lib.serviceMountDeps "caddy" [
-      "/var/lib/caddy"
+      config.services.caddy.dataDir
       service_configs.https.data_dir
     ])
   ];
@@ -30,8 +30,8 @@
   };
 
   systemd.tmpfiles.rules = [
-    "d ${service_configs.https.data_dir} 750 ${config.services.caddy.user} ${config.services.caddy.group}"
-    "d /var/lib/caddy 750 ${config.services.caddy.user} ${config.services.caddy.group}"
+    "d ${service_configs.https.data_dir} 770 ${config.services.caddy.user} ${config.services.caddy.group}"
+    "d ${config.services.caddy.dataDir} 700 ${config.services.caddy.user} ${config.services.caddy.group}"
   ];
 
   systemd.packages = with pkgs; [ nssTools ];
diff --git a/services/minecraft.nix b/services/minecraft.nix
index d87e5e7..a0af58b 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -116,21 +116,21 @@
     };
   };
 
-  services.caddy.virtualHosts."map.${service_configs.https.domain}".extraConfig = ''
-    root * ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}/squaremap/web
-    file_server browse
-  '';
+  services.caddy.virtualHosts = lib.mkIf (config.services.caddy.enable) {
+    "map.${service_configs.https.domain}".extraConfig = ''
+      root * ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}/squaremap/web
+      file_server browse
+    '';
+  };
 
-  users.users.${config.services.caddy.user}.extraGroups = [
-    # for `map.gardling.com`
-    "minecraft"
-  ];
+  users.users = lib.mkIf (config.services.caddy.enable) {
+    ${config.services.caddy.user}.extraGroups = [
+      # for `map.gardling.com`
+      "minecraft"
+    ];
+  };
 
   systemd.tmpfiles.rules = [
-    "d ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name} 0750 minecraft minecraft"
-  ];
-
-  users.users.${username}.extraGroups = [
-    "minecraft"
+    "d ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name} 0750 ${config.services.minecraft-servers.user} ${config.services.minecraft-servers.group}"
   ];
 }