diff --git a/nixos/common/desktops/gnome/default.nix b/nixos/common/desktops/gnome/default.nix
index 290a695a..d7a10530 100644
--- a/nixos/common/desktops/gnome/default.nix
+++ b/nixos/common/desktops/gnome/default.nix
@@ -1,7 +1,5 @@
 { lib, config, pkgs, hostname, gpu, ... }: {
   # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -13,8 +11,8 @@
   # Configure keymap in X11
   services.xserver = {
     enable = true;
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
     autorun = true;
   };
 
@@ -76,7 +74,7 @@
     gnomeExtensions.tailscale-qs
 
     # Gnome relevant packages
-    gnome3.gnome-tweaks
+    gnome.gnome-tweaks
     papirus-icon-theme
     dconf2nix # https://github.com/gvolpe/dconf2nix