diff --git a/profiles/CCDX/ini.env b/profiles/CCDX/ini.env
new file mode 100644
index 0000000..e477988
--- /dev/null
+++ b/profiles/CCDX/ini.env
@@ -0,0 +1,2 @@
+[container]
+type = desktop
diff --git a/profiles/CLC/ini.env b/profiles/CLC/ini.env
new file mode 100644
index 0000000..dfc26bf
--- /dev/null
+++ b/profiles/CLC/ini.env
@@ -0,0 +1,2 @@
+[container]
+type = host
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
index fb30e88..33939dc 100644
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
@@ -2,4 +2,4 @@
 
 [overlay-container]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 
+remerge = 20180209
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/remerge/2017/.calculate_directory
deleted file mode 100644
index 501e76f..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-container.remerge)<20180101
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/remerge/2018/.calculate_directory
new file mode 100644
index 0000000..330b549
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2018/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip ini(overlay-container.remerge)<20190101
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180209 b/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180209
new file mode 100644
index 0000000..df8d5a6
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180209
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-fs/eudev,sys-fs/udev,sys-fs/udev-init-scripts,sys-apps/openrc,sys-apps/calculate-utils
+
+[overlay-container]
+remerge = #-cl_pass_file-#