diff --git a/systems.nix b/systems.nix
index 7d466dd..f3bdcdb 100644
--- a/systems.nix
+++ b/systems.nix
@@ -111,6 +111,6 @@ let
     };
 in
 {
-  pi400 = mkSystem "aarch64-unknown-linux-gnu" "pi400";
-  pi4 = mkSystem "aarch64-unknown-linux-gnu" "pi4";
+  sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na";
+  raspberry4 = mkSystem "aarch64-unknown-linux-gnu" "raspberry4";
 }
diff --git a/systems/pi4/default.nix b/systems/raspberry4/default.nix
similarity index 70%
rename from systems/pi4/default.nix
rename to systems/raspberry4/default.nix
index 6efac2c..8cdbf6a 100644
--- a/systems/pi4/default.nix
+++ b/systems/raspberry4/default.nix
@@ -33,11 +33,22 @@
 
   #hardware.raspberry-pi."4".fkms-3d.enable = true;
 
+  jopejoe1 = {
+    bluetooth.enable = true;
+    local.enable = true;
+    nix.enable = true;
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
+    ssh.enable = true;
+  };
+
   networking = {
     useDHCP = lib.mkDefault true;
   };
 
-  #services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
+  services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
 
   powerManagement.cpuFreqGovernor = "ondemand";
 }
diff --git a/systems/pi400/default.nix b/systems/sukuna-biko-na/default.nix
similarity index 69%
rename from systems/pi400/default.nix
rename to systems/sukuna-biko-na/default.nix
index f62b7ef..9b5b360 100644
--- a/systems/pi400/default.nix
+++ b/systems/sukuna-biko-na/default.nix
@@ -27,6 +27,20 @@
 
   hardware.raspberry-pi."4".fkms-3d.enable = true;
 
+  jopejoe1 = {
+    audio.enable = true;
+    bluetooth.enable = true;
+    local.enable = true;
+    nix.enable = true;
+    kodi.enable = true;
+    plasma.enable = true;
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
+    ssh.enable = true;
+  };
+
   networking = {
     useDHCP = lib.mkDefault true;
   };