diff --git a/create-arista-veos-image/dynamic-subtype-vEOS.json b/create-arista-veos-image/dynamic-subtype-vEOS.json
index d277bbd9884533b1ff155171890c379028eed31f..3173fe6d251dbe915a32756b0d15bea14015c016 100644
--- a/create-arista-veos-image/dynamic-subtype-vEOS.json
+++ b/create-arista-veos-image/dynamic-subtype-vEOS.json
@@ -1,22 +1,20 @@
 {
-  "dynamic-subtypes": [
-    {
-      "plugin_name": "vEOS", 
-      "cli_serial": 1, 
-      "plugin_desc": "Arista vEOS", 
-      "cli_protocol": "ssh", 
-      "hw_ram": 1024, 
-      "hw_vm_extra": "", 
-      "interface_wrap": 7, 
-      "baseline_image": "vEOS", 
-      "hw_disk_bus": "ide", 
-      "interface_pattern": "Ethernet{0}", 
-      "config_file": "/veos_config.txt", 
-      "baseline_flavor": "vEOS.small", 
-      "plugin_base": "IOSvL2", 
-      "vnc_available": true, 
-      "interface_management": "Management1", 
-      "interface_range": 7
-    }
-  ]
+    "plugin_name": "vEOS", 
+    "cli_serial": 1, 
+    "plugin_desc": "Arista vEOS", 
+    "baseline_image": "vEOS", 
+    "hw_ram": 1024, 
+    "hw_vm_extra": "", 
+    "interface_wrap": 7, 
+    "config_disk_type": "disk", 
+    "interface_pattern": "Ethernet{0}", 
+    "gui_visible": true, 
+    "config_file": "/veos_config.txt", 
+    "interface_first": 1, 
+    "gui_icon": "iosvl2", 
+    "plugin_base": "generic", 
+    "vnc_available": false, 
+    "interface_management": "Management1", 
+    "interface_range": 7, 
+    "baseline_flavor": "vEOS.small"
 }
\ No newline at end of file
diff --git a/create-arista-veos-image/minimal-config-vEOS.txt b/create-arista-veos-image/minimal-config-vEOS.txt
index f2d1b38f858b3224cc172bb4a8af2abd9faeadc8..059523850e7b2c9d006e1f38473625e0b7c7d62c 100644
--- a/create-arista-veos-image/minimal-config-vEOS.txt
+++ b/create-arista-veos-image/minimal-config-vEOS.txt
@@ -10,10 +10,8 @@ spanning-tree mode mstp
 !
 no aaa root
 !
-username admin role network-admin secret 5
-$1$93LlZesx$MSqS1D/8NGTSY724FGx1K0
-username cisco role network-admin secret 5
-$1$rQS0W9wP$ZUzVG2XoGCCZCJopFp1aV/
+username admin role network-admin secret 5 $1$93LlZesx$MSqS1D/8NGTSY724FGx1K0
+username cisco role network-admin secret 5 $1$rQS0W9wP$ZUzVG2XoGCCZCJopFp1aV/
 !
 interface Ethernet1
 !