diff --git a/userspace/files/NetworkManager.conf b/userspace/files/NetworkManager.conf
index f2b5d98..86b0bef 100644
--- a/userspace/files/NetworkManager.conf
+++ b/userspace/files/NetworkManager.conf
@@ -1,6 +1,7 @@
 [main]
 plugins=ifupdown,keyfile
 dns=systemd-resolved
+hostname-mode=none
 
 [ifupdown]
 managed=true
diff --git a/userspace/usr/comma/set-hostname.sh b/userspace/usr/comma/set-hostname.sh
index 7b9d228..46b4b2a 100755
--- a/userspace/usr/comma/set-hostname.sh
+++ b/userspace/usr/comma/set-hostname.sh
@@ -3,4 +3,4 @@ set -e
 
 SERIAL="$(cat /proc/cmdline | sed -e 's/^.*androidboot.serialno=//' -e 's/ .*$//')"
 echo "serial: '$SERIAL'"
-nmcli general hostname "tici-$SERIAL"
+hostnamectl set-hostname --transient "tici-$SERIAL"