diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/os-release b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/os-release
index c622284a9..228eca1d1 100644
--- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/os-release
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/os-release
@@ -1,8 +1,17 @@
 # Calculate format=procmail
-NAME=Calculate
-ID=calculate
-PRETTY_NAME="Calculate/Linux"
+NAME="Calculate"
+ID="calculate"
+ID_LIKE="gentoo"
+#?os_install_linux_subname!=#
+PRETTY_NAME="#-os_install_linux_name-# #-os_install_linux_ver-# #-os_install_linux_subname-#"
+VERSION="#-os_install_linux_ver-# #-os_install_linux_subname-#"
+#!os_install_linux_subname#
+PRETTY_NAME="#-os_install_linux_name-# #-os_install_linux_ver-#"
+#os_install_linux_subname#
+VERSION_ID=#-os_install_linux_ver-#
+BUILD_ID=#-os_linux_build-#
 ANSI_COLOR="1;32"
-HOME_URL="http://www.calculate-linux.org"
-SUPPORT_URL="http://www.calculate-linux.org/main/en/community"
-BUG_REPORT_URL="http://www.calculate-linux.org/projects/calculatelinux/issues"
+HOME_URL="https://www.calculate-linux.org"
+SUPPORT_URL="https://chat.calculate-linux.org"
+BUG_REPORT_URL="https://forum.calculate-linux.org"
+VARIANT_ID=#-os_linux_system-#
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 55b53713b..f72a7c58d 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 = 20211103
+remerge = 20211115
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211115 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211115
new file mode 100644
index 000000000..e821c1745
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211115
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/baselayout
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#