diff --git a/sshd-keygen.service b/sshd-keygen.service
index c4af598..4a411f0 100644
--- a/sshd-keygen.service
+++ b/sshd-keygen.service
@@ -2,12 +2,10 @@
 Description=SSH server keys generation.
 After=syslog.target
 Before=sshd.service
+BindTo=sshd.service
 
 [Service]
 Type=oneshot
 EnvironmentFile=/etc/sysconfig/sshd
 ExecStart=/usr/sbin/sshd-keygen
 RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sshd.service b/sshd.service
index d5a7051..f32055a 100644
--- a/sshd.service
+++ b/sshd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenSSH server daemon
 After=syslog.target network.target auditd.service
+Wants=sshd-keygen.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/sshd