diff --git a/templates/zerotier/0/docker-compose.yml b/templates/zerotier/0/docker-compose.yml
index c665e4d..61d92f1 100644
--- a/templates/zerotier/0/docker-compose.yml
+++ b/templates/zerotier/0/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     labels:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
     network_mode: "host"
-    restart: "no"
+    restart: on-failure
     volumes:
       - ${STORAGE_VOLUME}:/var/lib/zerotier-one:nocopy
 volumes_driver: rancher-nfs
\ No newline at end of file
diff --git a/templates/zerotier/0/rancher-compose.yml b/templates/zerotier/0/rancher-compose.yml
index 70a0410..80a768b 100644
--- a/templates/zerotier/0/rancher-compose.yml
+++ b/templates/zerotier/0/rancher-compose.yml
@@ -18,13 +18,6 @@ catalog:
       default: "0000"
       required: true
       type: string
-    - variable: "NAME"
-      label: "Container Name"
-      description: |
-        (Optional) Enter a name for the container, otherwise one will be randomly generated.
-      default: "ZeroTier"
-      required: false
-      type: string
     - variable: "STORAGE_VOLUME"
       label: "Persistent Storage Volume"
       description: |