diff --git a/gns3server/appliances/centos7.gns3a b/gns3server/appliances/centos7.gns3a
index 6761fe70..8c80ac89 100644
--- a/gns3server/appliances/centos7.gns3a
+++ b/gns3server/appliances/centos7.gns3a
@@ -9,6 +9,7 @@
     "product_url": "https://www.centos.org/download/",
     "registry_version": 5,
     "status": "stable",
+    "availability": "free",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Username: osboxes.org\nPassword: osboxes.org",
diff --git a/gns3server/appliances/checkpoint-gaia.gns3a b/gns3server/appliances/checkpoint-gaia.gns3a
index ddf8e58d..ad219fe8 100644
--- a/gns3server/appliances/checkpoint-gaia.gns3a
+++ b/gns3server/appliances/checkpoint-gaia.gns3a
@@ -14,7 +14,8 @@
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 8,
-        "ram": 2048,
+        "cpus": 2,
+        "ram": 4096,
         "arch": "x86_64",
         "console_type": "telnet",
         "boot_priority": "dc",
@@ -56,21 +57,21 @@
         {
             "name": "80.10",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
+                "hda_disk_image": "empty100G.qcow2",
                 "cdrom_image": "Check_Point_R80.10_T421_Gaia.iso"
             }
         },
         {
             "name": "77.30",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
+                "hda_disk_image": "empty100G.qcow2",
                 "cdrom_image": "Check_Point_R77.30_T204_Install_and_Upgrade.Gaia.iso"
             }
         },
         {
             "name": "77.20",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
+                "hda_disk_image": "empty100G.qcow2",
                 "cdrom_image": "Check_Point_R77.20_T124_Install.Gaia.iso"
             }
         }
diff --git a/gns3server/appliances/cisco-fmcv.gns3a b/gns3server/appliances/cisco-fmcv.gns3a
index 9510d6ef..4aa9bef2 100644
--- a/gns3server/appliances/cisco-fmcv.gns3a
+++ b/gns3server/appliances/cisco-fmcv.gns3a
@@ -9,6 +9,7 @@
     "product_url": "http://www.cisco.com/c/en/us/td/docs/security/firepower/quick_start/kvm/fmcv-kvm-qsg.html",
     "registry_version": 4,
     "status": "experimental",
+    "availability": "service-contract",
     "maintainer": "Community",
     "maintainer_email":"",
     "usage": "BE PATIENT\nOn first boot FMCv generates about 6GB of data. This can take 30 minutes or more. Plan on a long wait after the following line in the boot up:\n\n    usbcore: registered new interface driver usb-storage\n\nInitial IP address: 192.168.45.45.\n\nDefault username/password: admin/Admin123.",
diff --git a/gns3server/appliances/cisco-ftdv.gns3a b/gns3server/appliances/cisco-ftdv.gns3a
index 617607bb..21b806e6 100644
--- a/gns3server/appliances/cisco-ftdv.gns3a
+++ b/gns3server/appliances/cisco-ftdv.gns3a
@@ -9,6 +9,7 @@
     "product_url": "http://www.cisco.com/c/en/us/td/docs/security/firepower/quick_start/kvm/ftdv-kvm-qsg.html",
     "registry_version": 4,
     "status": "experimental",
+    "availability": "service-contract",
     "maintainer": "Community",
     "maintainer_email": "",
     "usage": "Default username/password: admin/Admin123.",
diff --git a/gns3server/appliances/cisco-ngipsv.gns3a b/gns3server/appliances/cisco-ngipsv.gns3a
index 32679f5f..cefe1a8f 100644
--- a/gns3server/appliances/cisco-ngipsv.gns3a
+++ b/gns3server/appliances/cisco-ngipsv.gns3a
@@ -9,6 +9,7 @@
     "product_url": "http://www.cisco.com/c/en/us/support/security/ngips-virtual-appliance/tsd-products-support-series-home.html",
     "registry_version": 4,
     "status": "experimental",
+    "availability": "service-contract",
     "maintainer": "Community",
     "maintainer_email": "",
     "usage": "Default username/password: admin/Admin123.",
diff --git a/gns3server/appliances/clearos.gns3a b/gns3server/appliances/clearos.gns3a
index b0be6314..25cd1876 100644
--- a/gns3server/appliances/clearos.gns3a
+++ b/gns3server/appliances/clearos.gns3a
@@ -22,6 +22,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "ClearOS-7.4-DVD-x86_64.iso",
+            "version": "7.4",
+            "md5sum": "826da592f9cd4b59f5fc996ff2d569f1",
+            "filesize": 1029701632,
+            "download_url": "https://www.clearos.com/clearfoundation/software/clearos-downloads"
+        },
         {
             "filename": "ClearOS-7.3-DVD-x86_64.iso",
             "version": "7.3",
@@ -46,6 +53,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "ClearOS-7.4-DVD-x86_64.iso"
+            }
+        },
         {
             "name": "7.3",
             "images": {
diff --git a/gns3server/appliances/coreos.gns3a b/gns3server/appliances/coreos.gns3a
index 0b4467e3..396ca39f 100644
--- a/gns3server/appliances/coreos.gns3a
+++ b/gns3server/appliances/coreos.gns3a
@@ -21,6 +21,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "coreos_production_qemu_image.1632.2.1.img",
+            "version": "1632.2.1",
+            "md5sum": "facd05ca85eb87e2dc6aefd6779f6806",
+            "filesize": 885719040,
+            "download_url": "http://stable.release.core-os.net/amd64-usr/1632.2.1/",
+            "direct_download_url": "http://stable.release.core-os.net/amd64-usr/1632.2.1/coreos_production_qemu_image.img.bz2",
+            "compression": "bzip2"
+        },
         {
             "filename": "coreos_production_qemu_image.1576.4.0.img",
             "version": "1576.4.0",
@@ -149,6 +158,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "1632.2.1",
+            "images": {
+                "hda_disk_image": "coreos_production_qemu_image.1576.4.0.img"
+            }
+        },
         {
             "name": "1576.4.0",
             "images": {
diff --git a/gns3server/appliances/cumulus-vx.gns3a b/gns3server/appliances/cumulus-vx.gns3a
index 7b8be8b7..42a3f9f3 100644
--- a/gns3server/appliances/cumulus-vx.gns3a
+++ b/gns3server/appliances/cumulus-vx.gns3a
@@ -23,6 +23,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "cumulus-linux-3.5.2-vx-amd64.qcow2",
+            "version": "3.5.2",
+            "md5sum": "87d1d8b297e5ebd77924669dfb7e4c9f",
+            "filesize": 996605952,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/cumulus-linux-3.5.0-vx-amd64.qcow2"
+        },
         {
             "filename": "cumulus-linux-3.5.0-vx-amd64.qcow2",
             "version": "3.5.0",
@@ -133,6 +141,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "3.5.2",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.5.2-vx-amd64.qcow2"
+            }
+        },
         {
             "name": "3.5.0",
             "images": {
diff --git a/gns3server/appliances/f5-bigip.gns3a b/gns3server/appliances/f5-bigip.gns3a
index 32db9a4f..863e1944 100644
--- a/gns3server/appliances/f5-bigip.gns3a
+++ b/gns3server/appliances/f5-bigip.gns3a
@@ -27,6 +27,13 @@
         "options": "-smp 2 -cpu host"
     },
     "images": [
+        {
+            "filename": "BIGIP-13.1.0.2.0.0.6.qcow2",
+            "version": "13.1.0 HF2",
+            "md5sum": "d29eb861d8906fc36f88d9861a0055f4",
+            "filesize": 4363649024,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v13.x/13.1.0/english/13.1.0.2_virtual-edition/&sw=BIG-IP&pro=big-ip_v13.x&ver=13.1.0&container=13.1.0.2_Virtual-Edition&file=BIGIP-13.1.0.2.0.0.6.ALL.qcow2.zip"
+        },
         {
             "filename": "BIGIP-13.1.0.1.0.0.8.qcow2",
             "version": "13.1.0 HF1",
@@ -114,6 +121,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "13.1.0 HF2",
+            "images": {
+                "hda_disk_image": "BIGIP-13.1.0.2.0.0.6.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
         {
             "name": "13.1.0 HF1",
             "images": {
diff --git a/gns3server/appliances/freenas.gns3a b/gns3server/appliances/freenas.gns3a
index ad1af95b..e92a05ee 100644
--- a/gns3server/appliances/freenas.gns3a
+++ b/gns3server/appliances/freenas.gns3a
@@ -24,6 +24,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FreeNAS-11.1-U1.iso",
+            "version": "11.1 U1",
+            "md5sum": "ccbd9990a5878d35c6bc0cc6eea34b16",
+            "filesize": 626601984,
+            "download_url": "http://www.freenas.org/download/",
+            "direct_download_url": "http://download.freenas.org/11/11.1-RELEASE/x64/FreeNAS-11.1-RELEASE.iso"
+        },
         {
             "filename": "FreeNAS-11.1-RELEASE.iso",
             "version": "11.1",
@@ -34,7 +42,7 @@
         },
         {
             "filename": "FreeNAS-11.0-U4.iso",
-            "version": "11.0-U4",
+            "version": "11.0 U4",
             "md5sum": "4c210f1a6510d1fa95257d81ef569ff8",
             "filesize": 567312384,
             "download_url": "http://www.freenas.org/download/",
@@ -42,7 +50,7 @@
         },
         {
             "filename": "FreeNAS-9.10.1-U4.iso",
-            "version": "9.10",
+            "version": "9.10 U4",
             "md5sum": "b4fb14513dcbb4eb4c5596c5911ca9cc",
             "filesize": 533098496,
             "download_url": "http://www.freenas.org/download/",
@@ -58,6 +66,14 @@
         }
     ],
     "versions": [
+        {
+            "name": "11.1 U1",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FreeNAS-11.1-U1.iso"
+            }
+        },
         {
             "name": "11.1",
             "images": {
@@ -67,7 +83,7 @@
             }
         },
         {
-            "name": "11.0",
+            "name": "11.0 U4",
             "images": {
                 "hda_disk_image": "empty30G.qcow2",
                 "hdb_disk_image": "empty30G.qcow2",
@@ -75,7 +91,7 @@
             }
         },
         {
-            "name": "9.10",
+            "name": "9.10 U4",
             "images": {
                 "hda_disk_image": "empty30G.qcow2",
                 "hdb_disk_image": "empty30G.qcow2",
diff --git a/gns3server/appliances/ipfire.gns3a b/gns3server/appliances/ipfire.gns3a
index 656333e7..3f671dc4 100644
--- a/gns3server/appliances/ipfire.gns3a
+++ b/gns3server/appliances/ipfire.gns3a
@@ -24,6 +24,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core117.img",
+            "version": "2.19.117",
+            "md5sum": "657673d88b94ed7d22332aebe817bc86",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core117/ipfire-2.19.1gb-ext4-scon.x86_64-full-core117.img.gz",
+            "compression": "gzip"
+        },
         {
             "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core116.img",
             "version": "2.19.116",
@@ -53,6 +62,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.19.117",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core117.img"
+            }
+        },
         {
             "name": "2.19.116",
             "images": {
diff --git a/gns3server/appliances/opensuse.gns3a b/gns3server/appliances/opensuse.gns3a
index 508dfbc7..6abdd916 100644
--- a/gns3server/appliances/opensuse.gns3a
+++ b/gns3server/appliances/opensuse.gns3a
@@ -9,6 +9,7 @@
     "product_url": "https://www.opensuse.org/#Leap",
     "registry_version": 4,
     "status": "stable",
+    "availability": "free",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Username: osboxes\nPassword: osboxes.org\n\nroot password: osboxes.org",
diff --git a/gns3server/appliances/packetfence-zen.gns3a b/gns3server/appliances/packetfence-zen.gns3a
index 7b41fcb6..efc68820 100644
--- a/gns3server/appliances/packetfence-zen.gns3a
+++ b/gns3server/appliances/packetfence-zen.gns3a
@@ -22,6 +22,15 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "PacketFenceZEN_USB-7.4.0.img",
+            "version": "7.4.0",
+            "md5sum": "83951211540f16dd5813c26955c52429",
+            "filesize": 3221225472,
+            "download_url": "https://packetfence.org/download.html#/zen",
+            "direct_download_url": "https://sourceforge.net/projects/packetfence/files/PacketFence%20ZEN/7.4.0/PacketFenceZEN_USB-7.4.0.tar.bz2/download",
+            "compression": "bzip2"
+        },
         {
             "filename": "PacketFenceZEN_USB-7.3.0.img",
             "version": "7.3.0",
@@ -96,6 +105,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.0",
+            "images": {
+                "hda_disk_image": "PacketFenceZEN_USB-7.4.0.img"
+            }
+        },
         {
             "name": "7.3.0",
             "images": {
diff --git a/gns3server/appliances/untangle.gns3a b/gns3server/appliances/untangle.gns3a
index 3bc88d75..6c26cac7 100644
--- a/gns3server/appliances/untangle.gns3a
+++ b/gns3server/appliances/untangle.gns3a
@@ -24,6 +24,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "untangle_1320_x64.iso",
+            "version": "13.2.0",
+            "md5sum": "0ce2293acec0f37f1339e703653727f8",
+            "filesize": 768000000,
+            "download_url": "https://www.untangle.com/get-untangle/"
+        },
         {
             "filename": "untangle_1310_x64.iso",
             "version": "13.1.0",
@@ -90,6 +97,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "13.2.0",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "untangle_1320_x64.iso"
+            }
+        },
         {
             "name": "13.1.0",
             "images": {
diff --git a/gns3server/appliances/windows.gns3a b/gns3server/appliances/windows.gns3a
index 289e6c20..ac84deee 100644
--- a/gns3server/appliances/windows.gns3a
+++ b/gns3server/appliances/windows.gns3a
@@ -9,6 +9,7 @@
     "product_url": "https://www.microsoft.com/en-us/windows",
     "registry_version": 4,
     "status": "stable",
+    "availability": "free-to-try",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "These virtual machines expire after 90 days; i.e. you have to re-create them in your project after this time but you don't have to re-import the appliance.\n\nDefault credentials: IEUser / Passw0rd!",
@@ -25,6 +26,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "MSEdge-Win10-VMWare-disk1.vmdk",
+            "version": "10 w/ Edge",
+            "md5sum": "fef74c69e1949480d4e2095324a169af",
+            "filesize": 5636608512,
+            "download_url": "https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/"
+        },
         {
             "filename": "MSEdge_-_Win10_preview.vmdk",
             "version": "10 w/ Edge",
@@ -71,6 +79,12 @@
     "versions": [
         {
             "name": "10 w/ Edge",
+            "images": {
+                "hda_disk_image": "MSEdge-Win10-VMWare-disk1.vmdk"
+            }
+        },
+        {
+            "name": "10 w/ Edge (Preview)",
             "images": {
                 "hda_disk_image": "MSEdge_-_Win10_preview.vmdk"
             }
diff --git a/gns3server/appliances/windows_server.gns3a b/gns3server/appliances/windows_server.gns3a
index e7bfb379..a84c06d5 100644
--- a/gns3server/appliances/windows_server.gns3a
+++ b/gns3server/appliances/windows_server.gns3a
@@ -9,6 +9,7 @@
     "product_url": "https://www.microsoft.com/en-us/windows",
     "registry_version": 4,
     "status": "stable",
+    "availability": "free-to-try",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "symbol": "microsoft.svg",
@@ -21,7 +22,8 @@
         "arch": "x86_64",
         "console_type": "vnc",
         "boot_priority": "c",
-        "kvm": "require"
+        "kvm": "require",
+        "options": "-usbdevice tablet"
     },
     "images": [
         {