diff --git a/roles/usb_lib/templates/usbmount.rules.j2 b/roles/usb_lib/templates/usbmount.rules.j2
index 939a31041..0e64d56e3 100644
--- a/roles/usb_lib/templates/usbmount.rules.j2
+++ b/roles/usb_lib/templates/usbmount.rules.j2
@@ -1,3 +1,2 @@
 ACTION=="add", SUBSYSTEMS=="usb", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem" PROGRAM="/bin/systemd-escape -p --template=usbmount@.service $env{DEVNAME}", ENV{SYSTEMD_WANTS}+="%c"
-ACTION=="remove", SUBSYSTEMS=="usb", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem" PROGRAM="/bin/systemd-escape -p /usr/share/usbmount/usbmount remove"
-
+ACTION=="remove", SUBSYSTEMS=="usb", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem" PROGRAM="/bin/systemd-escape -p --template=usbmount@.service $env{DEVNAME}"
diff --git a/roles/usb_lib/templates/usbmount@.service.j2 b/roles/usb_lib/templates/usbmount@.service.j2
index 6cf1f990b..9466591a4 100644
--- a/roles/usb_lib/templates/usbmount@.service.j2
+++ b/roles/usb_lib/templates/usbmount@.service.j2
@@ -10,6 +10,6 @@ TimeoutStartSec=0
 Environment=DEVNAME=%I
 ExecStart=/usr/local/sbin/usbmount add
 ExecStop=/usr/local/sbin/iiab-clean-usb.sh %I
-ExecStopPost=/bin/umount /%I
+ExecStopPost=/usr/local/sbin/usbmount remove
 RemainAfterExit=yes
 RuntimeDirectory=usbmount