diff --git a/blocks/base-hypervisor-a.cfg b/blocks/base-hypervisor-a.cfg
deleted file mode 100644
index 1fa4537..0000000
--- a/blocks/base-hypervisor-a.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-#            __          ____                        ____  _____
-#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
-#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
-#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
-#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
-# /_/          /____/
-
-# What ? This kickstart file configures an hypervisor for AMD (tm) CPUs
-
-services --enabled="NetworkManager,libvirtd"
-
-%post --nochroot --log=/mnt/sysimage/root/bha.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting
-
-sed -i 's/\(quiet\)/\1 amd_iommu=on amd_iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. 
-
-echo "options kvm_amd nested=1" >> /etc/modprobe.d/kvm.conf # Add support for nested-virtualization
-
-# The following part seems useless
-# dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd " --force # Instruct dracut to load the vfio drivers
-# dracut --force # Regenerate initramfs
-# Doesn't seem to work
-# dracut: Cannot find /usr/lib/dracut/dracut-init.sh.
-# dracut: Are you running from a git checkout?
-# dracut: Try passing -l as an argument to /mnt/sysimage/usr/bin/dracut
-
-# The following part seems useless too. No need to regenerate grub
-# grub2-mkconfig -o /mnt/sysimage/boot/grub2/grub.cfg # Update grub. Does it fail ? /usr/sbin/grub2-probe: error: failed to get canonical path of `LiveOS_rootfs'.
-
-%end # End of the %post section
\ No newline at end of file
diff --git a/blocks/base-hypervisor-amdcpu.cfg b/blocks/base-hypervisor-amdcpu.cfg
new file mode 100644
index 0000000..d59f46c
--- /dev/null
+++ b/blocks/base-hypervisor-amdcpu.cfg
@@ -0,0 +1,16 @@
+#            __          ____                        ____  _____
+#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
+#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
+#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
+#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
+# /_/          /____/
+
+# What ? This kickstart file preloads the vfio-pci driver for devices that are binded to it, activates IOMMU and enables nested-virtualization for AMD (tm) CPUs
+
+%post --nochroot --log=/mnt/sysimage/opt/base-hypervisor-amdcpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting
+
+sed -i 's/\(quiet\)/\1 amd_iommu=on amd_iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. 
+
+echo "options kvm_amd nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested-virtualization
+
+%end # End of the %post section
\ No newline at end of file