diff --git a/templates/zerotier/0/docker-compose.yml b/templates/zerotier/0/docker-compose.yml
index 3bfa27a..a6a9b94 100644
--- a/templates/zerotier/0/docker-compose.yml
+++ b/templates/zerotier/0/docker-compose.yml
@@ -1,12 +1,13 @@
 version: "3"
 services:
   zerotier:
-    container_name: #(Optional) Custom name for the container, rather than a generated default name.
+    container_name: ${NAME} #(Optional) Custom name for the container, rather than a generated default name.
     image: zerotier/zerotier-containerized:latest
     cap_add:
       - NET_ADMIN
       - SYS_ADMIN
-    command: -d
+    command:
+      - -d
     devices:
       - "/dev/net/tun"
     network_mode:
diff --git a/templates/zerotier/0/rancher-compose.yml b/templates/zerotier/0/rancher-compose.yml
index d36d45b..99324cb 100644
--- a/templates/zerotier/0/rancher-compose.yml
+++ b/templates/zerotier/0/rancher-compose.yml
@@ -2,8 +2,15 @@ version: '2'
 catalog:
   name: "ZeroTier-Containerized" # Name of the versioned template of the Catalog Entry
   version: "latest" # Version of the versioned template of the Catalog Entry
-  description: "Will fill in description later." # Description of the versioned template of the Catalog Entry
+  description: ZeroTier-Containerized instance for virtual networking # Description of the versioned template of the Catalog Entry
   questions: #Used to request user input for configuration options
+    - 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: "CONFIG_STORAGE" # A single word that is used to pair the question and answer.
       label: "Persistent Config Path" # The "question" to be answered.
       description: | # The description of the question to show the user how to answer the question.