diff --git a/templates/services/droneci-compose.yml.j2 b/templates/services/droneci-compose.yml.j2
index b4ee1c6..738210a 100644
--- a/templates/services/droneci-compose.yml.j2
+++ b/templates/services/droneci-compose.yml.j2
@@ -5,7 +5,6 @@ version: '2'
 services:
   droneserver:
     image: {{ droneci_server_image }}
-
     ports:
       - {{ droneci_server_exposed_ip + ':' if droneci_server_exposed_ip is defined else '' }}{{ droneci_server_exposed_port }}:80
     volumes:
@@ -21,7 +20,6 @@ services:
       - {{ '"' + host + '"' }}
     {% endfor %}
     {% endif %}
-    restart: {{ droneci_server_restart_policy }}
     environment:
       - DRONE_SERVER_HOST={{ droneci_host | urlsplit('hostname') }}
       - DRONE_SERVER_PROTO={{ droneci_host | urlsplit('scheme') }}
@@ -58,9 +56,6 @@ services:
 
   droneagent:
     image: {{ droneci_agent_image }}
-
-    command: agent
-    restart: {{ droneci_agent_restart_policy }}
     depends_on:
       - droneserver
     volumes: