diff --git a/etc/systemd/system/aminda-nocron-reboot.service b/etc/systemd/system/aminda-nocron-reboot.service
index d2c2b0fe..7c199575 100644
--- a/etc/systemd/system/aminda-nocron-reboot.service
+++ b/etc/systemd/system/aminda-nocron-reboot.service
@@ -55,8 +55,9 @@ ExecStart=-firewall-cmd --permanent --add-port=6771/udp --zone=home
 #ExecStart=-/root/fixcontroller.py
 # This is actually in the delayed variant of this service, but anyway
 ExecStart=-systemctl enable --now yggdrasil.service
-ExecStart=-systemctl enable --now ssh.service
-ExecStart=-systemctl enable --now sshd.service
+ExecStart=-systemctl enable --now avahi-daemon.socket
+ExecStart=-systemctl enable --now ssh.socket
+ExecStart=-systemctl enable --now sshd.socket
 ExecStart=-systemctl enable --now sshguard.service
 ExecStart=-systemctl enable --now unbound.service
 ExecStart=-systemctl enable --now chrony.service
diff --git a/etc/systemd/system/tlp-masker.bash b/etc/systemd/system/tlp-masker.bash
index 9b0345c7..6e74b84a 100755
--- a/etc/systemd/system/tlp-masker.bash
+++ b/etc/systemd/system/tlp-masker.bash
@@ -10,11 +10,11 @@ systemctl enable tlp.service
 
 # Stop the services if they are running
 systemctl disable --quiet --now power-profiles-daemon.service
-systemctl disable --quiet --now systemd-rfkill.service
+systemctl disable --quiet --now systemd-rfkill.{service,socket}
 
 # Actual masking
 systemctl mask power-profiles-daemon.service
-systemctl mask systemd-rfkill.service systemd-rfkill.socket
+systemctl mask systemd-rfkill.service systemd-rfkill.{service,socket}
 
 # In case this script is ran multiple times in succession like when I did
 # when writing it