diff --git a/builder/squash/boot/System.map.new b/builder/squash/boot/System.map.new
index 74b5e7a..6f89668 100644
--- a/builder/squash/boot/System.map.new
+++ b/builder/squash/boot/System.map.new
@@ -1 +1 @@
-# Calculate link=/boot/#-cl_builder_kernel_systemmap-# name=System.map-#-cl_builder_kernel_suffix-# mirror force
+# Calculate link=/boot/#-cl_builder_kernel_systemmap-# name=System.map-#-cl_builder_kernel_suffix-# cl_builder_kernel_systemmap!=System.map-#-cl_builder_kernel_suffix-# mirror force
diff --git a/builder/squash/boot/System.map.remove b/builder/squash/boot/System.map.remove
index 3ab15cd..89dfd20 100644
--- a/builder/squash/boot/System.map.remove
+++ b/builder/squash/boot/System.map.remove
@@ -1 +1 @@
-# Calculate append=remove name=#-cl_builder_kernel_systemmap-#
+# Calculate append=remove name=#-cl_builder_kernel_systemmap-# cl_builder_kernel_systemmap!=System.map-#-cl_builder_kernel_suffix-#
diff --git a/builder/squash/boot/config.new b/builder/squash/boot/config.new
index 59607a8..21c97b8 100644
--- a/builder/squash/boot/config.new
+++ b/builder/squash/boot/config.new
@@ -1 +1 @@
-# Calculate link=/boot/#-cl_builder_kernel_config-# name=config-#-cl_builder_kernel_suffix-# mirror force
+# Calculate link=/boot/#-cl_builder_kernel_config-# name=config-#-cl_builder_kernel_suffix-# cl_builder_kernel_config!=config-#-cl_builder_kernel_suffix-# mirror force
diff --git a/builder/squash/boot/config.remove b/builder/squash/boot/config.remove
index e9dd018..b9258f6 100644
--- a/builder/squash/boot/config.remove
+++ b/builder/squash/boot/config.remove
@@ -1 +1 @@
-# Calculate append=remove name=#-cl_builder_kernel_config-#
+# Calculate append=remove name=#-cl_builder_kernel_config-# cl_builder_kernel_config!=config-#-cl_builder_kernel_suffix-#
diff --git a/builder/squash/boot/initrd.new b/builder/squash/boot/initrd.new
index 9811b96..5dc51c0 100644
--- a/builder/squash/boot/initrd.new
+++ b/builder/squash/boot/initrd.new
@@ -1 +1 @@
-# Calculate link=/boot/#-cl_builder_initrd_install-# name=initramfs-#-cl_builder_kernel_suffix-#-install mirror force
+# Calculate link=/boot/#-cl_builder_initrd_install-# name=initramfs-#-cl_builder_kernel_suffix-#-install mirror force cl_builder_initrd_install!=initramfs-#-cl_builder_kernel_suffix-#-install
diff --git a/builder/squash/boot/initrd.remove b/builder/squash/boot/initrd.remove
index 3ac8f90..d5f56e6 100644
--- a/builder/squash/boot/initrd.remove
+++ b/builder/squash/boot/initrd.remove
@@ -1 +1 @@
-# Calculate append=remove name=#-cl_builder_initrd_install-#
+# Calculate append=remove name=#-cl_builder_initrd_install-# cl_builder_initrd_install!=initramfs-#-cl_builder_kernel_suffix-#-install
diff --git a/builder/squash/boot/vmlinuz.new b/builder/squash/boot/vmlinuz.new
index 297c760..6f1edea 100644
--- a/builder/squash/boot/vmlinuz.new
+++ b/builder/squash/boot/vmlinuz.new
@@ -1 +1 @@
-# Calculate link=/boot/#-cl_builder_kernel-# name=vmlinuz-#-cl_builder_kernel_suffix-# mirror force
+# Calculate link=/boot/#-cl_builder_kernel-# name=vmlinuz-#-cl_builder_kernel_suffix-# mirror force cl_builder_kernel!=vmlinuz-#-cl_builder_kernel_suffix-#
diff --git a/builder/squash/boot/vmlinuz.remove b/builder/squash/boot/vmlinuz.remove
index 9678a42..cf9d616 100644
--- a/builder/squash/boot/vmlinuz.remove
+++ b/builder/squash/boot/vmlinuz.remove
@@ -1 +1 @@
-# Calculate append=remove name=#-cl_builder_kernel-#
+# Calculate append=remove name=#-cl_builder_kernel-# cl_builder_kernel!=vmlinuz-#-cl_builder_kernel_suffix-#