diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.use b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.use
index b936dfd9c..71fac9647 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.use
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.use
@@ -1,4 +1,5 @@
 # Calculate path=/etc/portage/package.use name=custom protected exists(/etc/portage/package.use/custom)==||ac_install_disk==on||os_install_root_type==livecd
+#?os_linux_system==desktop#
 #media-libs/openimageio cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c
 #media-libs/opencv cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3
-
+#os_linux_system#
diff --git a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
deleted file mode 100644
index bce5bd62e..000000000
--- a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.keywords/custom)==
diff --git a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
deleted file mode 100644
index d00a01b3a..000000000
--- a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.mask/custom)==
diff --git a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
deleted file mode 100644
index 32c589d26..000000000
--- a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.unmask/custom)==
diff --git a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
deleted file mode 100644
index 31a0700f1..000000000
--- a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.use/custom)==
diff --git a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/sets/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
deleted file mode 100644
index 781390a1b..000000000
--- a/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/sets/custom)==