diff --git a/magpie/configuration.nix b/magpie/configuration.nix
index ef7565d..f6ed9c4 100644
--- a/magpie/configuration.nix
+++ b/magpie/configuration.nix
@@ -54,7 +54,7 @@
       ssh = {
         enable = true;
         hostKeys = [ /etc/ssh_dummy_ed25519_key ];
-        authorizedKeyFiles = [ ../nixy/ssh_pubkey ];
+        authorizedKeyFiles = [ ../fuji/ssh_pubkey ];
       };
     };
   };
@@ -64,7 +64,7 @@
 
   users.users.root.hashedPassword = "!";
   users.users.root.openssh.authorizedKeys.keys = [
-    (builtins.readFile ../nixy/ssh_pubkey)
+    (builtins.readFile ../fuji/ssh_pubkey)
   ];
 
   environment.systemPackages = with pkgs; [
@@ -118,7 +118,7 @@
         aliases = [ "asmir.abdulahovic@project-cloud.net" ];
       };
     };
-    certificateScheme = "acme-nginx";
+    x509.useACMEHost = "mail.project-cloud.net";
   };
 
   services.journald.extraConfig = ''SystemMaxUse=500M '';
@@ -239,6 +239,8 @@
       };
     };
 
+    virtualHosts.${config.mailserver.fqdn}.enableACME = true;
+
     virtualHosts."stats.project-cloud.net" = {
       quic = true;
       http3 = true;
@@ -302,7 +304,7 @@
     vers4.1 = false
   '';
   services.nfs.server.exports = ''
-    /export/nixy    10.100.0.1/24(rw,nohide,insecure,no_subtree_check,all_squash,anonuid=1000,anongid=100)
+    /export/fuji    10.100.0.1/24(rw,nohide,insecure,no_subtree_check,all_squash,anonuid=1000,anongid=100)
   '';
 
   services.borgbackup.jobs."borgbase" = {
@@ -346,7 +348,6 @@
       "borgbase_ssh_key".sopsFile = ./secrets/borgbase_ssh_key.yaml;
       "gitea_mail_pw_hash".sopsFile = ./secrets/gitea_mail_pw_hash.yaml;
       "miniflux_env".sopsFile = ./secrets/miniflux.yaml;
-      "wg_preshared/mediabox".sopsFile = ../common/secrets/wg_preshared.yaml;
       "wg_preshared/nixy".sopsFile = ../common/secrets/wg_preshared.yaml;
       "wg_preshared/workstation".sopsFile = ../common/secrets/wg_preshared.yaml;
       "wg_privkey".sopsFile = ./secrets/wg_privkey.yaml;
@@ -387,7 +388,7 @@
   };
 
   networking.networkmanager.enable = true;
-  networking.wireless.enable = false;
+  networking.wireless.enable = lib.mkForce false;
 
   networking.wireguard.interfaces = {
     wg0 = {
@@ -407,15 +408,10 @@
 
       peers = [
         {
-          publicKey = builtins.readFile ../nixy/wg_pubkey;
+          publicKey = builtins.readFile ../fuji/wg_pubkey;
           presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path;
           allowedIPs = [ "10.100.0.6/32" ];
         }
-        {
-          publicKey = builtins.readFile ../mediabox/wg_pubkey;
-          presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
-          allowedIPs = [ "10.100.0.5/32" ];
-        }
         {
           publicKey = builtins.readFile ../common/wg_pubkey_workstation;
           presharedKeyFile = config.sops.secrets."wg_preshared/workstation".path;
@@ -433,10 +429,12 @@
       rebootTime = "30s";
     };
 
-    sleep.extraConfig = ''
+    /*
+      sleep.extraConfig = ''
       AllowSuspend=no
       AllowHibernation=no
-    '';
+      '';
+    */
   };
 
   system.stateVersion = "22.11";