diff --git a/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch b/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch
index 6776ca75f5..b85d4af2ec 100644
--- a/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch
+++ b/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch
@@ -6,7 +6,7 @@ diff -Naur a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
  # rpcbind.socket, no matter how this unit is started.
  Wants=rpcbind.socket
 -After=rpcbind.socket
-+After=rpcbind.socket var.mount
++After=rpcbind.socket systemd-tmpfiles-setup.service
  
  [Service]
  Type=notify
diff --git a/packages/network/rpcbind/system.d/rpcbind.service b/packages/network/rpcbind/system.d/rpcbind.service
deleted file mode 100644
index 13c0aa264c..0000000000
--- a/packages/network/rpcbind/system.d/rpcbind.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=RPC bind service
-Requires=rpcbind.socket
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/rpcbind
-TimeoutStopSec=1s
-
-[Install]
-WantedBy=multi-user.target
-Also=rpcbind.socket
-
diff --git a/packages/network/rpcbind/system.d/rpcbind.socket b/packages/network/rpcbind/system.d/rpcbind.socket
deleted file mode 100644
index 714370dc79..0000000000
--- a/packages/network/rpcbind/system.d/rpcbind.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=RPCbind Server Activation Socket
-
-[Socket]
-ListenStream=/var/run/rpcbind.sock
-
-[Install]
-WantedBy=sockets.target
-