diff --git a/install.sh b/install.sh
index 8e9a2a43..1304535a 100755
--- a/install.sh
+++ b/install.sh
@@ -91,7 +91,6 @@ install_data misc_systemd_units/dhcrelay.service         "$DESTDIR$systemdunitdi
 install_data misc_systemd_units/enable_overcommit_memory.service "$DESTDIR$systemdunitdir/enable_overcommit_memory.service"
 install_data misc_systemd_units/gdm.service              "$DESTDIR$systemdunitdir/gdm.service"
 install_data misc_systemd_units/startup-tags.service     "$DESTDIR$systemdunitdir/startup-tags.service"
-install_data misc_systemd_units/startup-hostname.service "$DESTDIR$systemdunitdir/startup-hostname.service"
 install_data misc_systemd_units/unbound.service          "$DESTDIR$systemdunitdir/unbound.service"
 install_data misc_systemd_units/xaruba.service           "$DESTDIR$systemdunitdir/xaruba.service"
 install_data misc_systemd_units/yppasswd.service         "$DESTDIR$systemdunitdir/yppasswd.service"
diff --git a/misc_systemd_units/dhcrelay.service b/misc_systemd_units/dhcrelay.service
index e1a1c2f3..449efede 100644
--- a/misc_systemd_units/dhcrelay.service
+++ b/misc_systemd_units/dhcrelay.service
@@ -4,9 +4,7 @@ Description=DHCP relay
 Requires=network.target
 After=network.target
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/bka
+ConditionHost=bka
 
 [Service]
 
diff --git a/misc_systemd_units/named.service b/misc_systemd_units/named.service
index e1ddf64f..7b9ace96 100644
--- a/misc_systemd_units/named.service
+++ b/misc_systemd_units/named.service
@@ -1,10 +1,8 @@
 [Unit]
 After=network.service gateway.service mxmount.service automount.service
 
-Wants=startup-hostname.service
-After=startup-hostname.service
 Before=mxstartup-mxvip.service
-ConditionPathExists=/node/startup-hostname/wtf
+ConditionHost=wtf
 
 [Service]
 Type=forking
diff --git a/misc_systemd_units/startup-hostname.service b/misc_systemd_units/startup-hostname.service
deleted file mode 100644
index 35d87f99..00000000
--- a/misc_systemd_units/startup-hostname.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/startup-hostname
-
diff --git a/misc_systemd_units/xaruba.service b/misc_systemd_units/xaruba.service
index 44f23599..afff09b0 100644
--- a/misc_systemd_units/xaruba.service
+++ b/misc_systemd_units/xaruba.service
@@ -2,9 +2,7 @@
 After=network.service gateway.service mxmount.service
 Before=network.target
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/macheteinfach
+ConditionHost=macheteinfach
 
 [Service]
 Type=oneshot
diff --git a/misc_systemd_units/yppasswd.service b/misc_systemd_units/yppasswd.service
index 8ac29c12..4c110c8b 100644
--- a/misc_systemd_units/yppasswd.service
+++ b/misc_systemd_units/yppasswd.service
@@ -1,9 +1,7 @@
 [Unit]
 After=network.service gateway.service mxmount.service automount.service
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/wtf
+ConditionHost=wtf
 
 [Service]
 Type=forking
diff --git a/misc_systemd_units/ypserv.service b/misc_systemd_units/ypserv.service
index 72668cde..bda8fa4a 100644
--- a/misc_systemd_units/ypserv.service
+++ b/misc_systemd_units/ypserv.service
@@ -2,9 +2,7 @@
 After=network.service gateway.service mxmount.service automount.service
 Before=network.target
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/wtf
+ConditionHost=wtf
 
 [Service]
 Type=forking