diff --git a/units/tangd.socket b/units/tangd.socket
index 22474ea..12c37bf 100644
--- a/units/tangd.socket
+++ b/units/tangd.socket
@@ -1,14 +1,9 @@
 [Unit]
 Description=Tang Server socket
-Requires=tangd-keygen.service
-Requires=tangd-update.service
-Requires=tangd-update.path
-After=tangd-keygen.service
-After=tangd-update.service
 
 [Socket]
 ListenStream=80
 Accept=true
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sockets.target
diff --git a/units/tangd@.service.in b/units/tangd@.service.in
index c4b9597..72a6f4b 100644
--- a/units/tangd@.service.in
+++ b/units/tangd@.service.in
@@ -1,5 +1,7 @@
 [Unit]
 Description=Tang Server
+Requires=tangd-keygen.service
+After=tangd-keygen.service
 
 [Service]
 StandardInput=socket