diff --git a/includes/base-config.ksi b/includes/base-config.ksi
index 8d68551..08e15b5 100644
--- a/includes/base-config.ksi
+++ b/includes/base-config.ksi
@@ -7,5 +7,6 @@ timezone UTC
 selinux --enforcing
 firewall --enabled --ssh
 network --device=link --activate --bootproto=dhcp --onboot=on --hostname=rockylinux
+#firstboot --enable --reconfig # TODO: enable this AFTER DISABLING USER SETUP
 bootloader --location=mbr --boot-drive=sda
 shutdown # power-off after the installation completes
diff --git a/includes/package-list.ksi b/includes/package-list.ksi
index 73a27f7..7652a18 100644
--- a/includes/package-list.ksi
+++ b/includes/package-list.ksi
@@ -41,6 +41,8 @@ net-tools
 NetworkManager-wifi
 tmux
 
+# TODO: enable 'initial-setup'
+#initial-setup
 
 # Remove some packages
 -java-11-*