diff --git a/hosts/Rupert.nix b/hosts/Rupert.nix
index 54e83af..8e9b780 100644
--- a/hosts/Rupert.nix
+++ b/hosts/Rupert.nix
@@ -13,8 +13,6 @@ in
         ./transcode.nix
         ./development.nix
         ./bspwm.nix
-
-        # ../migrations/pgsql_upgrade.nix
     ];
 
     nixpkgs.overlays = let
@@ -44,7 +42,8 @@ in
         extraPackages = with pkgs; [
             intel-vaapi-driver
             libvdpau-va-gl
-            libva-vdpau-driver
+            vaapiVdpau
+            # intel-media-driver
         ];
     };
     environment.variables = {
@@ -88,13 +87,6 @@ in
         '';
     };
 
-    services.postgresql = {
-        package = pkgs.postgresql_16;
-        authentication = lib.mkOrder 600 ''
-            local all postgres peer map=postgres
-        '';
-    };
-
     # Flatpak
     services.flatpak.enable = true;
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
@@ -144,15 +136,6 @@ in
 
     services.smartd = {
         enable = true;
-        autodetect = false;
-        devices = [
-            {
-                device = "/dev/sda";
-            }
-            {
-                device = "/dev/sdb";
-            }
-        ];
         notifications.x11.enable = false;
         notifications.mail = {
             enable = true;
diff --git a/hosts/mpd.nix b/hosts/mpd.nix
index 60b84b6..87deb37 100644
--- a/hosts/mpd.nix
+++ b/hosts/mpd.nix
@@ -58,7 +58,7 @@ in
         chmod 755 /run/pulse
     '';
 
-    environment.systemPackages = with pkgs; [ mpc ];
+    environment.systemPackages = with pkgs; [ mpc-cli ];
 
     networking.firewall.allowedTCPPorts = [ config.services.mpd.network.port httpStreamPort ];
 }
diff --git a/hosts/nextcloud.nix b/hosts/nextcloud.nix
index cc961f0..e68b058 100644
--- a/hosts/nextcloud.nix
+++ b/hosts/nextcloud.nix
@@ -6,7 +6,7 @@ in
     services.nextcloud = {
         enable = true;
         https = true;
-        package = pkgs.nextcloud32;
+        package = pkgs.nextcloud31;
         hostName = hostName;
         datadir = "/data/nextcloud";
         settings = {