diff --git a/etc/portage/sets/base b/etc/portage/sets/base
index c94e38b..911335d 100644
--- a/etc/portage/sets/base
+++ b/etc/portage/sets/base
@@ -3,34 +3,27 @@
 
 # kernel
 sys-kernel/linux-firmware
-#sys-firmware/intel-microcode
 sys-kernel/gentoo-sources
 sys-kernel/modprobed-db
-sys-apps/openrc
+sys-power/acpid
+
+# filesystem
 sys-fs/zfs
 sys-fs/zfs-kmod
-sys-power/acpid
-#app-laptop/laptop-mode-tools
-
-# boot
-app-crypt/sbsigntools
-app-crypt/sbctl
-app-crypt/zlevis
-app-crypt/jitterentropy
-sys-apps/systemd-utils
 
 # portage
 sys-apps/portage
-app-eselect/eselect-repository
 app-portage/cpuid2cpuflags
 app-portage/gentoolkit
+app-eselect/eselect-repository
 app-admin/eclean-kernel
 
 # musl
 sys-libs/timezone-data
 sys-libs/error-standalone
 
-# services
+# init/services
+sys-apps/openrc
 net-misc/openntpd
 sys-block/zram-init
 net-misc/networkmanager
@@ -38,7 +31,8 @@ net-wireless/bluez
 net-vpn/tailscale
 net-print/cups-meta
 
-# apparmor
+# security
+app-crypt/jitterentropy
 sys-apps/apparmor
 sys-apps/apparmor-utils
 sec-policy/apparmor-profiles
diff --git a/etc/portage/sets/boot b/etc/portage/sets/boot
new file mode 100644
index 0000000..2eec959
--- /dev/null
+++ b/etc/portage/sets/boot
@@ -0,0 +1,12 @@
+# /etc/portage/sets/boot
+# Set containing packages for boot system
+
+# systemd-boot
+sys-apps/systemd-utils
+
+# secureboot
+app-crypt/sbctl
+app-crypt/sbsigntools
+
+# tpm
+app-crypt/zlevis