diff --git a/system/modules/docker/default.nix b/system/modules/docker/default.nix
index 8752a9b7..32e0d3de 100644
--- a/system/modules/docker/default.nix
+++ b/system/modules/docker/default.nix
@@ -13,7 +13,6 @@ in {
       docker = {
         enable = !docker.podman;
         autoPrune.enable = true;
-        enableNvidia = true;
 
         rootless = {
           enable = docker.docker.rootless;
diff --git a/system/servenix/default.nix b/system/servenix/default.nix
index 43d6785c..e7a02945 100644
--- a/system/servenix/default.nix
+++ b/system/servenix/default.nix
@@ -102,8 +102,9 @@
   services = {
     # Configure keymap in X11
     xserver = {
-      layout = "us";
-      xkbVariant = "altgr-intl";
+      xkb.layout = "us";
+      xkb.variant = "altgr-intl";
+
       videoDrivers = ["nvidia"];
     };