diff --git a/lubuntu/modules/bootloader.conf b/lubuntu/modules/bootloader.conf
index 6286d8e..dc3ee58 100644
--- a/lubuntu/modules/bootloader.conf
+++ b/lubuntu/modules/bootloader.conf
@@ -30,4 +30,4 @@ grubCfg: "/boot/grub/grub.cfg"
 # setting the option here, take care to use only valid directory
 # names since no sanitizing is done.
 #
-efiBootloaderId: "ubuntu"
+efiBootloaderId: "lubuntu-next"
diff --git a/lubuntu/modules/packages.conf b/lubuntu/modules/packages.conf
index e34922b..c773726 100644
--- a/lubuntu/modules/packages.conf
+++ b/lubuntu/modules/packages.conf
@@ -3,5 +3,8 @@ operations:
   - remove:
       - calamares
       - '^live-*'
+      - linux-generic
+      - linux-image*
+      - linux-headers*
   - install:
       - linux-generic
diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf
index f78f689..fc5a96a 100644
--- a/lubuntu/settings.conf
+++ b/lubuntu/settings.conf
@@ -18,13 +18,11 @@ sequence:
   - locale
   - keyboard
   - localecfg
-  - luksbootkeyfile
   - users
   - displaymanager
   - networkcfg
   - hwclock
   - services
-  - initramfscfg
   - initramfs
   - grubcfg
   - bootloader