diff --git a/roles/maas/templates/automation-compose.yml.j2 b/roles/maas/templates/automation-compose.yml.j2
index c2e2303..5dc952b 100644
--- a/roles/maas/templates/automation-compose.yml.j2
+++ b/roles/maas/templates/automation-compose.yml.j2
@@ -11,6 +11,7 @@
     - "ALLOCATE_LISTEN=0.0.0.0"
     - "ALLOCATE_NETWORK={{ networks.fabric }}"
     - "ALLOCATE_SKIP=2"
+  restart: unless-stopped
 
 provisioner:
   image: "docker-registry:5000/cord-provisioner:{{ docker.image_version }}"
@@ -30,6 +31,7 @@
     - "PROVISION_SCRIPT=/etc/maas/ansible/do-ansible"
   volumes:
     - "/etc/maas/ansible:/etc/maas/ansible"
+  restart: unless-stopped
 
 switchq:
   image: "docker-registry:5000/cord-maas-switchq:{{ docker.image_version }}"
@@ -46,6 +48,7 @@
     - "SWITCHQ_ADDRESS_URL=file:///switchq/dhcp/dhcp_harvest.inc"
   volumes:
     - "/etc/bind/maas:/switchq/dhcp"
+  restart: unless-stopped
 
 automation:
   image: "docker-registry:5000/cord-maas-automation:{{ docker.image_version }}"
@@ -71,4 +74,5 @@
     - "/etc/maas/virtualbox:/etc/maas/virtualbox"
 {% endif %}
   command: [ "-apiVersion", "1.0", "-apikey", "{{ apikey.stdout }}", "-maas", "http://{{ mgmt_ip_address.stdout }}/MAAS", "-period", "30s", "-mappings", "@/mappings/mappings.json", "-always-rename" ]
+  restart: unless-stopped
 
diff --git a/roles/maas/templates/harvest-compose.yml.j2 b/roles/maas/templates/harvest-compose.yml.j2
index 82bc52b..33ca119 100644
--- a/roles/maas/templates/harvest-compose.yml.j2
+++ b/roles/maas/templates/harvest-compose.yml.j2
@@ -13,3 +13,4 @@
     ports:
         - "8954:8954"
     command: [ "--server", "{{ mgmt_ip_address.stdout }}", "--port", "954", "--key", "/key/rndc.conf.maas", "--zone", "cord.lab", "--update", "--verify", "--timeout", "1s", "--repeat", "5m", "--quiet", "2s", "--workers", "10", "--filter", "^(?!cord)" ]
+    restart: unless-stopped