diff --git a/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory
new file mode 100644
index 000000000..15fd4eef4
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/etc merge()!=&&pkg()!=
diff --git a/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf
new file mode 100644
index 000000000..592de2609
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf
@@ -0,0 +1,3 @@
+# Calculate format=dhcp
+
+send host-name = pick-first-value(gethostname(), "ISC-dhclient");
diff --git a/profiles/templates/3.2/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.2/6_ac_update_sync/remerge/00-ini
index 5fe076e04..876e00bae 100644
--- a/profiles/templates/3.2/6_ac_update_sync/remerge/00-ini
+++ b/profiles/templates/3.2/6_ac_update_sync/remerge/00-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 = 29
+remerge = 30
diff --git a/profiles/templates/3.2/6_ac_update_sync/remerge/30 b/profiles/templates/3.2/6_ac_update_sync/remerge/30
new file mode 100644
index 000000000..f68c6cb75
--- /dev/null
+++ b/profiles/templates/3.2/6_ac_update_sync/remerge/30
@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate name=ini.env merge=net-misc/dhcp ini(overlay-calculate.remerge)<30
+
+[overlay-calculate]
+remerge = 30
diff --git a/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory
new file mode 100644
index 000000000..15fd4eef4
--- /dev/null
+++ b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/etc merge()!=&&pkg()!=
diff --git a/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf
new file mode 100644
index 000000000..592de2609
--- /dev/null
+++ b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf
@@ -0,0 +1,3 @@
+# Calculate format=dhcp
+
+send host-name = pick-first-value(gethostname(), "ISC-dhclient");
diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini
index 876e00bae..8a69572d8 100644
--- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini
+++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-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 = 30
+remerge = 31
diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/30 b/profiles/templates/3.3/6_ac_update_sync/remerge/30
index 9dfaa3c25..f68c6cb75 100644
--- a/profiles/templates/3.3/6_ac_update_sync/remerge/30
+++ b/profiles/templates/3.3/6_ac_update_sync/remerge/30
@@ -1,4 +1,4 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-process/htop,x11-terms/xterm ini(overlay-calculate.remerge)<30
+# Calculate format=samba path=/etc/calculate name=ini.env merge=net-misc/dhcp ini(overlay-calculate.remerge)<30
 
 [overlay-calculate]
 remerge = 30
diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/31 b/profiles/templates/3.3/6_ac_update_sync/remerge/31
new file mode 100644
index 000000000..08116aa21
--- /dev/null
+++ b/profiles/templates/3.3/6_ac_update_sync/remerge/31
@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-process/htop,x11-terms/xterm ini(overlay-calculate.remerge)<31
+
+[overlay-calculate]
+remerge = 31