diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix
index bec26d2..3a9690b 100644
--- a/systems/zaatar/configuration.nix
+++ b/systems/zaatar/configuration.nix
@@ -13,7 +13,7 @@ in {
     ./hardware-configuration.nix
     ./kiosk.nix
     ./moodle-dl-meinhark.nix
-    # ./pulseaudio.nix
+    ./pulseaudio.nix
     ./home-assistant.nix
     ./mpd.nix
     ./grocy.nix
@@ -25,7 +25,7 @@ in {
     ../../configs/spacetime.nix
     ../../configs/sshd.nix
     ../../configs/tmux.nix
-    # ../../configs/wpa_supplicant.nix
+    ../../configs/wpa_supplicant.nix
     ../../configs/nix.nix
   ];
 
diff --git a/systems/zaatar/kiosk.nix b/systems/zaatar/kiosk.nix
index 9becd77..8668249 100644
--- a/systems/zaatar/kiosk.nix
+++ b/systems/zaatar/kiosk.nix
@@ -9,13 +9,8 @@
     password = "";
     extraGroups = ["audio"];
   };
-
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
   services.cage = {
-    enable = false;
+    enable = true;
     user = config.users.extraUsers.kiosk.name;
     extraArguments = ["-s"]; # allow vt switching
     program = let
@@ -31,7 +26,7 @@
         done
       '';
   };
-  # systemd.services.cage-tty1.environment.XKB_DEFAULT_LAYOUT = "de";
+  systemd.services.cage-tty1.environment.XKB_DEFAULT_LAYOUT = "de";
   programs.chromium = {
     enable = true;
     extensions = [