diff --git a/defaults/main.yml b/defaults/main.yml
index d80134a..9ab62f4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,6 +3,7 @@ droneci_version: 1.6.0
 droneci_image: "drone/drone:{{ droneci_version }}"
 
 droneci_service_directory: /var/lib/docker/services/droneci
+droneci_docker_socket_path: /var/run/docker.sock
 droneci_container_name: droneci
 droneci_restart_policy: always
 droneci_service_stopped: False
@@ -76,6 +77,4 @@ droneci_gitea_skip_verify: False
 
 # @var droneci_no_proxy: $ ["drone-server", "drone-agent"]
 droneci_no_proxy: []
-
-droneci_docker_socket_path: /var/run/docker.sock
 droneci_extra_hosts: []
diff --git a/templates/services/droneci_compose.yml.j2 b/templates/services/droneci_compose.yml.j2
index 5f94a33..60fad1d 100644
--- a/templates/services/droneci_compose.yml.j2
+++ b/templates/services/droneci_compose.yml.j2
@@ -6,6 +6,7 @@ services:
   droneci:
     container_name: {{ droneci_container_name }}
     image: {{ droneci_image }}
+    restart: {{ droneci_restart_policy }}
     {% if droneci_exposed_ports | default([]) %}
     ports:
       {% for port in droneci_exposed_ports %}