diff --git a/ginoza/configuration.nix b/ginoza/configuration.nix
index f5c201f..465deeb 100644
--- a/ginoza/configuration.nix
+++ b/ginoza/configuration.nix
@@ -23,7 +23,7 @@
     };
   };
 
-  # System level configuration
+  boot.loader.systemd-boot.enable = true;
   sys = {
     audio.enable = true;
     bootloader.systemd-boot.enable = true;
diff --git a/kogami/configuration.nix b/kogami/configuration.nix
index db6bcc9..d8a6a2e 100644
--- a/kogami/configuration.nix
+++ b/kogami/configuration.nix
@@ -29,10 +29,10 @@
     ];
   };
 
-  # System level configuration
+  boot.loader.systemd-boot.enable = true;
   sys = {
     audio.enable = true;
-    bootloader.systemd-boot.enable = true;
+    #bootloader.systemd-boot.enable = true;
     desktop = {
       steamdeck.enable = true;
     };
diff --git a/nixos/system/settings/bootloader.nix b/nixos/system/settings/bootloader.nix
index 9da16df..867feaf 100644
--- a/nixos/system/settings/bootloader.nix
+++ b/nixos/system/settings/bootloader.nix
@@ -3,10 +3,10 @@
   config,
 }: {
   options = {
-    sys.bootloader.systemd.enable = lib.mkEnableOption "Enable systemd-boot as the bootloader";
+    sys.bootloader.systemd-boot.enable = lib.mkEnableOption "Enable systemd-boot as the bootloader";
   };
 
-  config = lib.mkIf config.sys.bootloader.systemd.enable {
+  config = lib.mkIf config.sys.bootloader.systemd-boot.enable {
     boot.loader.systemd-boot.enable = true;
   };
 }
diff --git a/nixos/system/system.nix b/nixos/system/system.nix
index 6a70705..c200b42 100644
--- a/nixos/system/system.nix
+++ b/nixos/system/system.nix
@@ -15,14 +15,14 @@
     ./settings/loginManager.nix
     ./settings/style.nix
     ./settings/default-applications.nix
-    ./settings/bootloader.nix
+    #./settings/bootloader.nix
 
     ./settings/user.nix
   ];
 
   sys = {
     audio.enable = lib.mkDefault true;
-    bootloader.systemd-boot.enable = lib.mkDefault true;
+    #bootloader.systemd-boot.enable = lib.mkDefault true;
     desktop = {
       plasma.enable =
         if userSettings.plasma == true