diff --git a/hosts/aluminium/services/unifi-controller.nix b/hosts/aluminium/services/unifi-controller.nix
index f5a70a9..ae39578 100644
--- a/hosts/aluminium/services/unifi-controller.nix
+++ b/hosts/aluminium/services/unifi-controller.nix
@@ -6,7 +6,7 @@ in
 {
   services.unifi = {
     enable = true;
-    unifiPackage = pkgs.unifi8;
+    unifiPackage = pkgs.unifi;
     mongodbPackage = pkgs.mongodb-7_0;
   };
   networking.firewall.interfaces.lechner.allowedTCPPorts = [
diff --git a/hosts/iron/services/unifi-controller.nix b/hosts/iron/services/unifi-controller.nix
index 87144fa..f351e4b 100644
--- a/hosts/iron/services/unifi-controller.nix
+++ b/hosts/iron/services/unifi-controller.nix
@@ -7,7 +7,7 @@ in
 {
   services.unifi = {
     enable = true;
-    unifiPackage = pkgs.unifi8;
+    unifiPackage = pkgs.unifi;
     mongodbPackage = pkgs.mongodb-7_0;
   };
   networking.firewall.interfaces."${interfaces.lan}".allowedTCPPorts = [
diff --git a/modules/fonts.nix b/modules/fonts.nix
index eb2cee0..8abb971 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -3,7 +3,9 @@
 {
   console.font = "Lat2-Terminus16";
   fonts.packages = with pkgs; lib.mkIf config.jalr.gui.enable [
-    (nerdfonts.override { fonts = [ "Iosevka" ]; })
+    nerd-fonts.iosevka
+    nerd-fonts.iosevka-term
+    nerd-fonts.iosevka-term-slab
     font-awesome
     powerline-fonts
     roboto
diff --git a/modules/mailserver/dovecot.nix b/modules/mailserver/dovecot.nix
index dea0bc5..a2485a5 100644
--- a/modules/mailserver/dovecot.nix
+++ b/modules/mailserver/dovecot.nix
@@ -13,8 +13,6 @@ lib.mkIf cfg.enable {
   services.dovecot2 = {
     enable = true;
 
-    modules = with pkgs; [ dovecot_pigeonhole ];
-
     enableLmtp = true;
     enablePAM = false;
 
@@ -124,6 +122,9 @@ lib.mkIf cfg.enable {
       }
     '';
   };
+
+  environment.systemPackages = [ pkgs.dovecot_pigeonhole ];
+
   systemd.services.dovecot2 = {
     wants = [ "acme-finished-${cfg.fqdn}.target" ];
     after = [ "acme-finished-${cfg.fqdn}.target" ];
diff --git a/modules/pipewire.nix b/modules/pipewire.nix
index 1591e95..3e03a70 100644
--- a/modules/pipewire.nix
+++ b/modules/pipewire.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 lib.mkIf config.jalr.gui.enable {
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
 
   # FIXME
   #hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-modules-bt ];
diff --git a/users/jalr/modules/firefox/default.nix b/users/jalr/modules/firefox/default.nix
index 411773e..56186b9 100644
--- a/users/jalr/modules/firefox/default.nix
+++ b/users/jalr/modules/firefox/default.nix
@@ -272,7 +272,7 @@
     profiles.default = {
       id = 0;
       isDefault = true;
-      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
         browserpass
         darkreader
         sponsorblock
diff --git a/users/jalr/modules/gnuradio.nix b/users/jalr/modules/gnuradio.nix
index 05bb580..8a380a7 100644
--- a/users/jalr/modules/gnuradio.nix
+++ b/users/jalr/modules/gnuradio.nix
@@ -1,11 +1,11 @@
 { nixosConfig, lib, pkgs, ... }:
 
 let
-  gnuradioEnv = pkgs.gnuradio3_8.override {
+  gnuradioEnv = pkgs.gnuradio.override {
     extraPackages = pkgs.lib.attrVals [
       "osmosdr"
     ]
-      pkgs.gnuradio3_8Packages;
+      pkgs.gnuradioPackages;
   };
 in
 lib.mkIf nixosConfig.jalr.gui.enable {