diff --git a/bsp-files/kickstarts/pre_disk_setup_common.cfg b/bsp-files/kickstarts/pre_disk_setup_common.cfg
index 6a456f22..1b3965c2 100644
--- a/bsp-files/kickstarts/pre_disk_setup_common.cfg
+++ b/bsp-files/kickstarts/pre_disk_setup_common.cfg
@@ -66,6 +66,11 @@ fi
 # Deactivate existing volume groups to avoid Anaconda issues with pre-existing groups
 vgs --noheadings -o vg_name | xargs --no-run-if-empty -n 1 vgchange -an
 
+# Remove volumes and group for cgts-vg, if any
+lvremove --force cgts-vg
+pvs --select 'vg_name=cgts-vg' --noheadings -o pv_name | xargs --no-run-if-empty pvremove --force --force --yes
+vgs --select 'vg_name=cgts-vg' --noheadings -o vg_name | xargs --no-run-if-empty vgremove --force
+
 ONLYUSE_HDD=""
 if [ "$(curl -sf http://pxecontroller:6385/v1/upgrade/$(hostname)/in_upgrade 2>/dev/null)" = "true" ]; then
     # In an upgrade, only wipe the disk with the rootfs and boot partition