diff --git a/gns3server/appliances/bsdrp.gns3a b/gns3server/appliances/bsdrp.gns3a
index 5adf87fe..1e9a5863 100644
--- a/gns3server/appliances/bsdrp.gns3a
+++ b/gns3server/appliances/bsdrp.gns3a
@@ -19,6 +19,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "BSDRP-1.95-full-amd64-serial.img",
+            "version": "1.95",
+            "md5sum": "f1e080506a965e46503673c426b9c764",
+            "filesize": 2000000000,
+            "download_url": "https://bsdrp.net/downloads",
+            "direct_download_url": "https://sourceforge.net/projects/bsdrp/files/BSD_Router_Project/1.95/amd64/BSDRP-1.95-full-amd64-serial.img.xz/download",
+            "compression": "xz"
+        },
         {
             "filename": "BSDRP-1.92-full-amd64-serial.img",
             "version": "1.92",
@@ -66,6 +75,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "1.95",
+            "images": {
+                "hda_disk_image": "BSDRP-1.95-full-amd64-serial.img"
+            }
+        },
         {
             "name": "1.92",
             "images": {
diff --git a/gns3server/appliances/cisco-dcnm.gns3a b/gns3server/appliances/cisco-dcnm.gns3a
index 7d6484d9..fd924d19 100644
--- a/gns3server/appliances/cisco-dcnm.gns3a
+++ b/gns3server/appliances/cisco-dcnm.gns3a
@@ -16,7 +16,7 @@
     "symbol": "mgmt_station.svg",
     "qemu": {
         "adapter_type": "e1000",
-        "adapters": 2,
+        "adapters": 3,
         "ram": 8192,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
@@ -25,6 +25,13 @@
         "options": "-smp 2"
     },
     "images": [
+        {
+            "filename": "dcnm-va.11.2.1.iso",
+            "version": "11.2.1",
+            "md5sum": "2e50e0a4ea72875c54edf593b7c93a66",
+            "filesize": 4782958592,
+            "download_url": "https://software.cisco.com/download/home/281722751/type/282088134/release/11.1%25281%2529"
+        },
         {
             "filename": "dcnm-va.11.1.1.iso",
             "version": "11.1.1",
@@ -49,6 +56,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "11.2.1",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "dcnm-va.11.2.1.iso"
+            }
+        },
         {
             "name": "11.1.1",
             "images": {
diff --git a/gns3server/appliances/clearos.gns3a b/gns3server/appliances/clearos.gns3a
index 37c2cc14..82b52290 100644
--- a/gns3server/appliances/clearos.gns3a
+++ b/gns3server/appliances/clearos.gns3a
@@ -22,6 +22,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "ClearOS-7.6-DVD-x86_64.iso",
+            "version": "7.6",
+            "md5sum": "aca5827a37c18549aee2f5bbfbe49922",
+            "filesize": 1141899264,
+            "download_url": "https://www.clearos.com/clearfoundation/software/clearos-downloads"
+        },
         {
             "filename": "ClearOS-7.5-DVD-x86_64.iso",
             "version": "7.5",
@@ -60,6 +67,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "ClearOS-7.6-DVD-x86_64.iso"
+            }
+        },
         {
             "name": "7.5",
             "images": {
diff --git a/gns3server/appliances/cumulus-vx.gns3a b/gns3server/appliances/cumulus-vx.gns3a
index c743d2d4..de25c795 100644
--- a/gns3server/appliances/cumulus-vx.gns3a
+++ b/gns3server/appliances/cumulus-vx.gns3a
@@ -23,6 +23,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "cumulus-linux-3.7.10-vx-amd64-qemu.qcow2",
+            "version": "3.7.10",
+            "md5sum": "3474c950f9d348a6c9f0ce52b5698369",
+            "filesize": 576458240,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/CumulusLinux-3.7.10/cumulus-linux-3.7.10-vx-amd64-qemu.qcow2"
+        },
         {
             "filename": "cumulus-linux-3.7.6-vx-amd64-qemu.qcow2",
             "version": "3.7.6",
@@ -205,6 +213,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "3.7.10",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.7.10-vx-amd64-qemu.qcow2"
+            }
+        }, 
         {
             "name": "3.7.6",
             "images": {
diff --git a/gns3server/appliances/exos.gns3a b/gns3server/appliances/exos.gns3a
index a92a3f6a..c93841da 100644
--- a/gns3server/appliances/exos.gns3a
+++ b/gns3server/appliances/exos.gns3a
@@ -1,7 +1,7 @@
 {
     "name": "EXOS VM",
     "category": "multilayer_switch",
-    "description": "The ExtremeXOS VM is created and maintained by Extreme Networks for users to emulate a network using EXOS switches.",
+    "description": "The ExtremeXOS VM is created and maintained by Extreme Networks for users to emulate a network using EXOS switches.",
     "vendor_name": "Extreme Networks",
     "vendor_url": "https://www.extremenetworks.com",
     "documentation_url": "https://www.extremenetworks.com/support/documentation",
@@ -50,46 +50,11 @@
             "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.7.1.2.qcow2"
         },
 		{
-            "filename": "EXOS-VM_v22.6.1.4.qcow2",
-            "version": "22.6.1.4",
-            "md5sum": "82b31b11b26143a82c8259a4825696fc",
-            "filesize": 180355072,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.6.1.4.qcow2"
-        },
-		{
-            "filename": "EXOS-VM_v22.5.1.7.qcow2",
-            "version": "22.5.1.7",
-            "md5sum": "d2e8ae6783b6ed777ad5cd8cafd83c86",
-            "filesize": 180289536,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.5.1.7.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v22.4.1.4-disk1.qcow2",
-            "version": "22.4.1.4",
-            "md5sum": "5f1ee41912d74d423ce8ae57ea413602",
-            "filesize": 229638144,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.4.1.4-disk1.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v22.3.1.4patch1-4-disk1.qcow2",
-            "version": "22.3.1.4",
-            "md5sum": "a4585b6e987ff730f5c044af339fe090",
-            "filesize": 218431488,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.3.1.4patch1-4-disk1.qcow2"
-        },
-		{
-            "filename": "EXOS-VM_v22.2.1.5-disk1.qcow2",
-            "version": "22.2.1.5",
-            "md5sum": "e3cfe92077addda6ad34185288c90acf",
-            "filesize": 179568640,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.2.1.5-disk1.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v22.1.1.5-disk1.qcow2",
-            "version": "22.1.1.5",
-            "md5sum": "77683060e75d81b776761f6829b15e9b",
-            "filesize": 179437568,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.1.1.5-disk1.qcow2"
+            "filename": "EXOS-VM_v21.1.1.4-disk1.qcow2",
+            "version": "21.1.1.4",
+            "md5sum": "654606809b6fd3bca400377483eb4a79",
+            "filesize": 117560832,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v21.1.1.4-disk1.qcow2"
         }
 
     ],
@@ -114,41 +79,12 @@
                 "hda_disk_image": "EXOS-VM_v22.7.1.2.qcow2"
             }
 		},
-		{
-            "name": "22.6.1.4",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v22.6.1.4.qcow2"
-            }
-        },
-		{
-            "name": "22.5.1.7",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v22.5.1.7.qcow2"
-            }
-        },
-        {
-            "name": "22.4.1.4",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v22.4.1.4-disk1.qcow2"
-            }
-        },
         {
-            "name": "22.3.1.4",
+            "name": "21.1.1.4",
             "images": {
-                "hda_disk_image": "EXOS-VM_v22.3.1.4patch1-4-disk1.qcow2"
-            }
-        },
-        {
-            "name": "22.2.1.5",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v22.2.1.5-disk1.qcow2"
-            }
-        },
-        {
-            "name": "22.1.1.5",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v22.1.1.5-disk1.qcow2"
+                "hda_disk_image": "EXOS-VM_v21.1.1.4-disk1.qcow2"
             }
         }
     ]
 }
+
diff --git a/gns3server/appliances/fortiadc.gns3a b/gns3server/appliances/fortiadc.gns3a
index 03d8524f..13507721 100644
--- a/gns3server/appliances/fortiadc.gns3a
+++ b/gns3server/appliances/fortiadc.gns3a
@@ -34,6 +34,13 @@
             "filesize": 30998528,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-V500-build0655-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.3.3",
+            "md5sum": "aa16f574a234ceada5d8ac6cc6536835",
+            "filesize": 112918528,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-V500-build0442-FORTINET.out.kvm-boot.qcow2",
             "version": "5.2.2",
@@ -197,6 +204,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "5.3.3",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V500-build0655-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "5.2.2",
             "images": {
diff --git a/gns3server/appliances/fortianalyzer.gns3a b/gns3server/appliances/fortianalyzer.gns3a
index de9932a9..3dd1a4de 100644
--- a/gns3server/appliances/fortianalyzer.gns3a
+++ b/gns3server/appliances/fortianalyzer.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v6-build1183-FORTINET.out.kvm.qcow2",
+            "version": "6.2.2",
+            "md5sum": "d65ee8754bed66027a6ac095e0dc3e40",
+            "filesize": 152506368,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
             "version": "6.2.0",
@@ -33,6 +40,13 @@
             "filesize": 140177408,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAZ_VM64_KVM-v6-build0349-FORTINET.out.kvm.qcow2",
+            "version": "6.0.6",
+            "md5sum": "47b83be1b22945df7f4f1c081722fd7a",
+            "filesize": 111235072,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -155,6 +169,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.2.2",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build1183-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.2.0",
             "images": {
@@ -162,6 +183,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.0.6",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build0349-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.3",
             "images": {
diff --git a/gns3server/appliances/fortiauthenticator.gns3a b/gns3server/appliances/fortiauthenticator.gns3a
index 14d8fbde..dac26e8f 100644
--- a/gns3server/appliances/fortiauthenticator.gns3a
+++ b/gns3server/appliances/fortiauthenticator.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAC_VM_KVM-v6-build0058-FORTINET.out.kvm.qcow2",
+            "version": "6.0.3",
+            "md5sum": "5812e4ab63aa1feba85324897dd37fa5",
+            "filesize": 73912320,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAC_VM_KVM-v6-build0010-FORTINET.out.kvm.qcow2",
             "version": "6.0.0",
@@ -105,6 +112,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.0.3",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v6-build0058-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
+            }
+        },
         {
             "name": "6.0.0",
             "images": {
diff --git a/gns3server/appliances/fortigate.gns3a b/gns3server/appliances/fortigate.gns3a
index db552897..4c5e61aa 100644
--- a/gns3server/appliances/fortigate.gns3a
+++ b/gns3server/appliances/fortigate.gns3a
@@ -27,12 +27,31 @@
     },
     "images": [
         {
+            "filename": "FGT_VM64_KVM-v6-build1010-FORTINET.out.kvm.qcow2",
+            "version": "6.2.2",
+            "md5sum": "da411e21e4c0bc25553d0e72201af7a4",
+            "filesize": 58916864,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },{
+            "filename": "FGT_VM64_KVM-v6-build0932-FORTINET.out.kvm.qcow2",
+            "version": "6.2.1",
+            "md5sum": "725d41460ed1858dc905dbe2846a8400",
+            "filesize": 58785792,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },{
             "filename": "FGT_VM64_KVM-v6-build0866-FORTINET.out.kvm.qcow2",
             "version": "6.2.0",
             "md5sum": "588df9ba0db485976f6681810001ae73",
             "filesize": 57868288,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v6-build0272-FORTINET.out.kvm.qcow2",
+            "version": "6.0.6",
+            "md5sum": "c71d14d1567ec7ad271be8a9d06dbe7b",
+            "filesize": 52076544,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v6-build0200-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -225,6 +244,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.2.2",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build1010-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.2.1",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build0932-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.2.0",
             "images": {
@@ -239,6 +272,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.0.6",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build0272-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.0",
             "images": {
diff --git a/gns3server/appliances/fortimail.gns3a b/gns3server/appliances/fortimail.gns3a
index 511cf513..5f2c7a5d 100644
--- a/gns3server/appliances/fortimail.gns3a
+++ b/gns3server/appliances/fortimail.gns3a
@@ -26,6 +26,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FML_VMKV-64-v60-build0257-FORTINET.out.kvm.qcow2",
+            "version": "6.2.1",
+            "md5sum": "79449970d26979af79b0ccb7b0cf3880",
+            "filesize": 104464384,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v60-build0160-FORTINET.out.kvm.qcow2",
+            "version": "6.0.7",
+            "md5sum": "925a0b76607613962119cd5ea568458f",
+            "filesize": 99483648,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FML_VMKV-64-v60-build0143-FORTINET.out.kvm.qcow2",
             "version": "6.0.4",
@@ -169,6 +183,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.2.1",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v60-build0257-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.7",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v60-build0160-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.4",
             "images": {
diff --git a/gns3server/appliances/fortimanager.gns3a b/gns3server/appliances/fortimanager.gns3a
index a0347aa4..44034662 100644
--- a/gns3server/appliances/fortimanager.gns3a
+++ b/gns3server/appliances/fortimanager.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FMG_VM64_KVM-v6-build1183-FORTINET.out.kvm.qcow2",
+            "version": "6.2.2",
+            "md5sum": "f5051a8fe49d916bb554b9bae32a1eb4",
+            "filesize": 139145216,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
             "version": "6.2.0",
@@ -33,6 +40,13 @@
             "filesize": 126894080,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v6-build0349-FORTINET.out.kvm.qcow2",
+            "version": "6.0.6",
+            "md5sum": "d03f024c948ba6e2bb9e66c11ca8f34c",
+            "filesize": 112553984,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -148,6 +162,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.2.2",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build1183-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.2.0",
             "images": {
@@ -155,6 +176,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.0.6",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build0349-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.2",
             "images": {
diff --git a/gns3server/appliances/freebsd.gns3a b/gns3server/appliances/freebsd.gns3a
index 31789069..27671495 100644
--- a/gns3server/appliances/freebsd.gns3a
+++ b/gns3server/appliances/freebsd.gns3a
@@ -22,6 +22,15 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FreeBSD-12.1-RELEASE-amd64.qcow2",
+            "version": "12.1",
+            "md5sum": "0079b4ca99f64bb825cfbaefcca10fd4",
+            "filesize": 3043229696,
+            "download_url": "https://www.freebsd.org/where.html",
+            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.1-RELEASE/amd64/Latest/FreeBSD-12.1-RELEASE-amd64.qcow2.xz",
+            "compression": "xz"
+        },
         {
             "filename": "FreeBSD-12.0-RELEASE-amd64.qcow2",
             "version": "12.0",
@@ -78,6 +87,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "12.1",
+            "images": {
+                "hda_disk_image": "FreeBSD-12.1-RELEASE-amd64.qcow2"
+            }
+        },
         {
             "name": "12.0",
             "images": {
diff --git a/gns3server/appliances/ipfire.gns3a b/gns3server/appliances/ipfire.gns3a
index 92f2e6b5..ed85e3e1 100644
--- a/gns3server/appliances/ipfire.gns3a
+++ b/gns3server/appliances/ipfire.gns3a
@@ -24,13 +24,22 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "ipfire-2.23.2gb-ext4.x86_64-full-core136.img",
+            "version": "2.23.136",
+            "md5sum": "56d4cdce08417a9ddb465e445bd4ef63",
+            "filesize": 1540358144,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.23-core136/ipfire-2.23.2gb-ext4.x86_64-full-core136.img.xz",
+            "compression": "xz"
+        },
         {
             "filename": "ipfire-2.23.2gb-ext4.x86_64-full-core131.img",
-            "version": "2.23",
+            "version": "2.23.131",
             "md5sum": "604c06e20c36985ff00802da4509340c",
             "filesize": 1541160960,
             "download_url": "http://www.ipfire.org/download",
-            "direct_download_url": "https://muug.ca/mirror/ipfire/releases/ipfire-2.x/2.23-core131/ipfire-2.23.2gb-ext4.x86_64-full-core131.img.xz",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.23-core131/ipfire-2.23.2gb-ext4.x86_64-full-core131.img.xz",
             "compression": "xz"
         },
         {
diff --git a/gns3server/appliances/packetfence-zen.gns3a b/gns3server/appliances/packetfence-zen.gns3a
index baf4d625..93cbcc1e 100644
--- a/gns3server/appliances/packetfence-zen.gns3a
+++ b/gns3server/appliances/packetfence-zen.gns3a
@@ -23,6 +23,15 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "PacketFenceZEN_USB-9.1.0.img",
+            "version": "9.1.0",
+            "md5sum": "107a8b2f76105a72406ac76e4f356c6d",
+            "filesize": 3221225472,
+            "download_url": "https://packetfence.org/download.html#/zen",
+            "direct_download_url": "https://sourceforge.net/projects/packetfence/files/PacketFence%20ZEN/9.1.0/PacketFenceZEN_USB-9.1.0.tar.bz2/download",
+            "compression": "bzip2"
+        },
         {
             "filename": "PacketFenceZEN_USB-9.0.1.img",
             "version": "9.0.1",
@@ -88,6 +97,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.1.0",
+            "images": {
+                "hda_disk_image": "PacketFenceZEN_USB-9.1.0.img"
+            }
+        },
         {
             "name": "9.0.1",
             "images": {
diff --git a/gns3server/appliances/ubuntu-server.gns3a b/gns3server/appliances/ubuntu-server.gns3a
new file mode 100644
index 00000000..6d96e0db
--- /dev/null
+++ b/gns3server/appliances/ubuntu-server.gns3a
@@ -0,0 +1,44 @@
+{
+    "name": "Ubuntu Server",
+    "category": "guest",
+    "description": "This is a custom Ubuntu server which comes with Canonical security updates, Xorg and Telnetd",
+    "vendor_name": "Canonical Inc.",
+    "vendor_url": "https://www.ubuntu.com",
+    "documentation_url": "https://help.ubuntu.com",
+    "product_name": "Ubuntu",
+    "product_url": "https://ubuntu.com/server",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Mohamad Siblini",
+    "maintainer_email": "https://www.ictkin.com/contact",
+    "usage": "Username: gns3\nPassword: gns3 | MD5: 435f15a54f7f673e302ad26f05226e0e",
+    "port_name_format": "ens{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 1,
+        "ram": 2048,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "c",
+        "kvm": "require",
+        "options": "-vga virtio"
+    },
+    "images": [
+        {
+            "filename": "Ubuntu Server 18.04.3 LTS (64bit).vmdk",
+            "version": "18.04.3",
+            "md5sum": "435f15a54f7f673e302ad26f05226e0e",
+            "filesize": 2707814912,
+            "download_url": "https://www.ictkin.com/gns3-appliance/"
+        }
+    ],
+    "versions": [
+        {
+            "name": "18.04.3 LTS Server",
+            "images": {
+                "hda_disk_image": "Ubuntu Server 18.04.3 LTS (64bit).vmdk"
+            }
+        }
+    ]
+}
diff --git a/gns3server/appliances/zentyal-server.gns3a b/gns3server/appliances/zentyal-server.gns3a
index 1370eeec..b649789d 100644
--- a/gns3server/appliances/zentyal-server.gns3a
+++ b/gns3server/appliances/zentyal-server.gns3a
@@ -24,6 +24,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "zentyal-6.1-development-amd64.iso",
+            "version": "6.1",
+            "md5sum": "83ff98b344f4fbb354c32ae42ff57c7b",
+            "filesize": 1003487232,
+            "download_url": "http://download.zentyal.com/",
+            "direct_download_url": "http://download.zentyal.com/zentyal-6.1-development-amd64.iso"
+        },
         {
             "filename": "zentyal-6.0-development-amd64.iso",
             "version": "6.0",
@@ -90,6 +98,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.1",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "zentyal-6.1-development-amd64.iso"
+            }
+        },
         {
             "name": "6.0",
             "images": {
diff --git a/gns3server/appliances/zeroshell.gns3a b/gns3server/appliances/zeroshell.gns3a
index fd82ef59..3fe12bf8 100644
--- a/gns3server/appliances/zeroshell.gns3a
+++ b/gns3server/appliances/zeroshell.gns3a
@@ -20,6 +20,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "ZeroShell-3.9.3-X86-USB.img",
+            "version": "3.9.3",
+            "md5sum": "9be2b399f59df51e5026d81e45b8caf3",
+            "filesize": 1992294400,
+            "download_url": "http://www.zeroshell.org/download/",
+            "direct_download_url": "http://www.zeroshell.net/listing/ZeroShell-3.9.3-X86-USB.img.gz",
+            "compression": "gzip"
+        },
         {
             "filename": "ZeroShell-3.8.2-X86-USB.img",
             "version": "3.8.2",
@@ -58,6 +67,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "3.9.3",
+            "images": {
+                "hda_disk_image": "ZeroShell-3.9.3-X86-USB.img"
+            }
+        },
         {
             "name": "3.8.2",
             "images": {