diff --git a/scripts/Update-OvfConfiguration.yml b/scripts/Update-OvfConfiguration.yml
index a5e74a7..3b32161 100644
--- a/scripts/Update-OvfConfiguration.yml
+++ b/scripts/Update-OvfConfiguration.yml
@@ -33,42 +33,7 @@ PropertyCategories:
 #     - medium
 #     UserConfigurable: false
 
-- Name: 1) Kubernetes
-  ProductProperties:
-
-  - Key: metacluster.fqdn
-    Type: string(1..)
-    Label: Appliance FQDN*
-    Description: Respective subdomains will be available for each component (e.g. storage.example.org); this address should already be configured as a wildcard record within your DNS zone.
-    DefaultValue: meta.k8s.cluster
-    Configurations: '*'
-    UserConfigurable: true
-
-  - Key: workloadcluster.vip
-    Type: ip
-    Label: Workload-cluster Virtual IP*
-    Description: Workload-cluster control plane endpoint virtual IP
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-  - Key: ippool.startip
-    Type: ip
-    Label: Workload-cluster IP-pool start IP*
-    Description: All nodes for the workload-cluster will be provisioned within this IP pool
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-  - Key: ippool.endip
-    Type: ip
-    Label: Workload-cluster IP-pool end IP*
-    Description: All nodes for the workload-cluster will be provisioned within this IP pool
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-- Name: 2) Operating System
+- Name: 1) Meta-cluster
   ProductProperties:
 
   - Key: guestinfo.hostname
@@ -87,17 +52,6 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-  - Key: guestinfo.rootsshkey
-    Type: password(1..)
-    Label: Local root SSH public key*
-    Description: This line should start with 'ssh-rsa AAAAB3N'
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-- Name: 3) Networking
-  ProductProperties:
-
   - Key: guestinfo.ipaddress
     Type: ip
     Label: IP Address*
@@ -114,6 +68,14 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
+  - Key: metacluster.fqdn
+    Type: string(1..)
+    Label: Appliance FQDN*
+    Description: Respective subdomains will be available for each component (e.g. storage.example.org); this address should already be configured as a wildcard record within your DNS zone.
+    DefaultValue: meta.k8s.cluster
+    Configurations: '*'
+    UserConfigurable: true
+
   - Key: guestinfo.dnsserver
     Type: ip
     Label: DNS server*
@@ -138,6 +100,44 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
+- Name: 2) Workload-cluster
+  ProductProperties:
+
+  - Key: workloadcluster.vip
+    Type: ip
+    Label: Workload-cluster virtual IP*
+    Description: Workload-cluster control plane endpoint virtual IP
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
+  - Key: ippool.startip
+    Type: ip
+    Label: Workload-cluster IP-pool start IP*
+    Description: All nodes for the workload-cluster will be provisioned within this IP pool
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
+  - Key: ippool.endip
+    Type: ip
+    Label: Workload-cluster IP-pool end IP*
+    Description: All nodes for the workload-cluster will be provisioned within this IP pool
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
+- Name: 3) Common
+  ProductProperties:
+
+  - Key: guestinfo.rootsshkey
+    Type: password(1..)
+    Label: SSH public key*
+    Description: Authentication for any node (meta-cluster *and* workloadcluster); this line should start with 'ssh-rsa AAAAB3N'
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
 - Name: 4) Hypervisor
   ProductProperties: