diff --git a/gns3server/appliances/arista-veos.gns3a b/gns3server/appliances/arista-veos.gns3a
index 52868c36..58376afb 100644
--- a/gns3server/appliances/arista-veos.gns3a
+++ b/gns3server/appliances/arista-veos.gns3a
@@ -24,6 +24,20 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "vEOS-lab-4.20.1F.vmdk",
+            "version": "4.20.1F",
+            "md5sum": "aadb6f3dbff28317f68cb4c4502d0db8",
+            "filesize": 662044672,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.18.5M.vmdk",
+            "version": "4.18.5M",
+            "md5sum": "b1ee6268dbaf2b2276fd7a5286c7ce2b",
+            "filesize": 623116288,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
         {
             "filename": "vEOS-lab-4.18.1F.vmdk",
             "version": "4.18.1F",
@@ -82,6 +96,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.20.1F",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.20.1F.vmdk"
+            }
+        },
+        {
+            "name": "4.18.5M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.18.5M.vmdk"
+            }
+        },
         {
             "name": "4.18.1F",
             "images": {
diff --git a/gns3server/appliances/bsdrp.gns3a b/gns3server/appliances/bsdrp.gns3a
index 92fcd62f..d7319ea8 100644
--- a/gns3server/appliances/bsdrp.gns3a
+++ b/gns3server/appliances/bsdrp.gns3a
@@ -19,6 +19,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "BSDRP-1.80-full-amd64-serial.img",
+            "version": "1.80",
+            "md5sum": "a4285be15ac85f67b3c7f044872a54b6",
+            "filesize": 1000000000,
+            "download_url": "https://bsdrp.net/downloads",
+            "direct_download_url": "https://sourceforge.net/projects/bsdrp/files/BSD_Router_Project/1.80/amd64/BSDRP-1.80-full-amd64-serial.img.xz/download",
+            "compression": "xz"
+        },
         {
             "filename": "BSDRP-1.70-full-amd64-serial.img",
             "version": "1.70",
@@ -30,6 +39,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "1.80",
+            "images": {
+                "hda_disk_image": "BSDRP-1.80-full-amd64-serial.img"
+            }
+        },
         {
             "name": "1.70",
             "images": {
diff --git a/gns3server/appliances/cisco-csr1000v.gns3a b/gns3server/appliances/cisco-csr1000v.gns3a
index ef7465ac..bf98fc07 100644
--- a/gns3server/appliances/cisco-csr1000v.gns3a
+++ b/gns3server/appliances/cisco-csr1000v.gns3a
@@ -22,6 +22,27 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "csr1000v-universalk9.16.07.01-serial.qcow2",
+            "version": "16.7.1",
+            "md5sum": "13adbfc2586d06c9802b9805168c0c44",
+            "filesize": 882769920,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Fuji-16.7.1&relind=AVAILABLE&rellifecycle=ED&reltype=latest"
+        },
+        {
+            "filename": "csr1000v-universalk9.16.06.01-serial.qcow2",
+            "version": "16.6.1",
+            "md5sum": "909e74446d3ff0b82c14327c0058fdc2",
+            "filesize": 1566179328,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Denali-16.3.5&relind=AVAILABLE&rellifecycle=ED&reltype=latest"
+        },
+        {
+            "filename": "csr1000v-universalk9.16.05.02-serial.qcow2",
+            "version": "16.5.2",
+            "md5sum": "59a84da28d59ee75176aa05ecde7f72a",
+            "filesize": 1322385408,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Denali-16.3.5&relind=AVAILABLE&rellifecycle=ED&reltype=latest"
+        },
         {
             "filename": "csr1000v-universalk9.16.5.1b-serial.qcow2",
             "version": "16.5.1b",
@@ -66,6 +87,24 @@
         }
     ],
     "versions": [
+        {
+            "name": "16.7.1",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.07.01-serial.qcow2"
+            }
+        },
+        {
+            "name": "16.6.1",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.06.01-serial.qcow2"
+            }
+        },
+        {
+            "name": "16.5.2",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.05.02-serial.qcow2"
+            }
+        },
         {
             "name": "16.5.1b",
             "images": {
@@ -89,13 +128,13 @@
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.3.1-build2.qcow2"
             }
-        }, 
+        },
        {
             "name": "16.3.2",
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.03.02.qcow2"
             }
-        },           
+        },
         {
             "name": "16.4.1",
             "images": {
diff --git a/gns3server/appliances/cisco-iosxrv9k.gns3a b/gns3server/appliances/cisco-iosxrv9k.gns3a
index 67a6330e..a140b6d1 100644
--- a/gns3server/appliances/cisco-iosxrv9k.gns3a
+++ b/gns3server/appliances/cisco-iosxrv9k.gns3a
@@ -24,6 +24,13 @@
         "options": "-smp 4"
     },
     "images": [
+        {
+            "filename": "xrv9k-fullk9-x-6.2.25.qcow2",
+            "version": "6.2.25",
+            "md5sum": "3f54e62b6f7cedfb2607233e5e465766",
+            "filesize": 1190723584,
+            "download_url": "https://virl.mediuscorp.com/my-account/"
+        },
         {
             "filename": "xrv9k-fullk9-x.qcow2-6.0.1",
             "version": "6.0.1",
@@ -40,6 +47,18 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.2.25",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-6.2.25.qcow2"
+            }
+        },
+        {
+            "name": "6.0.1",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x.qcow2-6.0.1"
+            }
+        },
         {
             "name": "6.0.0",
             "images": {
diff --git a/gns3server/appliances/coreos.gns3a b/gns3server/appliances/coreos.gns3a
index 9dc0f115..d7ca0450 100644
--- a/gns3server/appliances/coreos.gns3a
+++ b/gns3server/appliances/coreos.gns3a
@@ -21,6 +21,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "coreos_production_qemu_image.1520.8.0.img",
+            "version": "1520.8.0",
+            "md5sum": "a69fb2cd3ae475f9afbc268f7d391e83",
+            "filesize": 842661888,
+            "download_url": "http://stable.release.core-os.net/amd64-usr/1520.8.0/",
+            "direct_download_url": "http://stable.release.core-os.net/amd64-usr/1520.8.0/coreos_production_qemu_image.img.bz2",
+            "compression": "bzip2"
+        },
         {
             "filename": "coreos_production_qemu_image.1465.7.0.img",
             "version": "1465.7.0",
@@ -131,6 +140,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "1520.8.0",
+            "images": {
+                "hda_disk_image": "coreos_production_qemu_image.1520.8.0.img"
+            }
+        },
         {
             "name": "1465.7.0",
             "images": {
diff --git a/gns3server/appliances/cumulus-vx.gns3a b/gns3server/appliances/cumulus-vx.gns3a
index 049d492e..5f9f9b4a 100644
--- a/gns3server/appliances/cumulus-vx.gns3a
+++ b/gns3server/appliances/cumulus-vx.gns3a
@@ -23,12 +23,21 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "cumulus-linux-3.4.3-vx-amd64.qcow2",
+            "version": "3.4.3",
+            "md5sum": "fd9144cdab7cac66cf421a13c6f50ac8",
+            "filesize": 988872704,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/cumulus-linux-3.4.3-vx-amd64.qcow2"
+        },
         {
             "filename": "cumulus-linux-3.4.2-vx-amd64.qcow2",
             "version": "3.4.2",
             "md5sum": "ca844684784ceeee893d0cd76dc44e3b",
             "filesize": 1060700160,
-            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/"
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/cumulus-linux-3.4.2-vx-amd64.qcow2"
         },
         {
             "filename": "cumulus-linux-3.4.1-vx-amd64.qcow2",
@@ -116,6 +125,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "3.4.3",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.4.3-vx-amd64.qcow2"
+            }
+        },
         {
             "name": "3.4.2",
             "images": {
diff --git a/gns3server/appliances/fortiadc.gns3a b/gns3server/appliances/fortiadc.gns3a
index 9ebbde63..b2b5004e 100644
--- a/gns3server/appliances/fortiadc.gns3a
+++ b/gns3server/appliances/fortiadc.gns3a
@@ -34,6 +34,20 @@
             "filesize": 30998528,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-V400-build0977-FORTINET.out.kvm-boot.qcow2",
+            "version": "4.8.2",
+            "md5sum": "285ca7a601a0d06bb893ef91ad7748fd",
+            "filesize": 72876032,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V400-build0970-FORTINET.out.kvm-boot.qcow2",
+            "version": "4.8.1",
+            "md5sum": "8f604b2a89ac3d9cc3d2d79d85b2d7ff",
+            "filesize": 72351744,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-V400-build0937-FORTINET.out.kvm-boot.qcow2",
             "version": "4.8.0",
@@ -41,6 +55,13 @@
             "filesize": 72089600,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-V400-build0858-FORTINET.out.kvm-boot.qcow2",
+            "version": "4.7.4",
+            "md5sum": "6d81b1b3df55174e4db8526d6cfd8b0e",
+            "filesize": 63700992,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-V400-build0849-FORTINET.out.kvm-boot.qcow2",
             "version": "4.7.3",
@@ -120,6 +141,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.8.2",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V400-build0977-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "4.8.1",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V400-build0970-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "4.8.0",
             "images": {
@@ -127,6 +162,13 @@
                 "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
             }
         },
+        {
+            "name": "4.7.4",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V400-build0858-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "4.7.3",
             "images": {
diff --git a/gns3server/appliances/fortianalyzer.gns3a b/gns3server/appliances/fortianalyzer.gns3a
index 651f4402..cd44d55a 100644
--- a/gns3server/appliances/fortianalyzer.gns3a
+++ b/gns3server/appliances/fortianalyzer.gns3a
@@ -33,6 +33,13 @@
             "filesize": 106905600,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAZ_VM64_KVM-v5-build1225-FORTINET.out.kvm.qcow2",
+            "version": "5.4.4",
+            "md5sum": "69cddb5c3e49bab3dc287353d8600b45",
+            "filesize": 88715264,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v5-build1187-FORTINET.out.kvm.qcow2",
             "version": "5.4.3",
@@ -106,6 +113,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "5.4.4",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v5-build1225-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "5.4.3",
             "images": {
diff --git a/gns3server/appliances/fortiauthenticator.gns3a b/gns3server/appliances/fortiauthenticator.gns3a
index 119cd4e0..204d6dfd 100644
--- a/gns3server/appliances/fortiauthenticator.gns3a
+++ b/gns3server/appliances/fortiauthenticator.gns3a
@@ -26,6 +26,27 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAC_VM_KVM-v500-build0091-FORTINET.out.kvm.qcow2",
+            "version": "5.1.2",
+            "md5sum": "7bdafd32db552954c4c7fe60296fc600",
+            "filesize": 71135232,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v500-build0086-FORTINET.out.kvm.qcow2",
+            "version": "5.1.1",
+            "md5sum": "960017582fe16e7ce7ab9602600e65fe",
+            "filesize": 71819264,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v500-build0083-FORTINET.out.kvm.qcow2",
+            "version": "5.1.0",
+            "md5sum": "eec53c2dbe5d00c8ce2a7ca50226325a",
+            "filesize": 72495104,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAC_VM_KVM-v500-build0012-FORTINET.out.kvm.qcow2",
             "version": "5.0.0",
@@ -42,6 +63,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "5.1.2",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v500-build0091-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+            }
+        },
+        {
+            "name": "5.1.1",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v500-build0086-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+            }
+        },
+        {
+            "name": "5.1.0",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v500-build0083-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+            }
+        },
         {
             "name": "5.0.0",
             "images": {
diff --git a/gns3server/appliances/forticache.gns3a b/gns3server/appliances/forticache.gns3a
index 275bc145..4052c0f3 100644
--- a/gns3server/appliances/forticache.gns3a
+++ b/gns3server/appliances/forticache.gns3a
@@ -26,6 +26,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FCHKVM-v400-build0213-FORTINET.out.kvm.qcow2",
+            "version": "4.2.5",
+            "md5sum": "78db88447f29f363b4ba8e4833474637",
+            "filesize": 27508736,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FCHKVM-v400-build0204-FORTINET.out.kvm.qcow2",
             "version": "4.2.4",
@@ -85,6 +92,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.2.5",
+            "images": {
+                "hda_disk_image": "FCHKVM-v400-build0213-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
         {
             "name": "4.2.4",
             "images": {
diff --git a/gns3server/appliances/fortigate.gns3a b/gns3server/appliances/fortigate.gns3a
index 9a7319cd..739132a7 100644
--- a/gns3server/appliances/fortigate.gns3a
+++ b/gns3server/appliances/fortigate.gns3a
@@ -47,6 +47,13 @@
             "filesize": 38760448,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v5-build1165-FORTINET.out.kvm.qcow2",
+            "version": "5.4.6",
+            "md5sum": "4429f1f0f2cce4a8781354a9eb745c61",
+            "filesize": 38457344,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v5-build1138-FORTINET.out.kvm.qcow2",
             "version": "5.4.5",
@@ -162,6 +169,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "5.4.6",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v5-build1165-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "5.4.5",
             "images": {
diff --git a/gns3server/appliances/fortimail.gns3a b/gns3server/appliances/fortimail.gns3a
index 306a7e51..a8c755d7 100644
--- a/gns3server/appliances/fortimail.gns3a
+++ b/gns3server/appliances/fortimail.gns3a
@@ -26,6 +26,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FML_VMKV-64-v54-build0707-FORTINET.out.kvm.qcow2",
+            "version": "5.4.2",
+            "md5sum": "b51260cc3e408bf1352a204b8370254b",
+            "filesize": 92864512,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v54-build0704-FORTINET.out.kvm.qcow2",
+            "version": "5.4.1",
+            "md5sum": "1f6553e182512cc87e20f47cc2b65abf",
+            "filesize": 94568448,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FML_VMKV-64-v54-build0692-FORTINET.out.kvm.qcow2",
             "version": "5.4.0",
@@ -33,6 +47,13 @@
             "filesize": 101253120,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FML_VMKV-64-v53-build0648-FORTINET.out.kvm.qcow2",
+            "version": "5.3.11",
+            "md5sum": "bd34a81c1bb6772c7e4919620027a5d4",
+            "filesize": 88670208,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FML_VMKV-64-v53-build0643-FORTINET.out.kvm.qcow2",
             "version": "5.3.10",
@@ -106,6 +127,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "5.4.2",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v54-build0707-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.4.1",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v54-build0704-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "5.4.0",
             "images": {
@@ -113,6 +148,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "5.3.11",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v53-build0648-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "5.3.10",
             "images": {
diff --git a/gns3server/appliances/fortimanager.gns3a b/gns3server/appliances/fortimanager.gns3a
index 55994486..f4642202 100644
--- a/gns3server/appliances/fortimanager.gns3a
+++ b/gns3server/appliances/fortimanager.gns3a
@@ -33,6 +33,13 @@
             "filesize": 108363776,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v5-build1225-FORTINET.out.kvm.qcow2",
+            "version": "5.4.4",
+            "md5sum": "53bc6e320fe7bde5d2b636bde95a910c",
+            "filesize": 89911296,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v5-build1187-FORTINET.out.kvm.qcow2",
             "version": "5.4.3",
@@ -106,6 +113,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "5.4.4",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v5-build1225-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "5.4.3",
             "images": {
diff --git a/gns3server/appliances/freebsd.gns3a b/gns3server/appliances/freebsd.gns3a
index 7cd9e4b3..90d97218 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/11.0-RELEASE/amd64/Latest/FreeBSD-11.0-RELEASE-amd64.qcow2.xz",
             "compression": "xz"
         },
+        {
+            "filename": "FreeBSD-10.4-RELEASE-amd64.qcow2",
+            "version": "10.4",
+            "md5sum": "ad498873733c57d1f6d890d587a11e3c",
+            "filesize": 1013448704,
+            "download_url": "https://www.freebsd.org/where.html",
+            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/10.4-RELEASE/amd64/Latest/FreeBSD-10.4-RELEASE-amd64.qcow2.xz",
+            "compression": "xz"
+        },
         {
             "filename": "FreeBSD-10.3-RELEASE-amd64.qcow2",
             "version": "10.3",
@@ -63,6 +72,12 @@
                 "hda_disk_image": "FreeBSD-11.0-RELEASE-amd64.qcow2"
             }
         },
+        {
+            "name": "10.4",
+            "images": {
+                "hda_disk_image": "FreeBSD-10.4-RELEASE-amd64.qcow2"
+            }
+        },
         {
             "name": "10.3",
             "images": {
diff --git a/gns3server/appliances/freenas.gns3a b/gns3server/appliances/freenas.gns3a
index 1bbb1144..e71c00ff 100644
--- a/gns3server/appliances/freenas.gns3a
+++ b/gns3server/appliances/freenas.gns3a
@@ -24,6 +24,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FreeNAS-11.0-U4.iso",
+            "version": "11.0-U4",
+            "md5sum": "4c210f1a6510d1fa95257d81ef569ff8",
+            "filesize": 567312384,
+            "download_url": "http://www.freenas.org/download/",
+            "direct_download_url": "http://download.freenas.org/11/11.0-U4/x64/FreeNAS-11.0-U4.iso"
+        },
         {
             "filename": "FreeNAS-9.10.1-U4.iso",
             "version": "9.10",
@@ -42,6 +50,14 @@
         }
     ],
     "versions": [
+        {
+            "name": "11.0",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FreeNAS-11.0-U4.iso"
+            }
+        },
         {
             "name": "9.10",
             "images": {
diff --git a/gns3server/appliances/hp-vsr1001.gns3a b/gns3server/appliances/hp-vsr1001.gns3a
index 9225897a..d061b86a 100644
--- a/gns3server/appliances/hp-vsr1001.gns3a
+++ b/gns3server/appliances/hp-vsr1001.gns3a
@@ -23,6 +23,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "VSR1000_HPE-CMW710-R0327L01-X64.qco",
+            "version": "7.10.R0327L01",
+            "md5sum": "907de5140a4a029afe1c517cfc27ecde",
+            "filesize": 138739712,
+            "download_url": "https://h10145.www1.hp.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=22702&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
+        },
         {
             "filename": "VSR1000_HPE-CMW710-R0326-X64.qco",
             "version": "7.10.R0326",
@@ -74,6 +81,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.10.R0327L01",
+            "images": {
+                "hda_disk_image": "VSR1000_HPE-CMW710-R0327L01-X64.qco"
+            }
+        },
         {
             "name": "7.10.R0326",
             "images": {
diff --git a/gns3server/appliances/ipfire.gns3a b/gns3server/appliances/ipfire.gns3a
index 5fc15aa7..656333e7 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-core116.img",
+            "version": "2.19.116",
+            "md5sum": "2a8df99d117a0dbfb67870494c0c67cd",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core116/ipfire-2.19.1gb-ext4-scon.x86_64-full-core116.img.gz",
+            "compression": "gzip"
+        },
         {
             "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core111.img",
             "version": "2.19.111",
@@ -44,6 +53,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.19.116",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core116.img"
+            }
+        },
         {
             "name": "2.19.111",
             "images": {
diff --git a/gns3server/appliances/kemp-vlm.gns3a b/gns3server/appliances/kemp-vlm.gns3a
index c9431bd4..b873db5c 100644
--- a/gns3server/appliances/kemp-vlm.gns3a
+++ b/gns3server/appliances/kemp-vlm.gns3a
@@ -26,6 +26,13 @@
         "options": "-smp 2"
     },
     "images": [
+        {
+            "filename": "LoadMaster-VLM-7.2.40.0.15707.RELEASE-Linux-KVM-XEN-FREE.disk",
+            "version": "7.2.40.0",
+            "md5sum": "4284a80141f7974d082a2eed91ec6216",
+            "filesize": 17179869185,
+            "download_url": "http://freeloadbalancer.com/download/"
+        },
         {
             "filename": "LoadMaster-VLM-7.2.38.0.14750.RELEASE-Linux-KVM-XEN.disk",
             "version": "7.2.38.0",
@@ -56,6 +63,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.2.40.0",
+            "images": {
+                "hda_disk_image": "LoadMaster-VLM-7.2.40.0.15707.RELEASE-Linux-KVM-XEN-FREE.disk"
+            }
+        },
         {
             "name": "7.2.38.0",
             "images": {
diff --git a/gns3server/appliances/kerio-connect.gns3a b/gns3server/appliances/kerio-connect.gns3a
index 68670bcd..741477d1 100644
--- a/gns3server/appliances/kerio-connect.gns3a
+++ b/gns3server/appliances/kerio-connect.gns3a
@@ -24,6 +24,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "kerio-connect-appliance-9.2.5-3336-p3-vmware-amd64-disk1.vmdk",
+            "version": "9.2.5p3",
+            "md5sum": "f2a202f29e71dc6e8bebce4c05a9e44d",
+            "filesize": 824496128,
+            "download_url": "http://www.kerio.com/support/kerio-connect",
+            "direct_download_url": "http://cdn.kerio.com/dwn/connect/connect-9.2.5-3336/kerio-connect-appliance-9.2.5-3336-p3-vmware-amd64-disk1.vmdk"
+        },
         {
             "filename": "kerio-connect-appliance-9.2.4-3252-vmware-amd64-disk1.vmdk",
             "version": "9.2.4",
@@ -59,6 +67,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.2.5",
+            "images": {
+                "hda_disk_image": "kerio-connect-appliance-9.2.5-3336-p3-vmware-amd64-disk1.vmdk"
+            }
+        },
         {
             "name": "9.2.4",
             "images": {
diff --git a/gns3server/appliances/kerio-control.gns3a b/gns3server/appliances/kerio-control.gns3a
index 15cc258f..2b3f48db 100644
--- a/gns3server/appliances/kerio-control.gns3a
+++ b/gns3server/appliances/kerio-control.gns3a
@@ -23,6 +23,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "kerio-control-appliance-9.2.4-2223-vmware-disk1.vmdk",
+            "version": "9.2.4",
+            "md5sum": "20970f3638c7ca5603c2afbe56e89421",
+            "filesize": 191687168,
+            "download_url": "http://www.kerio.com/support/kerio-control",
+            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.2.4-2223/kerio-control-appliance-9.2.4-2223-vmware-disk1.vmdk"
+        },
         {
             "filename": "kerio-control-appliance-9.2.3-2219-vmware-disk1.vmdk",
             "version": "9.2.3",
@@ -55,6 +63,12 @@
             "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.1.4-1535/kerio-control-appliance-9.1.4-1535-vmware.vmdk"        }
     ],
     "versions": [
+        {
+            "name": "9.2.4",
+            "images": {
+                "hda_disk_image": "kerio-control-appliance-9.2.4-2223-vmware-disk1.vmdk"
+            }
+        },
         {
             "name": "9.2.3",
             "images": {
diff --git a/gns3server/appliances/loadbalancer_org-va.gns3a b/gns3server/appliances/loadbalancer_org-va.gns3a
index b6428ee1..868aa4db 100644
--- a/gns3server/appliances/loadbalancer_org-va.gns3a
+++ b/gns3server/appliances/loadbalancer_org-va.gns3a
@@ -23,6 +23,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "Loadbalancer.org_Enterprise_VA-8.3-disk1.qcow2",
+            "version": "8.3",
+            "md5sum": "f0e41f39a5cab47990edc0509c579bac",
+            "filesize": 368332288,
+            "download_url": "https://loadbalancer.org/resources/free-trial"
+        },
         {
             "filename": "Loadbalancer.org_Enterprise_VA-8.2-disk1.qcow2",
             "version": "8.2",
@@ -32,6 +39,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "8.3",
+            "images": {
+                "hda_disk_image": "Loadbalancer.org_Enterprise_VA-8.3-disk1.qcow2"
+            }
+        },
         {
             "name": "8.2",
             "images": {
diff --git a/gns3server/appliances/mikrotik-chr.gns3a b/gns3server/appliances/mikrotik-chr.gns3a
index 8f0859d4..559b6bd0 100644
--- a/gns3server/appliances/mikrotik-chr.gns3a
+++ b/gns3server/appliances/mikrotik-chr.gns3a
@@ -26,6 +26,15 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "chr-6.40.5.img",
+            "version": "6.40.5",
+            "md5sum": "5d3bef219a859d417fea704ae7109eb7",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download2.mikrotik.com/routeros/6.40.5/chr-6.40.5.img.zip",
+            "compression": "zip"
+        },
         {
             "filename": "chr-6.40.3.img",
             "version": "6.40.3",
@@ -226,6 +235,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.40.5",
+            "images": {
+                "hda_disk_image": "chr-6.40.5.img"
+            }
+        },
         {
             "name": "6.40.3",
             "images": {
diff --git a/gns3server/appliances/packetfence-zen.gns3a b/gns3server/appliances/packetfence-zen.gns3a
index 0d18c3ed..7b41fcb6 100644
--- a/gns3server/appliances/packetfence-zen.gns3a
+++ b/gns3server/appliances/packetfence-zen.gns3a
@@ -22,6 +22,15 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "PacketFenceZEN_USB-7.3.0.img",
+            "version": "7.3.0",
+            "md5sum": "dfeb8a97bba2e475ce418b02327c0ea1",
+            "filesize": 3221225472,
+            "download_url": "https://packetfence.org/download.html#/zen",
+            "direct_download_url": "http://sourceforge.net/projects/packetfence/files/PacketFence%20ZEN/7.3.0/PacketFenceZEN_USB-7.3.0.tar.bz2/download",
+            "compression": "bzip2"
+        },
         {
             "filename": "PacketFenceZEN_USB-7.1.0.img",
             "version": "7.1.0",
@@ -87,6 +96,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.3.0",
+            "images": {
+                "hda_disk_image": "PacketFenceZEN_USB-7.3.0.img"
+            }
+        },
         {
             "name": "7.1.0",
             "images": {
diff --git a/gns3server/appliances/pfsense.gns3a b/gns3server/appliances/pfsense.gns3a
index 9d2e4546..38ac6b6d 100644
--- a/gns3server/appliances/pfsense.gns3a
+++ b/gns3server/appliances/pfsense.gns3a
@@ -22,6 +22,13 @@
         "process_priority": "normal"
     },
     "images": [
+        {
+            "filename": "pfSense-CE-2.3.5-RELEASE-2g-amd64-nanobsd.img",
+            "version": "2.3.5",
+            "md5sum": "b6cb76adba3e1113892f84ea01894228",
+            "filesize": 1989969408,
+            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
+        },
         {
             "filename": "pfSense-CE-2.3.4-RELEASE-2g-amd64-nanobsd.img",
             "version": "2.3.4",
@@ -66,6 +73,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.3.5",
+            "images": {
+                "hda_disk_image": "pfSense-CE-2.3.5-RELEASE-2g-amd64-nanobsd.img"
+            }
+        },
         {
             "name": "2.3.4",
             "images": {
diff --git a/gns3server/appliances/zentyal-server.gns3a b/gns3server/appliances/zentyal-server.gns3a
index 891495f9..49cb6caa 100644
--- a/gns3server/appliances/zentyal-server.gns3a
+++ b/gns3server/appliances/zentyal-server.gns3a
@@ -24,6 +24,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "zentyal-5.0.1-development-amd64.iso",
+            "version": "5.0.1",
+            "md5sum": "1ac74be6563f0b21b337c274e62cdd32",
+            "filesize": 953155584,
+            "download_url": "http://download.zentyal.com/",
+            "direct_download_url": "http://download.zentyal.com/zentyal-5.0.1-development-amd64.iso"
+        },
         {
             "filename": "zentyal-5.0-development-amd64.iso",
             "version": "5.0",
@@ -66,6 +74,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "5.0.1",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "zentyal-5.0.1-development-amd64.iso"
+            }
+        },
         {
             "name": "5.0",
             "images": {
diff --git a/gns3server/appliances/zeroshell.gns3a b/gns3server/appliances/zeroshell.gns3a
index a8be7b2b..f689636c 100644
--- a/gns3server/appliances/zeroshell.gns3a
+++ b/gns3server/appliances/zeroshell.gns3a
@@ -20,15 +20,32 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "ZeroShell-3.8.0-X86-USB.img",
+            "version": "3.8.0",
+            "md5sum": "a16d584c831f3e88ea442a2343d71cfa",
+            "filesize": 1992294400,
+            "download_url": "http://www.zeroshell.org/download/",
+            "direct_download_url": "http://www.zeroshell.net/listing/ZeroShell-3.8.0-X86-USB.img.gz",
+            "compression": "gzip"
+        },
         {
             "filename": "ZeroShell-3.7.1-USB.img",
             "version": "3.7.1",
             "md5sum": "22e739a24dc1c233d3eca5d8fedc97c8",
             "filesize": 1992294400,
-            "download_url": "http://www.zeroshell.org/download/"
+            "download_url": "http://www.zeroshell.org/download/",
+            "direct_download_url": "http://www.zeroshell.net/listing/ZeroShell-3.7.1-USB.img.gz",
+            "compression": "gzip"
         }
     ],
     "versions": [
+        {
+            "name": "3.8.0",
+            "images": {
+                "hda_disk_image": "ZeroShell-3.8.0-X86-USB.img"
+            }
+        },
         {
             "name": "3.7.1",
             "images": {