diff --git a/flake.nix b/flake.nix
index f5d89f9..a32913f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -144,6 +144,13 @@
           # inputs.simple-nixos-mailserver.nixosModule
         ];
       };
+      kiosk-gene-desk = localLib.mkNixosHost {
+        system = "aarch64-linux";
+        hostname = "kiosk-gene-desk";
+        additionalModules = [
+          inputs.nixos-hardware.nixosModules.raspberry-pi-4
+        ];
+      };
       nixnas1 = localLib.mkNixosHost {
         hostname = "nixnas1";
         additionalModules = [
@@ -163,13 +170,6 @@
           inputs.nixos-hardware.nixosModules.dell-xps-13-9360
         ];
       };
-      raspberry = localLib.mkNixosHost {
-        system = "aarch64-linux";
-        hostname = "raspberry";
-        additionalModules = [
-          inputs.nixos-hardware.nixosModules.raspberry-pi-3
-        ];
-      };
     }; # end nixosConfigurations
 
     # Home Manager (only) users
diff --git a/modules/hosts/nixos/raspberry/default.nix b/modules/hosts/nixos/kiosk-gene-desk/default.nix
similarity index 58%
rename from modules/hosts/nixos/raspberry/default.nix
rename to modules/hosts/nixos/kiosk-gene-desk/default.nix
index d0db09b..1e14536 100644
--- a/modules/hosts/nixos/raspberry/default.nix
+++ b/modules/hosts/nixos/kiosk-gene-desk/default.nix
@@ -1,11 +1,23 @@
-{ inputs, username, ... }: {
+{ inputs, lib, pkgs, username, ... }: {
   imports = [
     # SD card image
     "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
   ];
-  
+
   system.stateVersion = "24.11";
 
+  boot.supportedFilesystems = lib.mkForce [
+    "vfat"
+    "ext4"
+  ];
+
+  environment.systemPackages = with pkgs; [
+    libraspberrypi
+    raspberrypi-eeprom
+  ];
+
+  hardware.enableRedistributableFirmware = true;
+
   networking.wireless = {
     enable = true;
     networks = {
@@ -17,6 +29,22 @@
     };
   };
 
+  nixpkgs.overlays = [
+    (final: super: {
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // { allowMissing = true; });
+    })
+  ];
+
+  services = {
+    cage = {
+      enable = true;
+      program = "${pkgs.chromium}/bin/chromium-browser";
+    };
+  };
+
+  sdImage.compressImage = false;
+
   users.users.${username} = {
     isNormalUser = true;
     description = "Gene Liverman";
diff --git a/modules/hosts/nixos/kiosk-gene-desk/home-gene.nix b/modules/hosts/nixos/kiosk-gene-desk/home-gene.nix
new file mode 100644
index 0000000..185b25c
--- /dev/null
+++ b/modules/hosts/nixos/kiosk-gene-desk/home-gene.nix
@@ -0,0 +1,21 @@
+{ ... }: {
+  home.stateVersion = "24.11";
+
+  programs = {
+    chromium = {
+      enable = true;
+      commandLineArgs = [
+        "http://192.168.22.22:8123/kiosk-gene-desk"
+        "--kiosk"
+        "--noerrdialogs"
+        "--disable-infobars"
+        "--no-first-run"
+        "--ozone-platform=wayland"
+        "--enable-features=OverlayScrollbar"
+        "--start-maximized"
+      ];
+    };
+  };
+
+}
+
diff --git a/modules/hosts/nixos/raspberry/home-gene.nix b/modules/hosts/nixos/raspberry/home-gene.nix
deleted file mode 100644
index 422b341..0000000
--- a/modules/hosts/nixos/raspberry/home-gene.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }: {
-  home.stateVersion = "24.11";
-}
-