diff --git a/modules/system/services/crowdsec/bouncers.nix b/modules/system/services/crowdsec/bouncers.nix
index 92ae0cb..7e70278 100644
--- a/modules/system/services/crowdsec/bouncers.nix
+++ b/modules/system/services/crowdsec/bouncers.nix
@@ -10,6 +10,7 @@ let
 in
 {
   imports = [ inputs.crowdsec.nixosModules.crowdsec-firewall-bouncer ];
+  disabledModules = [ "services/security/crowdsec-firewall-bouncer.nix" ];
 
   options.custom.services.crowdsec.bouncers.firewall = lib.mkEnableOption "";
 
diff --git a/modules/system/services/crowdsec/default.nix b/modules/system/services/crowdsec/default.nix
index 63461ec..7e00097 100644
--- a/modules/system/services/crowdsec/default.nix
+++ b/modules/system/services/crowdsec/default.nix
@@ -11,6 +11,7 @@ let
   user = config.users.users.crowdsec.name;
 in
 {
+  disabledModules = [ "services/security/crowdsec.nix" ];
   imports = [ inputs.crowdsec.nixosModules.crowdsec ];
 
   options.custom.services.crowdsec = {
@@ -51,7 +52,7 @@ in
 
     services.crowdsec = {
       enable = true;
-      package = inputs.crowdsec.packages.${pkgs.system}.crowdsec;
+      package = inputs.crowdsec.packages.${pkgs.stdenv.hostPlatform.system}.crowdsec;
       enrollKeyFile = config.sops.secrets."crowdsec/enrollment-key".path;
       settings = {
         api.server.listen_uri = "localhost:${toString cfg.apiPort}";