diff --git a/packages/network/ethtool/udev.d/99-wakeup-eth.rules b/packages/network/ethtool/udev.d/99-wakeup-eth.rules
index 1c17fe9892..281b2a392c 100644
--- a/packages/network/ethtool/udev.d/99-wakeup-eth.rules
+++ b/packages/network/ethtool/udev.d/99-wakeup-eth.rules
@@ -21,7 +21,7 @@ ACTION!="add|change", GOTO="end"
 SUBSYSTEM!="net", GOTO="end"
 ENV{INTERFACE}!="eth*", GOTO="end"
 
-RUN+="/bin/sh -c 'echo enabled >/sys/class/net/$env{INTERFACE}/device/power/wakeup' "
+TEST=="/sys/class/net/$env{INTERFACE}/device/power/wakeup", RUN+="/bin/sh -c 'echo enabled >/sys/class/net/$env{INTERFACE}/device/power/wakeup'"
 RUN+="/usr/sbin/ethtool -s $env{INTERFACE} wol g"
 
 LABEL="end"
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index 36e3b6b9a3..b57864f6e6 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -144,6 +144,11 @@ post_makeinstall_target() {
   # remove Network adaper renaming rule, this is confusing
   rm -rf $INSTALL/usr/lib/udev/rules.d/80-net-setup-link.rules
 
+  # remove the uaccess rules as we don't build systemd with ACL (see https://github.com/systemd/systemd/issues/4107)
+  rm -rf $INSTALL/usr/lib/udev/rules.d/70-uaccess.rules
+  rm -rf $INSTALL/usr/lib/udev/rules.d/71-seat.rules
+  rm -rf $INSTALL/usr/lib/udev/rules.d/73-seat-late.rules
+
   # remove debug-shell.service, we install our own
   rm -rf $INSTALL/usr/lib/systemd/system/debug-shell.service
 
diff --git a/packages/sysutils/udevil/udev.d/95-udevil-mount.rules b/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
index 42c88d00d9..64065d04b7 100644
--- a/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
+++ b/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
@@ -16,7 +16,7 @@ GOTO="exit"
 
 # mount or umount for hdds
 LABEL="harddisk"
-ACTION=="add", RUN+="/usr/bin/systemctl restart udevil-mount@/dev/%k.service"
+ACTION=="add", PROGRAM="/usr/bin/sh -c '/usr/bin/grep -E ^/dev/%k\  /proc/mounts || true'", RESULT=="", RUN+="/usr/bin/systemctl restart udevil-mount@/dev/%k.service"
 ACTION=="remove", RUN+="/usr/bin/systemctl stop udevil-mount@/dev/%k.service"
 GOTO="exit"
 
diff --git a/packages/tools/hdparm/udev.d/61-cdrom.rules b/packages/tools/hdparm/udev.d/61-cdrom.rules
index 2979ba4fd2..f8ec14e26f 100644
--- a/packages/tools/hdparm/udev.d/61-cdrom.rules
+++ b/packages/tools/hdparm/udev.d/61-cdrom.rules
@@ -19,6 +19,9 @@
 # only do anything on block devices which are not removed
 ACTION!="add|change", GOTO="cdrom_end"
 
+# /dev/sr, /dev/sr_mod, /dev/srcutree are not valid
+KERNEL=="sr|sr_mod|srcutree", GOTO="cdrom_end"
+
 # set CDROM speed
 KERNEL=="sr*", RUN+="/sbin/hdparm -E8 /dev/%k"