diff --git a/ks_base_profiles/basic_pre_script.inc b/ks_base_profiles/basic_pre_script.inc
index 3f0deff..b3fbdb9 100644
--- a/ks_base_profiles/basic_pre_script.inc
+++ b/ks_base_profiles/basic_pre_script.inc
@@ -65,6 +65,9 @@ else
     echo "The Drive ${SYSDRIVE} contains a GPT."
 fi
 
+# Write the target disk for %include in the kickstart main section
+echo "ignoredisk --only-use=${SYSDRIVE:5}" > /tmp/disk-include.cfg
+
 OEMDRVPARTSHORT=${OEMDRVPART:5}
 ALLPARTS=$(lsblk -n -l -o NAME "${SYSDRIVE}" -Q 'TYPE=="part"')
 REMPARTS=$(echo "$ALLPARTS" | grep -v "${OEMDRVPARTSHORT}")
diff --git a/ks_base_profiles/cinnamon_fullsetup.cfg b/ks_base_profiles/cinnamon_fullsetup.cfg
index c8a2743..e1fd04b 100644
--- a/ks_base_profiles/cinnamon_fullsetup.cfg
+++ b/ks_base_profiles/cinnamon_fullsetup.cfg
@@ -81,8 +81,8 @@ nss-pam-ldapd
 authselect enable-feature with-fingerprint
 
 
-# Generated using Blivet version 3.12.1
-ignoredisk --only-use=sda,nvme0n1
+# Disk selection written by %pre via basic_pre_script.inc
+%include /tmp/disk-include.cfg
 # Partition clearing information - do NOT USE --initlabel !
 clearpart --none
 autopart --type=btrfs
diff --git a/ks_base_profiles/kde_fullsetup.cfg b/ks_base_profiles/kde_fullsetup.cfg
index 235b498..cab7c62 100644
--- a/ks_base_profiles/kde_fullsetup.cfg
+++ b/ks_base_profiles/kde_fullsetup.cfg
@@ -92,8 +92,8 @@ nss-pam-ldapd
 # System authorization information
 authselect enable-feature with-fingerprint
 
-# Generated using Blivet version 3.12.1
-ignoredisk --only-use=sda,nvme0n1
+# Disk selection written by %pre via basic_pre_script.inc
+%include /tmp/disk-include.cfg
 # Partition clearing information - do NOT USE --initlabel !
 clearpart --none
 autopart --type=btrfs