diff --git a/services/distrust-mini/default.nix b/services/distrust-mini/default.nix
index 37dd0f2..d77079d 100644
--- a/services/distrust-mini/default.nix
+++ b/services/distrust-mini/default.nix
@@ -1,9 +1,12 @@
 {
   imports = [
+    # Core System
     ../shared
 
-    # TOR bridge
+    # Non-stateful services
     ./tor.nix
+
+    # Stateful services
     # Status page in diff. data center for redundancy/resilience
     ./uptime-kuma.nix
   ];
diff --git a/services/distrust/caddy.nix b/services/distrust/caddy.nix
deleted file mode 100644
index a4d52ae..0000000
--- a/services/distrust/caddy.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  services.caddy = {
-    enable = true;
-  };
-
-  networking.firewall.allowedTCPPorts = [80 443];
-}
diff --git a/services/distrust/default.nix b/services/distrust/default.nix
index 6b7a3f7..e144a76 100644
--- a/services/distrust/default.nix
+++ b/services/distrust/default.nix
@@ -1,9 +1,7 @@
 {
   imports = [
-    ../shared
-
     # Core System
-    ./caddy.nix
+    ../shared
 
     # Non-stateful services
     ./ipfs.nix
diff --git a/services/shared/default.nix b/services/shared/default.nix
index 2f50db6..ddb7e95 100644
--- a/services/shared/default.nix
+++ b/services/shared/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./borg.nix
+    ./caddy.nix
   ];
 }