diff --git a/clamav-milter.systemd b/clamav-milter.systemd
index ecfc1f6..ace90ea 100644
--- a/clamav-milter.systemd
+++ b/clamav-milter.systemd
@@ -1,8 +1,8 @@
 [Unit]
 Description = Milter module for the Clam Antivirus scanner
 After = syslog.target
-Before = sendmail
-Before = postfix
+Before = sendmail.service
+Before = postfix.service
 
 [Service]
 Type = simple
diff --git a/clamd.scan.systemd b/clamd.scan.systemd
index 5440cc4..1e5759b 100644
--- a/clamd.scan.systemd
+++ b/clamd.scan.systemd
@@ -1,7 +1,7 @@
 [Unit]
 Description = Generic clamav scanner daemon
 After = syslog.target
-Before = clamav-milter
+Before = clamav-milter.service
 
 [Service]
 Type = simple