diff --git a/roles/onos-cord-install/files/onos-cord-docker-compose.yml b/roles/onos-cord-install/files/onos-cord-docker-compose.yml
index 2e6bdf4..6a7a1d3 100644
--- a/roles/onos-cord-install/files/onos-cord-docker-compose.yml
+++ b/roles/onos-cord-install/files/onos-cord-docker-compose.yml
@@ -15,3 +15,4 @@
        - "9877:9876"
       volumes:
       - ./node_key:/root/node_key:ro
+      restart: unless-stopped
diff --git a/roles/onos-fabric-install/templates/docker-compose.yml.j2 b/roles/onos-fabric-install/templates/docker-compose.yml.j2
index b98230f..1d48ca8 100644
--- a/roles/onos-fabric-install/templates/docker-compose.yml.j2
+++ b/roles/onos-fabric-install/templates/docker-compose.yml.j2
@@ -11,4 +11,5 @@
        - "8181:8181" # ONOS UI/API
        - "9876:9876" # ONOS Clustering
        - "2620:2620" # vRouter
+      restart: unless-stopped