diff --git a/nixos/viridian/services/adguardhome/default.nix b/nixos/viridian/services/adguardhome.nix
similarity index 86%
rename from nixos/viridian/services/adguardhome/default.nix
rename to nixos/viridian/services/adguardhome.nix
index 91f859f..41c7c3b 100644
--- a/nixos/viridian/services/adguardhome/default.nix
+++ b/nixos/viridian/services/adguardhome.nix
@@ -24,5 +24,8 @@
     };
     mutableSettings = true;
   };
+  environment.persistence."/persist" = {
+    directories = [ "/var/lib/AdGuardHome" ];
+  };
 }
 
diff --git a/nixos/viridian/services/borgbackup/default.nix b/nixos/viridian/services/borgbackup.nix
similarity index 100%
rename from nixos/viridian/services/borgbackup/default.nix
rename to nixos/viridian/services/borgbackup.nix
diff --git a/nixos/viridian/services/default.nix b/nixos/viridian/services/default.nix
new file mode 100644
index 0000000..fb965f4
--- /dev/null
+++ b/nixos/viridian/services/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  imports = [
+    ./traefik
+    ./adguardhome.nix
+    ./borgbackup.nix
+    ./minecraft.nix
+  ];
+}
diff --git a/nixos/viridian/services/home-assistant/default.nix b/nixos/viridian/services/home-assistant/default.nix
deleted file mode 100644
index 45ff943..0000000
--- a/nixos/viridian/services/home-assistant/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ ... }:
-
-{
-  # Home automation that puts local control and privacy first.
-  services.home-assistant = {
-    enable = true;
-    openFirewall = true;
-    extraComponents = [
-      # Components required to complete the onboarding
-      "esphome"
-      "met"
-      "radio_browser"
-      "adguard"
-      "jellyfin"
-      ];
-    config = {
-      # Includes dependencies for a basic setup
-      # https://www.home-assistant.io/integrations/defaultoconfig/
-      default_config = {};
-      http = {
-        use_x_forwarded_for = true;
-        trusted_proxies = [
-          "192.168.1.102"
-        ];
-      };
-    };
-    configDir = "/var/lib/home-assistant";
-  };
-}
-
diff --git a/nixos/viridian/services/minecraft-server/default.nix b/nixos/viridian/services/minecraft.nix
similarity index 83%
rename from nixos/viridian/services/minecraft-server/default.nix
rename to nixos/viridian/services/minecraft.nix
index dadfdf0..fbb5dce 100644
--- a/nixos/viridian/services/minecraft-server/default.nix
+++ b/nixos/viridian/services/minecraft.nix
@@ -17,5 +17,8 @@
     };
     eula = true;
   };
+  environment.persistence."/persist" = {
+    directories = [ "/var/lib/minecraft" ];
+  };
 }
 
diff --git a/nixos/viridian/services/traefik/default.nix b/nixos/viridian/services/traefik/default.nix
index 987237e..3015baa 100644
--- a/nixos/viridian/services/traefik/default.nix
+++ b/nixos/viridian/services/traefik/default.nix
@@ -12,7 +12,7 @@
 
   age.secrets.traefik = {
     # Environment variables for cloudflare dns challenge
-    file = inputs.self + /secrets/traefik.age;
+    rekeyFile = ./environment.age;
     owner = "traefik";
     group = "traefik";
   };
@@ -135,5 +135,16 @@
       };
     };
   };
+
+  # Persist our traefik data & logs
+  environment.persistence."/persist" = {
+    directories = [
+      "/var/lib/traefik"
+    ];
+    files = [
+      "/var/log/traefik/traefik.log"
+      "/var/log/traefik/access.log"
+    ];
+  };
 }
 
diff --git a/nixos/viridian/services/traefik/environment.age b/nixos/viridian/services/traefik/environment.age
new file mode 100644
index 0000000..4a023fb
--- /dev/null
+++ b/nixos/viridian/services/traefik/environment.age
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> piv-p256 hdSnGw Ax4c4R1UyEN7x8q3SQiDS+kYoLKAerZH+j2kyR/cByA7
+tsSTf2pPX8Wp3xlAhxWamG6KyzdECTq4QqZQHAsHggo
+-> I<^myN@-grease
+UcIo43Q7FhyPbAoGA0ACg0Qix5qUXF544ethgrmEkVmWPxNDWnSKrQQ/gIadKvVC
+FCZ/aUVh0mx+U+EIUw
+--- 4+CcK7G8toKWX6MH9g515WMwhJlkGpnhX9iwzJbvlU0
+UtC
äSfTTmq"6´Pó´ÛŒ‹ô
7Óà)Ö°„Ѭa®e7¯³†ÑZ‡FG?k“y£)�WâàqVë\|5?o%®3È�DMxŒGϧ3iT¬S\Ý
ôð–5À)Þ_„–ÅÝ,¤ÐŒö`
\ No newline at end of file