diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index 941a4fc..deb7bca 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -188,8 +188,8 @@ in
       enablePAM = mkForce false;
 
       sieve.pipeBins = map lib.getExe [
-        (pkgs.writeShellScriptBin "rspamd-learn-ham.sh" "exec ${pkgs.rspamd}/bin/rspamc -h /run/rspamd/worker-controller.sock learn_ham")
-        (pkgs.writeShellScriptBin "rspamd-learn-spam.sh" "exec ${pkgs.rspamd}/bin/rspamc -h /run/rspamd/worker-controller.sock learn_spam")
+        (pkgs.writeShellScriptBin "rspamd-learn-ham.sh" "exec ${lib.getExe' config.services.rspamd.package "rspamc"} -h /run/rspamd/worker-controller.sock learn_ham")
+        (pkgs.writeShellScriptBin "rspamd-learn-spam.sh" "exec ${lib.getExe' config.services.rspamd.package "rspamc"} -h /run/rspamd/worker-controller.sock learn_spam")
       ];
 
       # https://doc.dovecot.org/2.4.3/core/settings/syntax.html
diff --git a/mail-server/environment.nix b/mail-server/environment.nix
index 020930a..aa2fb54 100644
--- a/mail-server/environment.nix
+++ b/mail-server/environment.nix
@@ -26,11 +26,11 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = [
       config.services.dovecot2.package
-      openssh
-      postfix
-      rspamd
+      pkgs.openssh
+      config.services.postfix.package
+      config.services.rspamd.package
     ];
   };
 }
diff --git a/mail-server/rspamd.nix b/mail-server/rspamd.nix
index a5df196..1ee9775 100644
--- a/mail-server/rspamd.nix
+++ b/mail-server/rspamd.nix
@@ -27,6 +27,7 @@ let
   postfixCfg = config.services.postfix;
   rspamdCfg = config.services.rspamd;
 
+  rspamdPkg = config.services.rspamd.package;
   rspamdUser = config.services.rspamd.user;
   rspamdGroup = config.services.rspamd.group;
 
@@ -45,7 +46,7 @@ let
     pkgs.writeShellScript "dkim-keygen-${domain}-${selector}" ''
       if [ ! -f "${privkey}" ]
       then
-        ${lib.getExe' pkgs.rspamd "rspamadm"} dkim_keygen ${
+        ${lib.getExe' rspamdPkg "rspamadm"} dkim_keygen ${
           lib.cli.toCommandLineShellGNU { } {
             inherit
               domain
@@ -114,7 +115,7 @@ in
           nativeBuildInputs = with pkgs; [ makeWrapper ];
         }
         ''
-          makeWrapper ${pkgs.rspamd}/bin/rspamc $out/bin/rspamc \
+          makeWrapper ${lib.getExe' rspamdPkg "rspamc"} $out/bin/rspamc \
             --add-flags "-h /run/rspamd/worker-controller.sock"
         ''
       )
@@ -288,7 +289,7 @@ in
       # default behaviour when called without a date.
       # https://github.com/rspamd/rspamd/issues/4062
       script = toString [
-        (lib.getExe' pkgs.rspamd "rspamadm")
+        (lib.getExe' rspamdPkg "rspamadm")
         "dmarc_report"
         "$(date -d 'yesterday' '+%Y%m%d')"
       ];