diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/hwloc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/hwloc/.calculate_directory
new file mode 100644
index 000000000..95f15012e
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/hwloc/.calculate_directory
@@ -0,0 +1 @@
+# Calculate mergepkg()!= append=skip
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/hwloc/lstopo.desktop b/profiles/templates/3.6/2_ac_install_merge/sys-apps/hwloc/lstopo.desktop
new file mode 100644
index 000000000..0a792a018
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/hwloc/lstopo.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde path=/usr/share/applications
+[Desktop Entry]
+NoDisplay=true
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
index c4e540b17..7c2a2960d 100644
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20220930.1
+remerge = 20221020
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2022/20221020 b/profiles/templates/3.6/6_ac_update_sync/remerge/2022/20221020
new file mode 100644
index 000000000..5d8dbf79d
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2022/20221020
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/hwloc
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#