diff --git a/gns3server/appliances/cisco-asav.gns3a b/gns3server/appliances/cisco-asav.gns3a
index 6bf08628..a1beb05c 100644
--- a/gns3server/appliances/cisco-asav.gns3a
+++ b/gns3server/appliances/cisco-asav.gns3a
@@ -25,6 +25,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "asav9-12-2-9.qcow2",
+            "version": "9.12.2-9",
+            "md5sum": "d90ada2efeb19801e654b6059de61845",
+            "filesize": 198115328,
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.12.2%20Interim"
+        },
         {
             "filename": "asav9-12-2.qcow2",
             "version": "9.12.2",
@@ -35,95 +42,66 @@
         {
             "filename": "asav992.qcow2",
             "version": "9.9.2",
-            "md5sum": "6fd1337c5334844484b371d1033c038a",
+            "md5sum": "0cba453dbf70313d8d63a00700618f52",
             "filesize": 204865536,
             "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.9.2"
         },
         {
-            "filename": "asav983.qcow2",
-            "version": "9.8.3",
-            "md5sum": "f9cf40b2d555a1bea6d36bc83f06ea33",
-            "filesize": 199491584,
-            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.8.3"
+            "filename": "asav984-15.qcow2",
+            "version": "9.8.4-15",
+            "md5sum": "3c6742a9617767d8eae14b3ad4d33981",
+            "filesize": 200015872,
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.8.4%20Interim"
         },
         {
-            "filename": "asav981-5.qcow2",
-            "version": "9.8.1-5",
-            "md5sum": "77b3ca856dd2df476bcda34e218425ca",
-            "filesize": 193069056,
-            "download_url": "https://software.cisco.com/download/type.html?mdfid=286119613&flowid=50242"
+            "filename": "asav983-8.qcow2",
+            "version": "9.8.3-8",
+            "md5sum": "54dbf135c545dbae40c8be61ff3863a4",
+            "filesize": 199426048,
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.8.3"
         },
         {
             "filename": "asav981.qcow2",
             "version": "9.8.1",
             "md5sum": "8d3612fe22b1a7dec118010e17e29411",
             "filesize": 193069056,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=286119613&flowid=50242&softwareid=280775065&release=9.8.1&relind=AVAILABLE&rellifecycle=&reltype=latest"
-        },
-        {
-            "filename": "asav971-8.qcow2",
-            "version": "9.7.1-8",
-            "md5sum": "b2486c8d0f6fda149ce877208b816818",
-            "filesize": 197066752,
-            "download_url": "https://software.cisco.com/download/type.html?mdfid=286119613&flowid=50242"
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.8.1"
         },
         {
             "filename": "asav971-4.qcow2",
             "version": "9.7.1-4",
             "md5sum": "f9a671d1ceaf983f7241f19df15e787f",
             "filesize": 197066752,
-            "download_url": "https://software.cisco.com/download/type.html?mdfid=286119613&flowid=50242"
-        },
-        {
-            "filename": "asav971-2.qcow2",
-            "version": "9.7.1-2",
-            "md5sum": "ff036b23f5dbb2bcf1e6530476cc1989",
-            "filesize": 199753728,
-            "download_url": "https://software.cisco.com/download/type.html?mdfid=286119613&flowid=50242"
-        },
-        {
-            "filename": "asav971.qcow2",
-            "version": "9.7.1",
-            "md5sum": "07eef9b8ca489a8ad37448fadf45a673",
-            "filesize": 198443008,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
-        },
-        {
-            "filename": "asav963-8.qcow2",
-            "version": "9.6.3-8",
-            "md5sum": "8b8a45b94a302dae8076e7ec90c7d4c2",
-            "filesize": 168427520,
-            "download_url": "https://software.cisco.com/download/type.html?mdfid=286119613&flowid=50242"
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.7.1"
         },
         {
             "filename": "asav963-1.qcow2",
             "version": "9.6.3-1",
             "md5sum": "d6a5c8d7bff5e69c5987ca664a52dbd8",
             "filesize": 172294144,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=286119613&flowid=50242&softwareid=280775065&release=9.6.3&relind=AVAILABLE&rellifecycle=&reltype=latest"
-        },
-        {
-            "filename": "asav962-13.qcow2",
-            "version": "9.6.2-13",
-            "md5sum": "2a6bec030fcaef31b611051180cc142c",
-            "filesize": 177668096,
-            "download_url": "https://software.cisco.com/download/type.html?mdfid=286119613&flowid=50242"
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.6.3"
         },
         {
             "filename": "asav962.qcow2",
             "version": "9.6.2",
-            "md5sum": "dfb8110ce38da4588e994865d5a9656a",
+            "md5sum": "a4c892afe610776dde8a176f1049ae96",
             "filesize": 177274880,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.6.2"
         }
     ],
     "versions": [
+        {
+            "name": "9.12.2-9",
+            "images": {
+                "hda_disk_image": "asav9-12-2-9.qcow2"
+            }
+        },
         {
             "name": "9.12.2",
             "images": {
                 "hda_disk_image": "asav9-12-2.qcow2"
             }
-        },   
+        },
         {
             "name": "9.9.2",
             "images": {
@@ -131,15 +109,15 @@
             }
         },
         {
-            "name": "9.8.3",
+            "name": "9.8.4-15",
             "images": {
-                "hda_disk_image": "asav983.qcow2"
+                "hda_disk_image": "asav984-15.qcow2"
             }
         },
         {
-            "name": "9.8.1-5",
+            "name": "9.8.3-8",
             "images": {
-                "hda_disk_image": "asav981-5.qcow2"
+                "hda_disk_image": "asav983-8.qcow2"
             }
         },
         {
@@ -148,48 +126,18 @@
                 "hda_disk_image": "asav981.qcow2"
             }
         },
-        {
-            "name": "9.7.1-8",
-            "images": {
-                "hda_disk_image": "asav971-8.qcow2"
-            }
-        },
         {
             "name": "9.7.1-4",
             "images": {
                 "hda_disk_image": "asav971-4.qcow2"
             }
         },
-        {
-            "name": "9.7.1-2",
-            "images": {
-                "hda_disk_image": "asav971-2.qcow2"
-            }
-        },
-        {
-            "name": "9.7.1",
-            "images": {
-                "hda_disk_image": "asav971.qcow2"
-            }
-        },
-        {
-            "name": "9.6.3-8",
-            "images": {
-                "hda_disk_image": "asav963-8.qcow2"
-            }
-        },
         {
             "name": "9.6.3-1",
             "images": {
                 "hda_disk_image": "asav963-1.qcow2"
             }
         },
-        {
-            "name": "9.6.2-13",
-            "images": {
-                "hda_disk_image": "asav962-13.qcow2"
-            }
-        },
         {
             "name": "9.6.2",
             "images": {
@@ -198,4 +146,3 @@
         }
     ]
 }
-
diff --git a/gns3server/appliances/danos.gns3a b/gns3server/appliances/danos.gns3a
new file mode 100644
index 00000000..e4843331
--- /dev/null
+++ b/gns3server/appliances/danos.gns3a
@@ -0,0 +1,55 @@
+{
+    "name": "DANOS",
+    "category": "router",
+    "description": "The Disaggregated Network Operating System (DANOS) project enables community collaboration across network hardware, forwarding, and operating system layers. DANOS is initially based on AT&T’s “dNOS” software framework of a more open, cost-effective and flexible alternative to traditional networking equipment. As part of The Linux Foundation, it now incorporates contributions from complementary open source communities in building a standardized distributed Network Operating System (NOS) to speed the adoption and use of white boxes in a service provider’s infrastructure.",
+    "vendor_name": "Linux",
+    "vendor_url": "https://www.danosproject.org/",
+    "documentation_url": "https://danosproject.atlassian.net/wiki/spaces/DAN/pages/753667/DANOS+1908",
+    "product_name": "DANOS",
+    "product_url": "https://www.danosproject.org/",
+    "registry_version": 4,
+    "status": "stable",
+    "symbol": ":/symbols/affinity/circle/gray/router_cloud.svg",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Default username/password is vyatta/vyatta.  DANOS will live boot and drop into a shell. DANOS can then be installed inside the VM by typing install image.  Defaults to using a telnet console, but the vnc console can provide additional help if it's not booting.",
+    "port_name_format": "dp0p{1}s{0}",
+    "qemu": {
+        "cpus": 2,
+        "adapter_type": "virtio-net-pci",
+        "adapters": 3,
+        "ram": 4096,
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "dc",
+        "kvm": "allow",
+        "options": "-cpu host"
+    },
+    "images": [
+        {
+            "filename": "danos-1908-amd64-vrouter.iso",
+            "version": "1908",
+            "md5sum": "e850b6aa2859de1075c11b9149fa50f4",
+            "filesize": 409993216,
+            "download_url": "https://danosproject.atlassian.net/wiki/spaces/DAN/pages/753667/DANOS+1908",
+            "direct_download_url": "http://repos.danosproject.org.s3-website-us-west-1.amazonaws.com/images/danos-1908-amd64-vrouter.iso"
+        },
+        {
+            "filename": "empty8G.qcow2",
+            "version": "1.0",
+            "md5sum": "f1d2c25b6990f99bd05b433ab603bdb4",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty8G.qcow2/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "danos-1908-amd64-vrouter",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "danos-1908-amd64-vrouter.iso"
+            }
+        }
+    ]
+}
diff --git a/gns3server/appliances/exos.gns3a b/gns3server/appliances/exos.gns3a
index c93841da..afa2fef1 100644
--- a/gns3server/appliances/exos.gns3a
+++ b/gns3server/appliances/exos.gns3a
@@ -11,7 +11,7 @@
     "maintainer": "Extreme Networks",
     "maintainer_email": "GitHubscripting@extremenetworks.com",
     "usage": "Boot up and login is admin with no password.",
-    "symbol": "ethernet_switch.svg",
+    "symbol": ":/symbols/multilayer_switch.svg",
     "first_port_name": "Mgmt",
     "port_name_format": "Port{port1}",
     "qemu": {
@@ -28,6 +28,20 @@
     
     "images": [
 
+		{
+            "filename": "EXOS-VM_v30.4.1.2.qcow2",
+            "version": "30.4.1.2",
+            "md5sum": "133fa38bf80daec9e389729c96e692c0",
+            "filesize": 454557696,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.4.1.2.qcow2"
+        },
+		{
+            "filename": "EXOS-VM_v30.3.1.6.qcow2",
+            "version": "30.3.1.6",
+            "md5sum": "edb86b406efe99434c6d5366d9bfa97f",
+            "filesize": 448266240,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.3.1.6.qcow2"
+        },
 		{
             "filename": "EXOS-VM_v30.2.1.8.qcow2",
             "version": "30.2.1.8",
@@ -62,6 +76,18 @@
     "versions": [
 
         {
+            "name": "30.4.1.2",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v30.4.1.2.qcow2"
+            }
+        },
+		{
+            "name": "30.3.1.6",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v30.3.1.6.qcow2"
+            }
+        },
+		{
             "name": "30.2.1.8",
             "images": {
                 "hda_disk_image": "EXOS-VM_v30.2.1.8.qcow2"
@@ -87,4 +113,3 @@
         }
     ]
 }
-
diff --git a/gns3server/appliances/extreme-networks-voss.gns3a b/gns3server/appliances/extreme-networks-voss.gns3a
index 077883be..c5a2f3ea 100644
--- a/gns3server/appliances/extreme-networks-voss.gns3a
+++ b/gns3server/appliances/extreme-networks-voss.gns3a
@@ -18,10 +18,11 @@
     {
         "adapter_type": "e1000",
         "adapters": 9,
-        "ram": 1024,
+        "ram": 2048,
         "hda_disk_interface": "ide",
-        "arch": "i386",
+        "arch": "x86_64",
         "console_type": "telnet",
+        "boot_priority": "dc",
         "kvm": "allow",
         "options": "-nographic"
     },
@@ -29,6 +30,13 @@
     "images":
     [
         {
+            "filename": "VOSSGNS3.8.1.0.0.qcow2",
+            "version": "v8.1.0.0",
+            "md5sum": "6b46fd54999a4cd2369440809ccc5099",
+            "filesize": 311820288,
+			"direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.1.0.0.qcow2"
+        },
+		{
             "filename": "VOSSGNS3.7.1.0.0.qcow2",
             "version": "voss_7.1.0.0",
             "md5sum": "7bb2974efe1a1ab857debd9fa894dbe7",
@@ -47,6 +55,13 @@
     "versions":
     [
         {
+            "name": "v8.1.0.0",
+            "images":
+            {
+                "hda_disk_image": "VOSSGNS3.8.1.0.0.qcow2"
+            }
+        },
+		{
             "name": "7.1.0.0",
             "images":
             {
diff --git a/gns3server/appliances/freebsd.gns3a b/gns3server/appliances/freebsd.gns3a
index 27671495..5d6d2bd5 100644
--- a/gns3server/appliances/freebsd.gns3a
+++ b/gns3server/appliances/freebsd.gns3a
@@ -40,6 +40,15 @@
             "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.0-RELEASE/amd64/Latest/FreeBSD-12.0-RELEASE-amd64.qcow2.xz",
             "compression": "xz"
         },
+        {
+            "filename": "FreeBSD-11.3-RELEASE-amd64.qcow2",
+            "version": "11.3",
+            "md5sum": "cdb35f676571b91584ff88502c48d399",
+            "filesize": 1698037760,
+            "download_url": "https://www.freebsd.org/where.html",
+            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/11.3-RELEASE/amd64/Latest/FreeBSD-11.3-RELEASE-amd64.qcow2.xz",
+            "compression": "xz"
+        },
         {
             "filename": "FreeBSD-11.2-RELEASE-amd64.qcow2",
             "version": "11.2",
@@ -99,6 +108,12 @@
                 "hda_disk_image": "FreeBSD-12.0-RELEASE-amd64.qcow2"
             }
         },
+        {
+            "name": "11.3",
+            "images": {
+                "hda_disk_image": "FreeBSD-11.3-RELEASE-amd64.qcow2"
+            }
+        },
         {
             "name": "11.2",
             "images": {
diff --git a/gns3server/appliances/freenas.gns3a b/gns3server/appliances/freenas.gns3a
index 114f3319..c7c8ca03 100644
--- a/gns3server/appliances/freenas.gns3a
+++ b/gns3server/appliances/freenas.gns3a
@@ -24,6 +24,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FreeNAS-11.2-U6.iso",
+            "version": "11.2 U6",
+            "md5sum": "3957086acdf5e0459a7da15af781e0f9",
+            "filesize": 602275840,
+            "download_url": "http://www.freenas.org/download/",
+            "direct_download_url": "https://download.freenas.org/11.2/STABLE/U6/x64/FreeNAS-11.2-U6.iso"
+        },
         {
             "filename": "FreeNAS-11.2-U3.iso",
             "version": "11.2 U3",
@@ -98,6 +106,14 @@
         }
     ],
     "versions": [
+        {
+            "name": "11.2 U6",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FreeNAS-11.2-U6.iso"
+            }
+        },
         {
             "name": "11.2 U3",
             "images": {
diff --git a/gns3server/appliances/frr.gns3a b/gns3server/appliances/frr.gns3a
index 476556e6..24438c55 100644
--- a/gns3server/appliances/frr.gns3a
+++ b/gns3server/appliances/frr.gns3a
@@ -9,7 +9,7 @@
     "status": "stable",
     "maintainer": "Andras Dosztal",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Credentials: frr / frr\nIf you exit from the router CLI, you can get back by typing 'vtysh' to the console.",
+    "usage": "Credentials: frradmin / frr\nIf you exit from the router CLI, you can get back by typing 'vtysh' to the console.",
     "port_name_format": "ens{port3}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
@@ -22,50 +22,20 @@
     },
     "images": [
         {
-            "filename": "frr7.0-vm0.3.qcow2",
-            "version": "FRR7.0 - VM0.3",
-            "md5sum": "5fa8ce0ee74215f4c4a8c61778ee0b10",
-            "filesize": 2044657664,
+            "filename": "frr7.1-vm0.4.qcow2",
+            "version": "7.1 - VM0.4",
+            "md5sum": "08390f257203126e5edffb9710e47974",
+            "filesize": 2051801088,
             "download_url": "https://sourceforge.net/projects/frr/files/",
-            "direct_download_url": "https://sourceforge.net/projects/frr/files/FRR7.0-VM0.3.qcow2.bz2/download",
-            "compression": "bzip2"
-        },
-        {
-            "filename": "frr6.0-vm0.2.qcow2",
-            "version": "FRR6.0 - VM0.2",
-            "md5sum": "bf5aebd98352716bfabb119abb2ba19a",
-            "filesize": 1762066432,
-            "download_url": "https://sourceforge.net/projects/frr/files/",
-            "direct_download_url": "https://sourceforge.net/projects/frr/files/frr6.0-vm0.2.qcow2.bz2/download",
-            "compression": "bzip2"
-        },
-        {
-            "filename": "frr4.0-vm0.1.qcow2",
-            "version": "FRR4.0 - VM0.1",
-            "md5sum": "e1dc58cbb2b71c58051538c07d412493",
-            "filesize": 1670643712,
-            "download_url": "https://sourceforge.net/projects/frr/files/",
-            "direct_download_url": "https://sourceforge.net/projects/frr/files/frr4.0-vm0.1.qcow2.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/frr/files/frr7.1-vm0.4.qcow2.bz2/download",
             "compression": "bzip2"
         }
     ],
     "versions": [
         {
-            "name": "FRR7.0 - VM0.3",
+            "name": "7.1 - VM0.4",
             "images": {
-                "hda_disk_image": "frr7.0-vm0.3.qcow2"
-            }
-        },
-        {
-            "name": "FRR6.0 - VM0.2",
-            "images": {
-                "hda_disk_image": "frr6.0-vm0.2.qcow2"
-            }
-        },
-        {
-            "name": "FRR4.0 - VM0.1",
-            "images": {
-                "hda_disk_image": "frr4.0-vm0.1.qcow2"
+                "hda_disk_image": "frr7.1-vm0.4.qcow2"
             }
         }
     ]
diff --git a/gns3server/appliances/op5-monitor.gns3a b/gns3server/appliances/op5-monitor.gns3a
index ee73a787..4a6b61d7 100644
--- a/gns3server/appliances/op5-monitor.gns3a
+++ b/gns3server/appliances/op5-monitor.gns3a
@@ -11,7 +11,7 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Interface eth0 is set to DHCP. Default credentials:\n- CLI: root / monitor\n- Web access: admin / monitor\n- Logserver Extension: admin / admin",
+    "usage": "Newer versions come with OVA files only, you need to extract it to get the VMDK disk file.\nInterface eth0 is set to DHCP. Default credentials:\n- CLI: root / monitor\n- Web access: admin / monitor\n- Logserver Extension: admin / admin",
     "port_name_format": "eth{0}",
     "symbol": "mgmt_station.svg",
     "qemu": {
@@ -25,6 +25,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "op5-monitor-8.0.9.centos7-x64-disk1.vmdk",
+            "version": "8.0.9",
+            "md5sum": "081a9514f9ed5e0c648ded26e7761e6e",
+            "filesize": 1219249152,
+            "download_url": "https://www.op5.com/download/"
+        },
         {
             "filename": "op5-Monitor-Virtual-Appliance-7.4.10.x86_64-disk1.vmdk",
             "version": "7.4.10",
@@ -41,6 +48,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "8.0.9",
+            "images": {
+                "hda_disk_image": "op5-monitor-8.0.9.centos7-x64-disk1.vmdk"
+            }
+        },
         {
             "name": "7.4.10",
             "images": {
diff --git a/gns3server/appliances/openwrt.gns3a b/gns3server/appliances/openwrt.gns3a
index 84a1bdbc..de7a750d 100644
--- a/gns3server/appliances/openwrt.gns3a
+++ b/gns3server/appliances/openwrt.gns3a
@@ -21,6 +21,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "openwrt-18.06.5-x86-64-combined-ext4.img",
+            "version": "18.06.5",
+            "md5sum": "6fce24c15f0bc75af16c133b839aea30",
+            "filesize": 285736960,
+            "download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/openwrt-18.06.5-x86-64-combined-ext4.img.gz",
+            "compression": "gzip"
+        },
         {
             "filename": "openwrt-18.06.2-x86-64-combined-ext4.img",
             "version": "18.06.2",
@@ -59,6 +68,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "18.06.5",
+            "images": {
+                "hda_disk_image": "openwrt-18.06.5-x86-64-combined-ext4.img"
+            }
+        },
         {
             "name": "openwrt 18.06.2",
             "images": {
diff --git a/gns3server/appliances/viptela-edge-genericx86-64.gns3a b/gns3server/appliances/viptela-edge-genericx86-64.gns3a
new file mode 100644
index 00000000..9bd998bc
--- /dev/null
+++ b/gns3server/appliances/viptela-edge-genericx86-64.gns3a
@@ -0,0 +1,58 @@
+{
+    "name": "vEdgeCloud",
+    "category": "router",
+    "description": "vEdgeCloud",
+    "vendor_name": "Cisco",
+    "vendor_url": "https://www.cisco.com",
+    "documentation_url": "http://www.cisco.com/",
+    "product_name": "VIPtela Edge",
+    "product_url": "http://www.cisco.com/",
+    "registry_version": 3,
+    "status": "experimental",
+    "maintainer": "Laurent LEVIER",
+    "maintainer_email": "laurent.levier@orange.com",
+    "usage": "Initial username is admin, password is admin as well.",
+    "first_port_name": "Management0/0",
+    "port_name_format": "Ge0/{0}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 5,
+        "ram": 2048,
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "hda_disk_interface": "virtio",
+        "kvm": "require",
+        "options": "-cpu host"
+    },
+    "images": [
+        {
+            "filename": "viptela-edge-genericx86-64.qcow2",
+            "version": "18.3.7",
+            "md5sum": "67f85649fde80dc7d28cc6dea7bdaf7a",
+            "filesize": 249495552,
+            "download_url": "http://www.cisco.com/"
+        },
+        {
+            "filename": "viptela-edge-19.2.0-genericx86-64.qcow2",
+            "version": "19.2.0",
+            "md5sum": "4aa487101d4cdc390f53a6e8b6f45ca7",
+            "filesize": 328400896,
+            "download_url": "http://www.cisco.com/"
+        }
+				
+    ],
+    "versions": [
+        {
+            "name": "19.2.0",
+            "images": {
+                "hda_disk_image": "viptela-edge-19.2.0-genericx86-64.qcow2"
+            }
+        },
+        {
+            "name": "18.3.7",
+            "images": {
+                "hda_disk_image": "viptela-edge-genericx86-64.qcow2"
+            }
+        }
+    ]
+}
diff --git a/gns3server/appliances/viptela-smart-genericx86-64.gns3a b/gns3server/appliances/viptela-smart-genericx86-64.gns3a
new file mode 100644
index 00000000..6c175bf0
--- /dev/null
+++ b/gns3server/appliances/viptela-smart-genericx86-64.gns3a
@@ -0,0 +1,54 @@
+{
+    "name": "vSmart",
+    "category": "router",
+    "description": "vSmart",
+    "vendor_name": "Cisco",
+    "vendor_url": "https://www.cisco.com",
+    "documentation_url": "http://www.cisco.com/",
+    "product_name": "VIPtela Smart",
+    "product_url": "http://www.cisco.com/",
+    "registry_version": 3,
+    "status": "experimental",
+    "maintainer": "Laurent LEVIER",
+    "maintainer_email": "laurent.levier@orange.com",
+    "usage": "Initial username is admin, password is admin as well.",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 6,
+        "ram": 4096,
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require",
+        "options": "-smp 2,maxcpus=2 -cpu host"
+    },
+    "images": [
+        {
+            "filename": "viptela-smart-19.2.0-genericx86-64.qcow2",
+            "version": "19.2.0",
+            "md5sum": "94854f81465d62f58fed591e8f581661",
+            "filesize": 328400896,
+            "download_url": "http://www.cisco.com/"
+        },
+        {
+            "filename": "viptela-smart-genericx86-64-disk1.vmdk",
+            "version": "18.3.7",
+            "md5sum": "ab9b06c212319336810a4b336ec3dd96",
+            "filesize": 246990848,
+            "download_url": "http://www.cisco.com/"
+        }
+    ],
+    "versions": [
+        {
+            "name": "18.3.7",
+            "images": {
+                "hda_disk_image": "viptela-smart-genericx86-64-disk1.vmdk"
+            }
+        },
+        {
+            "name": "19.2.0",
+            "images": {
+                "hda_disk_image": "viptela-smart-19.2.0-genericx86-64.qcow2"
+            }
+        }
+    ]
+}
diff --git a/gns3server/appliances/viptela-vmanage-genericx86-64.gns3a b/gns3server/appliances/viptela-vmanage-genericx86-64.gns3a
new file mode 100644
index 00000000..50fb6e18
--- /dev/null
+++ b/gns3server/appliances/viptela-vmanage-genericx86-64.gns3a
@@ -0,0 +1,66 @@
+{
+    "name": "vManage",
+    "category": "router",
+    "description": "vManage",
+    "vendor_name": "Cisco",
+    "vendor_url": "https://www.cisco.com",
+    "documentation_url": "http://www.cisco.com/",
+    "product_name": "VIPtela Manage",
+    "product_url": "http://www.cisco.com/",
+    "registry_version": 3,
+    "status": "experimental",
+    "maintainer": "Laurent LEVIER",
+    "maintainer_email": "laurent.levier@orange.com",
+    "usage": "Initial username is admin, password is admin as well.",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 6,
+        "ram": 32768,
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require",
+        "options": "-cpu host -smp 2,maxcpus=2"
+    },
+    "images": [
+        {
+            "filename": "viptela-vmanage-19.2.0-genericx86-64.qcow2",
+            "version": "19.2.0",
+            "md5sum": "27ef126f178c6c929a36ad2cf6ed8db7",
+            "filesize": 1185349632,
+            "download_url": "http://www.cisco.com/"
+        },
+        {
+            "filename": "viptela-vmanage-genericx86-64-disk1.vmdk",
+            "version": "18.3.7",
+            "md5sum": "2290c6467c907d9ca9c65793fe898716",
+            "filesize": 1085447680,
+            "download_url": "http://www.cisco.com/"
+        },
+        {
+            "filename": "empty30G.qcow2",
+            "version": "1.0",
+            "md5sum": "3411a599e822f2ac6be560a26405821a",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "19.2.0",
+            "images": {
+                "hda_disk_image": "viptela-vmanage-19.2.0-genericx86-64.qcow2",
+								"hdb_disk_image": "empty30G.qcow2"
+
+            }
+        },
+        {
+            "name": "18.3.7",
+            "images": {
+                "hda_disk_image": "viptela-vmanage-genericx86-64-disk1.vmdk",
+								"hdb_disk_image": "empty30G.qcow2"
+
+            }
+        }
+    ]
+}
diff --git a/gns3server/appliances/watchguard-fireboxv.gns3a b/gns3server/appliances/watchguard-fireboxv.gns3a
new file mode 100644
index 00000000..ef381e74
--- /dev/null
+++ b/gns3server/appliances/watchguard-fireboxv.gns3a
@@ -0,0 +1,44 @@
+{
+    "name": "WatchGuard",
+    "category": "firewall",
+    "description": "Organizations of all sizes are turning to virtualization to reduce costs and increase the efficiency, availability, and flexibility of their IT resources. But virtualization comes at a cost. Virtual environments are complex to manage and vulnerable to security threats. IT must be prepared. Now applications can be secured, resources can be maximized and your IT department can reap the rewards of having a single, unified management system – without a security risk in sight. WatchGuard FireboxV brings best-in-class network security to the world of virtualization. With real-time monitoring, multi-WAN support and scalable solutions to fit any-sized business, your virtual environments can be just as secure as your physical one.",
+    "vendor_name": "WatchGuard",
+    "vendor_url": "https://www.watchguard.com/",
+    "documentation_url": "https://www.watchguard.com/wgrd-products/virtual-and-cloud/fireboxv",
+    "product_name": "FireboxV",
+    "product_url": "https://www.watchguard.com/wgrd-help/documentation/xtm",
+    "registry_version": 5,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "You need to extract the OVA file with tar or 7-Zip.\n\nThere are two active interfaces: external and trusted. The trusted interface has the IP address 10.0.1.1, the WebUI listens on port 8080 (https://10.0.1.1:8080). The external interface is configured to receive an IP address through DHCP. The trusted interface is not configured to assign IP addresses with DHCP. Both the trusted and external interfaces accept management connections.\n\nCredentials: admin / readwrite",
+    "port_name_format": "{0}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 2,
+        "ram": 1024,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "spice",
+        "boot_priority": "c",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "FireboxV_12_5_2_signed-disk1.vmdk",
+            "version": "12.5.2",
+            "md5sum": "5a17b57a149f2324ed4d34563367d1c0",
+            "filesize": 191653888,
+            "download_url": "https://watchguardsupport.secure.force.com/software/SoftwareDownloads?current=true&familyId=a2R2A000001YGv4UAG",
+            "direct_download_url": "http://cdn.watchguard.com/SoftwareCenter/Files/XTM/12_5_2/FireboxV_12_5_2.ova"
+        }
+    ],
+    "versions": [
+        {
+            "name": "12.5.2",
+            "images": {
+                "hda_disk_image": "FireboxV_12_5_2_signed-disk1.vmdk"
+            }
+        }
+    ]
+}
diff --git a/gns3server/appliances/watchguard-xtmv.gns3a b/gns3server/appliances/watchguard-xtmv.gns3a
new file mode 100644
index 00000000..8dc514f2
--- /dev/null
+++ b/gns3server/appliances/watchguard-xtmv.gns3a
@@ -0,0 +1,44 @@
+{
+    "name": "WatchGuard",
+    "category": "firewall",
+    "description": "Organizations of all sizes are turning to virtualization to reduce costs and increase the efficiency, availability, and flexibility of their IT resources. But virtualization comes at a cost. Virtual environments are complex to manage and vulnerable to security threats. IT must be prepared. Now applications can be secured, resources can be maximized and your IT department can reap the rewards of having a single, unified management system – without a security risk in sight. WatchGuard XTMv brings best-in-class network security to the world of virtualization. With real-time monitoring, multi-WAN support and scalable solutions to fit any-sized business, your virtual environments can be just as secure as your physical one.",
+    "vendor_name": "WatchGuard",
+    "vendor_url": "https://www.watchguard.com/",
+    "documentation_url": "https://www.watchguard.com/wgrd-products/virtual-and-cloud/fireboxv",
+    "product_name": "XTMv",
+    "product_url": "https://www.watchguard.com/wgrd-help/documentation/xtm",
+    "registry_version": 5,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "You need to extract the OVA file with tar or 7-Zip.\n\nThere are two active interfaces: external and trusted. The trusted interface has the IP address 10.0.1.1, the WebUI listens on port 8080 (https://10.0.1.1:8080). The external interface is configured to receive an IP address through DHCP. The trusted interface is not configured to assign IP addresses with DHCP. Both the trusted and external interfaces accept management connections.\n\nCredentials: admin / readwrite",
+    "port_name_format": "{0}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 2,
+        "ram": 1024,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "spice",
+        "boot_priority": "c",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "xtmv_12_1_3_U3_signed-disk1.vmdk",
+            "version": "12.1.3 U3",
+            "md5sum": "3f9666a37544e764f48f50b8a7939190",
+            "filesize": 95944704,
+            "download_url": "https://watchguardsupport.secure.force.com/software/SoftwareDownloads?current=true&familyId=a2RF00000009OmLMAU",
+            "direct_download_url": "http://cdn.watchguard.com/SoftwareCenter/Files/XTM/12_1_3_U3/xtmv_12_1_3_U3.ova"
+        }
+    ],
+    "versions": [
+        {
+            "name": "12.1.3 U3",
+            "images": {
+                "hda_disk_image": "xtmv_12_1_3_U3_signed-disk1.vmdk"
+            }
+        }
+    ]
+}