diff --git a/ci.nix b/ci.nix
index e7dcf98..0633349 100644
--- a/ci.nix
+++ b/ci.nix
@@ -33,6 +33,8 @@ let
     "openweathermap.key"
     "traadfri.key"
     "wifi/Aether.psk"
+    "spotify/username"
+    "spotify/password"
   ];
   systemSecrets = let basic = [ "retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"]; in {
     zaatar = ensureFiles ([ "moodle.token" "telegram/moodle-dl.token" ] ++ basic);
diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix
index ede6a57..5dd6bbe 100644
--- a/systems/zaatar/configuration.nix
+++ b/systems/zaatar/configuration.nix
@@ -11,6 +11,7 @@ in
     ./pulseaudio.nix
     ./tuna.nix
     ./grocy.nix
+    ./spotifyd.nix
     <home-manager/nixos>
     <niveum/configs/keyboard.nix>
     <niveum/configs/monitoring.nix>
diff --git a/configs/spotifyd.nix b/systems/zaatar/spotifyd.nix
similarity index 87%
rename from configs/spotifyd.nix
rename to systems/zaatar/spotifyd.nix
index ae4bb28..b17da3c 100644
--- a/configs/spotifyd.nix
+++ b/systems/zaatar/spotifyd.nix
@@ -1,8 +1,5 @@
 { config, pkgs, lib, ... }:
 {
-  imports = [ <niveum/modules/spotifyd.nix> ];
-  disabledModules = [ "services/audio/spotifyd.nix" ];
-
   services.spotifyd = {
     enable = true;
     settings = {