diff --git a/templates/invoice-ninja/0/rancher-compose.yml b/templates/invoice-ninja/0/rancher-compose.yml
index 5c36fd0..66d6994 100644
--- a/templates/invoice-ninja/0/rancher-compose.yml
+++ b/templates/invoice-ninja/0/rancher-compose.yml
@@ -8,7 +8,7 @@ catalog:
       label: "Host Label Key"
       description: |
         The Label Key on the host which InvoiceNinja should be deployed
-      default: "personal.host.id"
+      default: "host.id"
       required: true
       type: string
     - variable: "HOST_LABEL_VALUE"
diff --git a/templates/zerotier/0/rancher-compose.yml b/templates/zerotier/0/rancher-compose.yml
index 4aa7aee..70a0410 100644
--- a/templates/zerotier/0/rancher-compose.yml
+++ b/templates/zerotier/0/rancher-compose.yml
@@ -4,6 +4,20 @@ catalog:
   version: "latest"
   description: ZeroTier-Containerized instance for virtual networking
   questions:
+    - variable: "HOST_LABEL_KEY"
+      label: "Host Label Key"
+      description: |
+        The Label Key on the host which ZeroTier should be deployed
+      default: "host.id"
+      required: true
+      type: string
+    - variable: "HOST_LABEL_VALUE"
+      label: "Host Label Value"
+      description: |
+        The Label Value on the host which ZeroTier should be deployed
+      default: "0000"
+      required: true
+      type: string
     - variable: "NAME"
       label: "Container Name"
       description: |
@@ -18,19 +32,5 @@ catalog:
       default: "ZeroTier"
       required: true
       type: string
-    - variable: "HOST_LABEL_KEY"
-      label: "Host Label Key"
-      description: |
-        The Label Key on the host which ZeroTier should be deployed
-      default: "personal.host.id"
-      required: true
-      type: string
-    - variable: "HOST_LABEL_VALUE"
-      label: "Host Label Value"
-      description: |
-        The Label Value on the host which ZeroTier should be deployed
-      default: "0000"
-      required: true
-      type: string
 zerotier:
   scale: 1
\ No newline at end of file