diff --git a/appliances/fortiadc.gns3a b/appliances/fortiadc.gns3a
index f78da59..03d8524 100644
--- a/appliances/fortiadc.gns3a
+++ b/appliances/fortiadc.gns3a
@@ -34,6 +34,13 @@
             "filesize": 30998528,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-V500-build0442-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.2.2",
+            "md5sum": "7d959ed264b064716e8f1378fceed48f",
+            "filesize": 104857600,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-V500-build0423-FORTINET.out.kvm-boot.qcow2",
             "version": "5.2.0",
@@ -190,6 +197,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "5.2.2",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V500-build0442-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "5.2.0",
             "images": {
diff --git a/appliances/fortianalyzer.gns3a b/appliances/fortianalyzer.gns3a
index 297f7c4..1055e46 100644
--- a/appliances/fortianalyzer.gns3a
+++ b/appliances/fortianalyzer.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
+            "version": "6.2.0",
+            "md5sum": "dc123116e4c816d8b4dee244bd671844",
+            "filesize": 140177408,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -148,6 +155,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.2.0",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.3",
             "images": {
diff --git a/appliances/fortiauthenticator.gns3a b/appliances/fortiauthenticator.gns3a
index 19c7c67..382eeba 100644
--- a/appliances/fortiauthenticator.gns3a
+++ b/appliances/fortiauthenticator.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAC_VM_KVM-v6-build0010-FORTINET.out.kvm.qcow2",
+            "version": "6.0.0",
+            "md5sum": "6699c0b24e54dc6a5215ba3945abb364",
+            "filesize": 74317824,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAC_VM_KVM-v5-build0366-FORTINET.out.kvm.qcow2",
             "version": "5.5.0",
@@ -90,75 +97,82 @@
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
         {
-            "filename": "FAC_VM_KVM-v500-DATADRIVE.qcow2",
-            "version": "5.x.x",
+            "filename": "FAC_VM_KVM-ALL-DATADRIVE.qcow2",
+            "version": "All",
             "md5sum": "09bad6cfe6301930adbc829eb8a67149",
             "filesize": 258048,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         }
     ],
     "versions": [
+        {
+            "name": "6.0.0",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v6-build0010-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
+            }
+        },
         {
             "name": "5.5.0",
             "images": {
                 "hda_disk_image": "FAC_VM_KVM-v5-build0366-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
             }
         },
         {
             "name": "5.4.1",
             "images": {
                 "hda_disk_image": "FAC_VM_KVM-v5-build0297-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
             }
         },
         {
             "name": "5.2.2",
             "images": {
                 "hda_disk_image": "FAC_VM_KVM-v5-build0163-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
             }
         },
         {
             "name": "5.2.1",
             "images": {
                 "hda_disk_image": "FAC_VM_KVM-v500-build0161-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
             }
         },
         {
             "name": "5.2.0",
             "images": {
                 "hda_disk_image": "FAC_VM_KVM-v5-build0155-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
             }
         },
         {
             "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"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-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"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-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"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
             }
         },
         {
             "name": "5.0.0",
             "images": {
                 "hda_disk_image": "FAC_VM_KVM-v500-build0012-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
             }
         }
     ]
diff --git a/appliances/forticache.gns3a b/appliances/forticache.gns3a
index faeeb95..38ccaaa 100644
--- a/appliances/forticache.gns3a
+++ b/appliances/forticache.gns3a
@@ -26,6 +26,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FCHKVM-v400-build0230-FORTINET.out.kvm.qcow2",
+            "version": "4.2.9",
+            "md5sum": "a3583f162004da2f1e0b751e7b23504a",
+            "filesize": 27672576,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FCHKVM-v400-build0226-FORTINET.out.kvm.qcow2",
             "version": "4.2.8",
@@ -113,6 +120,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.2.9",
+            "images": {
+                "hda_disk_image": "FCHKVM-v400-build0230-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
         {
             "name": "4.2.8",
             "images": {
diff --git a/appliances/fortigate.gns3a b/appliances/fortigate.gns3a
index 8fdb612..f9c5e65 100644
--- a/appliances/fortigate.gns3a
+++ b/appliances/fortigate.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "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-build0200-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -218,6 +225,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.2.0",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build0866-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.3",
             "images": {
diff --git a/appliances/fortimail.gns3a b/appliances/fortimail.gns3a
index a61711e..511cf51 100644
--- a/appliances/fortimail.gns3a
+++ b/appliances/fortimail.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FML_VMKV-64-v60-build0143-FORTINET.out.kvm.qcow2",
+            "version": "6.0.4",
+            "md5sum": "e6401ecfe9b145256cccb29757bbddfe",
+            "filesize": 98959360,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FML_VMKV-64-v60-build0126-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -162,6 +169,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.0.4",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v60-build0143-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.3",
             "images": {
diff --git a/appliances/fortimanager.gns3a b/appliances/fortimanager.gns3a
index 7003ecb..a0347aa 100644
--- a/appliances/fortimanager.gns3a
+++ b/appliances/fortimanager.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FMG_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
+            "version": "6.2.0",
+            "md5sum": "c19d2527f91ad1bbafbde5bf08487867",
+            "filesize": 126894080,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -142,9 +149,9 @@
     ],
     "versions": [
         {
-            "name": "6.0.3",
+            "name": "6.2.0",
             "images": {
-                "hda_disk_image": "FMG_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
+                "hda_disk_image": "FMG_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
diff --git a/appliances/fortiproxy.gns3a b/appliances/fortiproxy.gns3a
index 3c1332c..03e39fd 100644
--- a/appliances/fortiproxy.gns3a
+++ b/appliances/fortiproxy.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FPX_KVM-v100-build0162-FORTINET.out.kvm.qcow2",
+            "version": "1.1.2",
+            "md5sum": "00db4c04fcc4ac0d7c389a86c71d20a5",
+            "filesize": 44601344,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FPX_KVM-v100-build0147-FORTINET.out.kvm.qcow2",
             "version": "1.1.0",
@@ -43,6 +50,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "1.1.2",
+            "images": {
+                "hda_disk_image": "FPX_KVM-v100-build0162-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "1.1.0",
             "images": {
diff --git a/appliances/fortirecorder.gns3a b/appliances/fortirecorder.gns3a
index 0940c71..fe2a115 100644
--- a/appliances/fortirecorder.gns3a
+++ b/appliances/fortirecorder.gns3a
@@ -27,7 +27,14 @@
     },
     "images": [
         {
-            "filename": "fortirecorder-FRC_VMKV-64-v26-build0607-FORTINET.out.kvm.qcow2",
+            "filename": "FRC_VMKV-64-v27-build0700-FORTINET.out.kvm.qcow2",
+            "version": "2.7.1",
+            "md5sum": "3736c66af7d958fc672fe29439b405b8",
+            "filesize": 79429632,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FRC_VMKV-64-v26-build0607-FORTINET.out.kvm.qcow2",
             "version": "2.6.3",
             "md5sum": "ffa5d42119de576631673516f60e028b",
             "filesize": 63569920,
@@ -43,10 +50,17 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.7.1",
+            "images": {
+                "hda_disk_image": "FRC_VMKV-64-v27-build0700-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "2.6.3",
             "images": {
-                "hda_disk_image": "fortirecorder-FRC_VMKV-64-v26-build0607-FORTINET.out.kvm.qcow2",
+                "hda_disk_image": "FRC_VMKV-64-v26-build0607-FORTINET.out.kvm.qcow2",
                 "hdb_disk_image": "empty30G.qcow2"
             }
         }
diff --git a/appliances/fortisandbox.gns3a b/appliances/fortisandbox.gns3a
index 64eba9f..e022265 100644
--- a/appliances/fortisandbox.gns3a
+++ b/appliances/fortisandbox.gns3a
@@ -27,6 +27,13 @@
         "options": "-smp 2"
     },
     "images": [
+        {
+            "filename": "FSA_KVM-v300-build0060-FORTINET.out.kvm.qcow2",
+            "version": "3.0.4",
+            "md5sum": "7e744c4d62430917aea4533672710b5a",
+            "filesize": 157221376,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FSA_KVM-v300-build0049-FORTINET.out.kvm.qcow2",
             "version": "3.0.3",
@@ -92,13 +99,20 @@
         },
         {
             "filename": "FSA-datadrive.qcow2",
-            "version": "2.x",
+            "version": "All",
             "md5sum": "f2dc0a8fc7591699c364aff400369157",
             "filesize": 200192,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         }
     ],
     "versions": [
+        {
+            "name": "3.0.4",
+            "images": {
+                "hda_disk_image": "FSA_KVM-v300-build0060-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FSA-datadrive.qcow2"
+            }
+        },
         {
             "name": "3.0.3",
             "images": {
diff --git a/appliances/fortisiem-super_worker.gns3a b/appliances/fortisiem-super_worker.gns3a
index 52156bc..d622309 100644
--- a/appliances/fortisiem-super_worker.gns3a
+++ b/appliances/fortisiem-super_worker.gns3a
@@ -28,6 +28,27 @@
         "options": "-smp 4"
     },
     "images": [
+        {
+            "filename": "FortiSIEM-VA-5.2.1.1553-OS.qcow2",
+            "version": "5.2.1",
+            "md5sum": "9dc3f4a9614b65c83d3e9733248cbcea",
+            "filesize": 3902208000,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.2.1.1553-CMDB.qcow2",
+            "version": "5.2.1",
+            "md5sum": "ea3f69191eb803cdf021227ec666bf7b",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.2.1.1553-SVN.qcow2",
+            "version": "5.2.1",
+            "md5sum": "eff32e40baf6ede7bc57ad8d241812ad",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
         {
             "filename": "FortiSIEM-VA-5.1.0.1336.qcow2",
             "version": "5.1.0",
@@ -114,6 +135,14 @@
         }
     ],
     "versions": [
+        {
+            "name": "5.2.1",
+            "images": {
+                "hda_disk_image": "FortiSIEM-VA-5.2.1.1553-OS.qcow2",
+                "hdb_disk_image": "FortiSIEM-VA-5.2.1.1553-CMDB.qcow2",
+                "hdc_disk_image": "FortiSIEM-VA-5.2.1.1553-SVN.qcow2"
+            }
+        },
         {
             "name": "5.1.0",
             "images": {
diff --git a/appliances/fortiweb.gns3a b/appliances/fortiweb.gns3a
index ebfdeac..c365d84 100644
--- a/appliances/fortiweb.gns3a
+++ b/appliances/fortiweb.gns3a
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FWB_KVM-v600-build0383-FORTINET.out.kvm.qcow2",
+            "version": "6.1.0",
+            "md5sum": "d2dbbde9f03eb716a54119cc3e6055c4",
+            "filesize": 190120448,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FWB_KVM-v600-build0056-FORTINET.out.kvm.qcow2",
             "version": "6.0.2",
@@ -107,6 +114,13 @@
 
     ],
     "versions": [
+        {
+            "name": "6.1.0",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v600-build0383-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.2",
             "images": {