diff --git a/roles/service/meta/argument_specs.yaml b/roles/service/meta/argument_specs.yaml
index 393e80c..e78f25f 100644
--- a/roles/service/meta/argument_specs.yaml
+++ b/roles/service/meta/argument_specs.yaml
@@ -29,9 +29,7 @@ argument_specs:
       service_container_http_port:
         description:
           - Port inside the container where http requests are proxied to.
-          - >-
-            If set to 0, /run/{{ service_name }}.sock on the host is bind mounted to /run/{{ service_name }}.sock inside the container
-            and http requests are proxied to it.
+          - If set to 0, http requests are proxied to /run/<service name>.sock inside the container
         type: int
         required: false
         default: 0
diff --git a/roles/service/templates/service.socket.j2 b/roles/service/templates/service.socket.j2
index 5a22b2e..44be9d8 100644
--- a/roles/service/templates/service.socket.j2
+++ b/roles/service/templates/service.socket.j2
@@ -1,6 +1,7 @@
 # {{ ansible_managed }}
 [Unit]
 Description={{ service_name }} socket
+Requires={{ service_name }}.service
 
 [Socket]
 ListenStream=/run/{{ service_name }}.sock
diff --git a/roles/service/vars/main/mounts.yaml b/roles/service/vars/main/mounts.yaml
index b28a366..71ff791 100644
--- a/roles/service/vars/main/mounts.yaml
+++ b/roles/service/vars/main/mounts.yaml
@@ -1,8 +1,8 @@
 ---
 _service_container_socket_mount:
   type: bind
-  source: /run/{{ service_name }}
-  destination: /run/{{ service_name }}
+  source: /run/{{ service_name }}.sock
+  destination: /run/{{ service_name }}.sock
 
 _service_volume_mounts: "{{ service_container_mounts | selectattr('type', '==', 'volume') }}"
 _service_template_mounts: "{{ service_container_mounts | selectattr('type', '==', 'template') }}"