diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index 0cb31e32c..83c810d13 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -10,4 +10,4 @@ LimitNOFILE=1048576
 LimitNPROC=1048576
 
 [Install]
-Also=docker.socket
+WantedBy=multi-user.target
diff --git a/contrib/init/systemd/docker.socket b/contrib/init/systemd/docker.socket
index 9db504915..7dd95098e 100644
--- a/contrib/init/systemd/docker.socket
+++ b/contrib/init/systemd/docker.socket
@@ -1,5 +1,6 @@
 [Unit]
 Description=Docker Socket for the API
+PartOf=docker.service
 
 [Socket]
 ListenStream=/var/run/docker.sock