diff --git a/modules/nixos/hardware/raspberry-pi/overlays/default.nix b/modules/nixos/hardware/raspberry-pi/overlays/default.nix
index 11a706b..1632c9d 100644
--- a/modules/nixos/hardware/raspberry-pi/overlays/default.nix
+++ b/modules/nixos/hardware/raspberry-pi/overlays/default.nix
@@ -109,7 +109,7 @@ in
     };
   };
 
-  config = {
+  config = lib.mkIf config.${namespace}.hardware.raspberry-pi.enable {
     systemd.services = {
       apply-overlays = {
         description = "Apply Raspberry Pi Device Tree Overlays";
diff --git a/modules/nixos/power/default.nix b/modules/nixos/power/default.nix
index 662b883..1d9d925 100644
--- a/modules/nixos/power/default.nix
+++ b/modules/nixos/power/default.nix
@@ -49,7 +49,7 @@ in
       };
 
       upsd = {
-        enable = false;
+        enable = true;
         listen = [
           {
             address = "0.0.0.0";