diff --git a/gns3server/appliances/IPCop.gns3a b/gns3server/appliances/IPCop.gns3a
index 98476d38..929eb6ef 100644
--- a/gns3server/appliances/IPCop.gns3a
+++ b/gns3server/appliances/IPCop.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://www.kali.org/",
     "documentation_url": "http://www.ipcop.org/docs.html",
     "product_name": "IP Cop",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Brent Stewart",
     "maintainer_email": "brent@stewart.tc",
diff --git a/gns3server/appliances/a10-vthunder.gns3a b/gns3server/appliances/a10-vthunder.gns3a
index ec9ec434..ad00c68f 100644
--- a/gns3server/appliances/a10-vthunder.gns3a
+++ b/gns3server/appliances/a10-vthunder.gns3a
@@ -7,8 +7,8 @@
     "vendor_url": "https://www.a10networks.com/",
     "documentation_url": "https://www.a10networks.com/support",
     "product_name": "A10 vThunder",
-    "product_url": "https://www.a10networks.com/products/thunder-series-appliances/vthunder-virtualized-application_delivery_controller/",
-    "registry_version": 3,
+    "product_url": "https://www.a10networks.com/products/vthunder-trial/",
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/aaa.gns3a b/gns3server/appliances/aaa.gns3a
index 7bb024ad..ea702a91 100644
--- a/gns3server/appliances/aaa.gns3a
+++ b/gns3server/appliances/aaa.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Ubuntu",
     "vendor_url": "https://www.ubuntu.com/",
     "product_name": "AAA",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Andras Dosztal",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/alcatel-7750.gns3a b/gns3server/appliances/alcatel-7750.gns3a
index 872006d8..b002d2b7 100644
--- a/gns3server/appliances/alcatel-7750.gns3a
+++ b/gns3server/appliances/alcatel-7750.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.alcatel-lucent.com/support",
     "product_name": "Alcatel 7750",
     "product_url": "https://www.alcatel-lucent.com/products/7750-service-router",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/almalinux.gns3a b/gns3server/appliances/almalinux.gns3a
index 109e9673..78c7cf43 100644
--- a/gns3server/appliances/almalinux.gns3a
+++ b/gns3server/appliances/almalinux.gns3a
@@ -25,12 +25,12 @@
     },
     "images": [
         {
-            "filename": "AlmaLinux-8-GenericCloud-8.5-20211119.x86_64.qcow2",
-            "version": "8.5",
-            "md5sum": "a64ece809ae06180ac59cfa622d98af0",
-            "filesize": 561774592,
+            "filename": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
+            "version": "8.7",
+            "md5sum": "b2b8c7fd3b6869362f3f8ed47549c804",
+            "filesize": 566231040,
             "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.5-20211119.x86_64.qcow2"
+            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
         },
         {
             "filename": "almalinux-cloud-init-data.iso",
@@ -42,9 +42,9 @@
     ],
     "versions": [
         {
-            "name": "8.5",
+            "name": "8.7",
             "images": {
-                "hda_disk_image": "AlmaLinux-8-GenericCloud-8.5-20211119.x86_64.qcow2",
+                "hda_disk_image": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
                 "cdrom_image": "almalinux-cloud-init-data.iso"
             }
         }
diff --git a/gns3server/appliances/alpine-linux-virt.gns3a b/gns3server/appliances/alpine-linux-virt.gns3a
index d7c2883d..fcfc7bf6 100644
--- a/gns3server/appliances/alpine-linux-virt.gns3a
+++ b/gns3server/appliances/alpine-linux-virt.gns3a
@@ -12,7 +12,7 @@
     "availability": "free",
     "maintainer": "Adnan RIHAN",
     "maintainer_email": "adnan@rihan.fr",
-    "usage": "Autologin is enabled as \"root\" with no password.\n\nThe network interfaces aren't configured, you can do either of the following:\n- Use alpine's DHCP client: `udhcpc`\n- Configure them manually (ip address add …, ip route add …)\n- Modify interfaces file in /etc/network/interfaces\n- Use alpine's wizard: `setup-interfaces`",
+    "usage": "Autologin is enabled as \"root\" with no password.\n\nThe network interfaces aren't configured, you can do either of the following:\n- Use alpine's DHCP client: `udhcpc`\n- Configure them manually (ip address add \u2026, ip route add \u2026)\n- Modify interfaces file in /etc/network/interfaces\n- Use alpine's wizard: `setup-interfaces`",
     "symbol": "alpine-virt-qemu.svg",
     "port_name_format": "eth{0}",
     "qemu": {
diff --git a/gns3server/appliances/alpine-linux.gns3a b/gns3server/appliances/alpine-linux.gns3a
index 590e740b..4ad16883 100644
--- a/gns3server/appliances/alpine-linux.gns3a
+++ b/gns3server/appliances/alpine-linux.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://alpinelinux.org",
     "documentation_url": "http://wiki.alpinelinux.org",
     "product_name": "Alpine Linux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/arista-ceos.gns3a b/gns3server/appliances/arista-ceos.gns3a
index 2fbd791a..afabdb61 100644
--- a/gns3server/appliances/arista-ceos.gns3a
+++ b/gns3server/appliances/arista-ceos.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Arista",
     "vendor_url": "http://www.arista.com/",
     "product_name": "cEOS",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/arista-veos.gns3a b/gns3server/appliances/arista-veos.gns3a
index 5d75152c..2ec349b7 100644
--- a/gns3server/appliances/arista-veos.gns3a
+++ b/gns3server/appliances/arista-veos.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.arista.com/assets/data/docs/Manuals/EOS-4.17.2F-Manual.pdf",
     "product_name": "vEOS",
     "product_url": "https://eos.arista.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/aruba-arubaoscx.gns3a b/gns3server/appliances/aruba-arubaoscx.gns3a
index 39afe6a6..8acf9467 100644
--- a/gns3server/appliances/aruba-arubaoscx.gns3a
+++ b/gns3server/appliances/aruba-arubaoscx.gns3a
@@ -36,7 +36,7 @@
             "md5sum": "40f9ddf1e12640376af443b5d982f2f6",
             "filesize": 356162560,
             "download_url": "https://asp.arubanetworks.com/"
-        },    
+        },
         {
             "filename": "arubaoscx-disk-image-genericx86-p4-20220616193419.vmdk",
             "version": "10.10.0002",
diff --git a/gns3server/appliances/asterisk.gns3a b/gns3server/appliances/asterisk.gns3a
index e89cec7b..00ba3950 100644
--- a/gns3server/appliances/asterisk.gns3a
+++ b/gns3server/appliances/asterisk.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://wiki.asterisk.org/wiki/display/AST/Installing+AsteriskNOW",
     "product_name": "AsteriskNOW / FreePBX",
     "product_url": "http://www.asterisk.org/downloads/asterisknow",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/bigswitch-bigcloud-fabric.gns3a b/gns3server/appliances/bigswitch-bigcloud-fabric.gns3a
index 96d907b4..c6db4d64 100644
--- a/gns3server/appliances/bigswitch-bigcloud-fabric.gns3a
+++ b/gns3server/appliances/bigswitch-bigcloud-fabric.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.bigswitch.com/support",
     "product_name": "Big Cloud Fabric",
     "product_url": "http://www.bigswitch.com/sdn-products/big-cloud-fabrictm",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/bird.gns3a b/gns3server/appliances/bird.gns3a
index 688f072e..ac4dac99 100644
--- a/gns3server/appliances/bird.gns3a
+++ b/gns3server/appliances/bird.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://bird.network.cz/",
     "documentation_url": "http://bird.network.cz/?get_doc&f=bird.html",
     "product_name": "BIRD internet routing daemon",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/brocade-vadx.gns3a b/gns3server/appliances/brocade-vadx.gns3a
index dc8c85ae..806176ea 100644
--- a/gns3server/appliances/brocade-vadx.gns3a
+++ b/gns3server/appliances/brocade-vadx.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Brocade",
     "vendor_url": "https://www.brocade.com",
     "product_name": "Virtual ADX",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/brocade-vrouter.gns3a b/gns3server/appliances/brocade-vrouter.gns3a
index 98c33d53..6665582c 100644
--- a/gns3server/appliances/brocade-vrouter.gns3a
+++ b/gns3server/appliances/brocade-vrouter.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.brocade.com/en/products-services/software-networking/network-functions-virtualization/vrouter.html",
     "product_name": "vRouter",
     "product_url": "http://www.brocade.com/en/products-services/software-networking/network-functions-virtualization/vrouter.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/brocade-vtm.gns3a b/gns3server/appliances/brocade-vtm.gns3a
index 08510a06..42f505fd 100644
--- a/gns3server/appliances/brocade-vtm.gns3a
+++ b/gns3server/appliances/brocade-vtm.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.brocade.com/en/products-services/software-networking/application-delivery-controllers/virtual-traffic-manager.html",
     "product_name": "vTM DE",
     "product_url": "http://www.brocade.com/en/products-services/software-networking/application-delivery-controllers/virtual-traffic-manager.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/bsdrp.gns3a b/gns3server/appliances/bsdrp.gns3a
index eadbaf67..f3f84494 100644
--- a/gns3server/appliances/bsdrp.gns3a
+++ b/gns3server/appliances/bsdrp.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Olivier Cochard-Labbe",
     "vendor_url": "https://bsdrp.net/",
     "product_name": "BSDRP",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/centos-cloud.gns3a b/gns3server/appliances/centos-cloud.gns3a
index 4e2232ec..52bfd90f 100644
--- a/gns3server/appliances/centos-cloud.gns3a
+++ b/gns3server/appliances/centos-cloud.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://wiki.centos.org/Documentation",
     "product_name": "Centos Cloud",
     "product_url": "https://wiki.centos.org/Cloud",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/chromium.gns3a b/gns3server/appliances/chromium.gns3a
index e109c79a..1b3d0e80 100644
--- a/gns3server/appliances/chromium.gns3a
+++ b/gns3server/appliances/chromium.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Chromium",
     "vendor_url": "https://www.chromium.org/",
     "product_name": "Chromium",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-1700.gns3a b/gns3server/appliances/cisco-1700.gns3a
index c136b7c4..65577819 100644
--- a/gns3server/appliances/cisco-1700.gns3a
+++ b/gns3server/appliances/cisco-1700.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/index.html",
     "product_name": "1700",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-2600.gns3a b/gns3server/appliances/cisco-2600.gns3a
index 817e8584..d565a086 100644
--- a/gns3server/appliances/cisco-2600.gns3a
+++ b/gns3server/appliances/cisco-2600.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/index.html",
     "product_name": "2600",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-2691.gns3a b/gns3server/appliances/cisco-2691.gns3a
index cc6123bf..2fd995e6 100644
--- a/gns3server/appliances/cisco-2691.gns3a
+++ b/gns3server/appliances/cisco-2691.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/index.html",
     "product_name": "2691",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-3620.gns3a b/gns3server/appliances/cisco-3620.gns3a
index 97477e61..9519d072 100644
--- a/gns3server/appliances/cisco-3620.gns3a
+++ b/gns3server/appliances/cisco-3620.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/index.html",
     "product_name": "3620",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-3640.gns3a b/gns3server/appliances/cisco-3640.gns3a
index 71b3f90b..bcfff3fd 100644
--- a/gns3server/appliances/cisco-3640.gns3a
+++ b/gns3server/appliances/cisco-3640.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/index.html",
     "product_name": "3640",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-3660.gns3a b/gns3server/appliances/cisco-3660.gns3a
index 57f2c551..ebb1f34b 100644
--- a/gns3server/appliances/cisco-3660.gns3a
+++ b/gns3server/appliances/cisco-3660.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/index.html",
     "product_name": "3660",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-3725.gns3a b/gns3server/appliances/cisco-3725.gns3a
index 6eeafb06..1b0c7b3c 100644
--- a/gns3server/appliances/cisco-3725.gns3a
+++ b/gns3server/appliances/cisco-3725.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/index.html",
     "product_name": "3725",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-3745.gns3a b/gns3server/appliances/cisco-3745.gns3a
index f48765a0..d0c6f240 100644
--- a/gns3server/appliances/cisco-3745.gns3a
+++ b/gns3server/appliances/cisco-3745.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/support/routers/3745-multiservice-access-router/model.html",
     "product_name": "3745",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-7200.gns3a b/gns3server/appliances/cisco-7200.gns3a
index 59371e21..43799ad4 100644
--- a/gns3server/appliances/cisco-7200.gns3a
+++ b/gns3server/appliances/cisco-7200.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com",
     "documentation_url": "http://www.cisco.com/c/en/us/products/routers/7200-series-routers/index.html",
     "product_name": "7200",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-asa.gns3a b/gns3server/appliances/cisco-asa.gns3a
index 1227a674..92b9e082 100644
--- a/gns3server/appliances/cisco-asa.gns3a
+++ b/gns3server/appliances/cisco-asa.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com/",
     "product_name": "ASA",
     "product_url": "http://www.cisco.com/c/en/us/products/security/adaptive-security-appliance-asa-software/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "broken",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-asav.gns3a b/gns3server/appliances/cisco-asav.gns3a
index 31b695d0..0d16abf1 100644
--- a/gns3server/appliances/cisco-asav.gns3a
+++ b/gns3server/appliances/cisco-asav.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/support/security/virtual-adaptive-security-appliance-firewall/products-installation-guides-list.html",
     "product_name": "ASAv",
     "product_url": "http://www.cisco.com/c/en/us/products/security/virtual-adaptive-security-appliance-firewall/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
@@ -26,7 +26,7 @@
         "kvm": "require"
     },
     "images": [
-	    {
+        {
             "filename": "asav9-16-2.qcow2",
             "version": "9.16.2 CML",
             "md5sum": "1f8db97063a7f738fddc81ac880a906c",
diff --git a/gns3server/appliances/cisco-c8000v.gns3a b/gns3server/appliances/cisco-c8000v.gns3a
index 14ab53c8..17622681 100644
--- a/gns3server/appliances/cisco-c8000v.gns3a
+++ b/gns3server/appliances/cisco-c8000v.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.cisco.com/c/en/us/td/docs/routers/C8000V/Configuration/c8000v-installation-configuration-guide.html",
     "product_name": "c8000v",
     "product_url": "https://www.cisco.com/c/en/us/support/routers/catalyst-8000v-edge-software/series.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-csr1000v.gns3a b/gns3server/appliances/cisco-csr1000v.gns3a
index 0d062d3c..135367c6 100644
--- a/gns3server/appliances/cisco-csr1000v.gns3a
+++ b/gns3server/appliances/cisco-csr1000v.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/support/routers/cloud-services-router-1000v-series/products-installation-and-configuration-guides-list.html",
     "product_name": "CSR1000v",
     "product_url": "http://www.cisco.com/c/en/us/support/routers/cloud-services-router-1000v-series/tsd-products-support-series-home.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-dcnm.gns3a b/gns3server/appliances/cisco-dcnm.gns3a
index 4942faa7..8599150c 100644
--- a/gns3server/appliances/cisco-dcnm.gns3a
+++ b/gns3server/appliances/cisco-dcnm.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/support/cloud-systems-management/data-center-network-manager-10/model.html",
     "product_name": "DCNM",
     "product_url": "http://www.cisco.com/c/en/us/products/cloud-systems-management/prime-data-center-network-manager/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-iosv.gns3a b/gns3server/appliances/cisco-iosv.gns3a
index 8cfd5dc9..254653cc 100644
--- a/gns3server/appliances/cisco-iosv.gns3a
+++ b/gns3server/appliances/cisco-iosv.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com/",
     "product_name": "IOSv",
     "product_url": "http://virl.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-iosvl2.gns3a b/gns3server/appliances/cisco-iosvl2.gns3a
index 821ca78d..0a9e5e6f 100644
--- a/gns3server/appliances/cisco-iosvl2.gns3a
+++ b/gns3server/appliances/cisco-iosvl2.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com/",
     "product_name": "IOSvL2",
     "product_url": "http://virl.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-iosxrv.gns3a b/gns3server/appliances/cisco-iosxrv.gns3a
index 53fd8ad9..c6045502 100644
--- a/gns3server/appliances/cisco-iosxrv.gns3a
+++ b/gns3server/appliances/cisco-iosxrv.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/td/docs/ios_xr_sw/ios_xrv/release/notes/xrv-rn.html",
     "product_name": "IOS XRv",
     "product_url": "http://virl.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-iosxrv9k.gns3a b/gns3server/appliances/cisco-iosxrv9k.gns3a
index c1a8930a..18f0551c 100644
--- a/gns3server/appliances/cisco-iosxrv9k.gns3a
+++ b/gns3server/appliances/cisco-iosxrv9k.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/td/docs/ios_xr_sw/ios_xrv/release/notes/xrv-rn.html",
     "product_name": "IOS XRv 9000",
     "product_url": "http://virl.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-iou-l2.gns3a b/gns3server/appliances/cisco-iou-l2.gns3a
index 2f6ace04..a30ce59d 100644
--- a/gns3server/appliances/cisco-iou-l2.gns3a
+++ b/gns3server/appliances/cisco-iou-l2.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com",
     "product_name": "Cisco IOU L2",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-iou-l3.gns3a b/gns3server/appliances/cisco-iou-l3.gns3a
index 3b0ac2f0..385c9c4e 100644
--- a/gns3server/appliances/cisco-iou-l3.gns3a
+++ b/gns3server/appliances/cisco-iou-l3.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com",
     "product_name": "Cisco IOU L3",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-nxosv.gns3a b/gns3server/appliances/cisco-nxosv.gns3a
index b49a026d..c43f2a35 100644
--- a/gns3server/appliances/cisco-nxosv.gns3a
+++ b/gns3server/appliances/cisco-nxosv.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.cisco.com/",
     "product_name": "NX-OSv",
     "product_url": "http://virl.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-nxosv9k.gns3a b/gns3server/appliances/cisco-nxosv9k.gns3a
index 9c4516e8..19bc1d79 100644
--- a/gns3server/appliances/cisco-nxosv9k.gns3a
+++ b/gns3server/appliances/cisco-nxosv9k.gns3a
@@ -184,7 +184,7 @@
                 "hda_disk_image": "nexus9500v64.10.1.1.qcow2"
             }
         },
-		{
+        {
             "name": "9300v 9.3.8",
             "images": {
                 "bios_image": "OVMF-20160813.fd",
diff --git a/gns3server/appliances/cisco-pyats.gns3a b/gns3server/appliances/cisco-pyats.gns3a
new file mode 100644
index 00000000..52aeb6e6
--- /dev/null
+++ b/gns3server/appliances/cisco-pyats.gns3a
@@ -0,0 +1,19 @@
+{
+    "appliance_id": "d9ce131e-ecdc-49d2-be7d-d883d3919a06",
+    "name": "Cisco PyATS",
+    "category": "guest",
+    "description": "pyATS is an end-to-end DevOps automation ecosystem. Agnostic by design, pyATS enable network engineers to automate their day-to-day DevOps activities, perform stateful validation of their device operational status, build a safety-net of scalable, data-driven and reusable tests around their network, and visualize everything in a modern, easy to use dashboard.",
+    "vendor_name": "Cisco",
+    "vendor_url": "https://cisco.com",
+    "product_name": "PyATS",
+    "product_url": "https://developer.cisco.com/pyats/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "Xander Petty",
+    "maintainer_email": "Xander.Petty@protonmail.com",
+    "docker": {
+        "adapters": 1,
+        "image": "gns3/pyats:latest",
+        "console_type": "telnet"
+    }
+}
diff --git a/gns3server/appliances/cisco-vWLC.gns3a b/gns3server/appliances/cisco-vWLC.gns3a
index d99504b1..a17374d7 100644
--- a/gns3server/appliances/cisco-vWLC.gns3a
+++ b/gns3server/appliances/cisco-vWLC.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/products/wireless/wireless-lan-controller/index.html",
     "product_name": "Virtual Wireless LAN Controller",
     "product_url": "http://www.cisco.com/c/en/us/support/wireless/virtual-wireless-controller/tsd-products-support-series-home.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cisco-wsav.gns3a b/gns3server/appliances/cisco-wsav.gns3a
index 85b08b31..eec913b0 100644
--- a/gns3server/appliances/cisco-wsav.gns3a
+++ b/gns3server/appliances/cisco-wsav.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/support/security/web-security-appliance/tsd-products-support-series-home.html",
     "product_name": "Web Security Virtual Appliance",
     "product_url": "http://www.cisco.com/c/en/us/products/security/web-security-appliance/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/citrix-netscaler-vpx.gns3a b/gns3server/appliances/citrix-netscaler-vpx.gns3a
index bd1402c3..3b1ad054 100644
--- a/gns3server/appliances/citrix-netscaler-vpx.gns3a
+++ b/gns3server/appliances/citrix-netscaler-vpx.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.citrix.com/products/netscaler-adc/support.html",
     "product_name": "NetScaler VPX",
     "product_url": "https://www.citrix.com/products/netscaler-adc/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/citrix-sd-wan.gns3a b/gns3server/appliances/citrix-sd-wan.gns3a
index a2d67c49..a4bcdca1 100644
--- a/gns3server/appliances/citrix-sd-wan.gns3a
+++ b/gns3server/appliances/citrix-sd-wan.gns3a
@@ -2,7 +2,7 @@
     "appliance_id": "2d5634dc-ad39-46cf-a2fd-17b291abab91",
     "name": "Citrix SD-WAN",
     "category": "router",
-    "description": "A software-defined wide area network (SD-WAN) is a virtual WAN architecture, in which any blend of network transport types — not only multiprotocol label switching (MPLS) but also broadband internet, cellular, and satellite — can be virtualized and bonded then centrally managed in software, to securely connect users to applications and desktops in accordance with policy. Essentially, SD-WAN is software-defined networking (SDN) for the WAN.",
+    "description": "A software-defined wide area network (SD-WAN) is a virtual WAN architecture, in which any blend of network transport types \u2014 not only multiprotocol label switching (MPLS) but also broadband internet, cellular, and satellite \u2014 can be virtualized and bonded then centrally managed in software, to securely connect users to applications and desktops in accordance with policy. Essentially, SD-WAN is software-defined networking (SDN) for the WAN.",
     "vendor_name": "Citrix",
     "vendor_url": "http://www.citrix.com/",
     "documentation_url": "https://docs.citrix.com/en-us/citrix-sd-wan",
diff --git a/gns3server/appliances/citrix-sdwan-center.gns3a b/gns3server/appliances/citrix-sdwan-center.gns3a
index a8761d6b..d0e14124 100644
--- a/gns3server/appliances/citrix-sdwan-center.gns3a
+++ b/gns3server/appliances/citrix-sdwan-center.gns3a
@@ -18,7 +18,7 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 4,
         "ram": 8192,
-	"cpus": 4,
+        "cpus": 4,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
diff --git a/gns3server/appliances/clavister-netsheild.gns3a b/gns3server/appliances/clavister-netsheild.gns3a
index f9ac0f11..b60b2c7f 100644
--- a/gns3server/appliances/clavister-netsheild.gns3a
+++ b/gns3server/appliances/clavister-netsheild.gns3a
@@ -18,7 +18,7 @@
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 4,
-        "ram": 1024,      
+        "ram": 1024,
         "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
@@ -37,10 +37,10 @@
     ],
     "versions": [
         {
+            "name": "cOS Stream 3.80.09",
             "images": {
                 "hda_disk_image": "clavister-cos-stream-3.80.09.01-virtual-x64-generic.qcow2"
-            },
-            "name": "cOS Stream 3.80.09"
+            }
         }
     ]
 }
diff --git a/gns3server/appliances/clavister-netwall.gns3a b/gns3server/appliances/clavister-netwall.gns3a
index 37d2e59e..b7c37ccf 100644
--- a/gns3server/appliances/clavister-netwall.gns3a
+++ b/gns3server/appliances/clavister-netwall.gns3a
@@ -43,16 +43,16 @@
     ],
     "versions": [
         {
+            "name": "cOS Core 14.00.01 (x86)",
             "images": {
                 "hda_disk_image": "clavister-cos-core-14.00.01.13-kvm-en.img"
-            },
-            "name": "cOS Core 14.00.01 (x86)"
+            }
         },
         {
+            "name": "cOS Core 14.00.00 (x86)",
             "images": {
                 "hda_disk_image": "clavister-cos-core-14.00.00.12-kvm-en.img"
-            },
-            "name": "cOS Core 14.00.00 (x86)"
+            }
         }
     ]
 }
diff --git a/gns3server/appliances/clearos.gns3a b/gns3server/appliances/clearos.gns3a
index 8ec83838..2736d98f 100644
--- a/gns3server/appliances/clearos.gns3a
+++ b/gns3server/appliances/clearos.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.clearos.com/resources/documentation/clearos-7-documentation-overview",
     "product_name": "ClearOS CE",
     "product_url": "https://www.clearos.com/clearfoundation/software/clearos-7-community",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cloudrouter.gns3a b/gns3server/appliances/cloudrouter.gns3a
index b6d6b9f5..20c72ca2 100644
--- a/gns3server/appliances/cloudrouter.gns3a
+++ b/gns3server/appliances/cloudrouter.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://cloudrouter.atlassian.net/wiki/display/CPD/CloudRouter+Project+Information",
     "product_name": "CloudRouter",
     "product_url": "https://cloudrouter.org/about/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/coreos.gns3a b/gns3server/appliances/coreos.gns3a
index babf9f1b..cdd5d0cf 100644
--- a/gns3server/appliances/coreos.gns3a
+++ b/gns3server/appliances/coreos.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://coreos.com/",
     "documentation_url": "https://coreos.com/docs/",
     "product_name": "CoreOS",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/cumulus-vx.gns3a b/gns3server/appliances/cumulus-vx.gns3a
index b9729df3..09506642 100644
--- a/gns3server/appliances/cumulus-vx.gns3a
+++ b/gns3server/appliances/cumulus-vx.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.cumulusnetworks.com/",
     "product_name": "Cumulus VX",
     "product_url": "https://cumulusnetworks.com/cumulus-vx/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/debian.gns3a b/gns3server/appliances/debian.gns3a
index 0ab950ca..6bee9798 100644
--- a/gns3server/appliances/debian.gns3a
+++ b/gns3server/appliances/debian.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Debian",
     "vendor_url": "https://www.debian.org",
     "product_name": "Debian",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/deft-linux.gns3a b/gns3server/appliances/deft-linux.gns3a
index 0c39a22c..27bf051a 100644
--- a/gns3server/appliances/deft-linux.gns3a
+++ b/gns3server/appliances/deft-linux.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.deftlinux.net/",
     "documentation_url": "http://www.deftlinux.net/deft-manual/",
     "product_name": "DEFT Linux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/dell-ftos.gns3a b/gns3server/appliances/dell-ftos.gns3a
index 79314dcf..763d0e81 100644
--- a/gns3server/appliances/dell-ftos.gns3a
+++ b/gns3server/appliances/dell-ftos.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.dell.com/",
     "product_name": "Dell OS9",
     "product_url": "http://www.dell.com/us/business/p/open-platform-software/pd",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/dns.gns3a b/gns3server/appliances/dns.gns3a
index fb9cbcc2..cc81b0f1 100644
--- a/gns3server/appliances/dns.gns3a
+++ b/gns3server/appliances/dns.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Ubuntu",
     "vendor_url": "https://www.ubuntu.com/",
     "product_name": "DNS",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Andras Dosztal",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/empty-vm.gns3a b/gns3server/appliances/empty-vm.gns3a
index 8e2ac20f..52f73331 100644
--- a/gns3server/appliances/empty-vm.gns3a
+++ b/gns3server/appliances/empty-vm.gns3a
@@ -18,9 +18,9 @@
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 1024,
+        "hda_disk_interface": "sata",
         "arch": "x86_64",
         "console_type": "vnc",
-		    "hda_disk_interface": "sata",
         "boot_priority": "d",
         "kvm": "allow"
     },
@@ -33,7 +33,7 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
             "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty8G.qcow2/download"
         },
-		    {
+        {
             "filename": "empty30G.qcow2",
             "version": "30G",
             "md5sum": "3411a599e822f2ac6be560a26405821a",
@@ -41,7 +41,7 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
             "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         },
-		    {
+        {
             "filename": "empty100G.qcow2",
             "version": "100G",
             "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
@@ -77,11 +77,11 @@
                 "hda_disk_image": "empty100G.qcow2"
             }
         },
-		    {
+        {
             "name": "200G",
             "images": {
                 "hda_disk_image": "empty200G.qcow2"
             }
         }
-	]
+    ]
 }
diff --git a/gns3server/appliances/exos.gns3a b/gns3server/appliances/exos.gns3a
index 4b67b8ac..8132452e 100644
--- a/gns3server/appliances/exos.gns3a
+++ b/gns3server/appliances/exos.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://www.extremenetworks.com",
     "documentation_url": "https://www.extremenetworks.com/support/documentation",
     "product_name": "EXOS VM",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Extreme Networks",
     "maintainer_email": "GitHubscripting@extremenetworks.com",
@@ -27,14 +27,14 @@
         "options": "-cpu core2duo"
     },
     "images": [
-	{
+        {
             "filename": "EXOS-VM_v32.1.1.6.qcow2",
             "version": "32.1.1.6",
             "md5sum": "48868bbcb4255d6365049b5941dd2af7",
             "filesize": 231211008,
             "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v32.1.1.6.qcow2"
         },
-	{
+        {
             "filename": "EXOS-VM_v31.7.1.4.qcow2",
             "version": "31.7.1.4",
             "md5sum": "a70e4fa3bc361434237ad12937aaf0fb",
diff --git a/gns3server/appliances/extreme-networks-voss.gns3a b/gns3server/appliances/extreme-networks-voss.gns3a
index 0246472e..b2d355ef 100644
--- a/gns3server/appliances/extreme-networks-voss.gns3a
+++ b/gns3server/appliances/extreme-networks-voss.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.extremenetworks.com",
     "documentation_url": "http://www.extremenetworks.com/support/documentation",
     "product_name": "VOSS_VM",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "Extreme Networks",
     "maintainer_email": "voss@extremenetworks.com",
@@ -32,7 +32,7 @@
             "version": "v8.8.0.0",
             "md5sum": "caa01094bad8ea5750261924b82ca746",
             "filesize": 348389376,
-			"direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.8.0.0.qcow2"
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.8.0.0.qcow2"
         },
         {
             "filename": "VOSSGNS3.8.4.0.0.qcow2",
@@ -87,8 +87,7 @@
     "versions": [
         {
             "name": "v8.8.0.0",
-            "images":
-            {
+            "images": {
                 "hda_disk_image": "VOSSGNS3.8.8.0.0.qcow2"
             }
         },
diff --git a/gns3server/appliances/f5-bigip.gns3a b/gns3server/appliances/f5-bigip.gns3a
index 6d2061f4..b04caac3 100644
--- a/gns3server/appliances/f5-bigip.gns3a
+++ b/gns3server/appliances/f5-bigip.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://support.f5.com/kb/en-us/products/big-ip_ltm/manuals/product/bigip-ve-kvm-setup-11-3-0.html",
     "product_name": "F5 BIG-IP LTM VE",
     "product_url": "https://f5.com/products/modules/local-traffic-manager",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/f5-bigiq.gns3a b/gns3server/appliances/f5-bigiq.gns3a
index 26517845..9a799e64 100644
--- a/gns3server/appliances/f5-bigiq.gns3a
+++ b/gns3server/appliances/f5-bigiq.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://support.f5.com/csp/#/knowledge-center/software/BIG-IQ?module=BIG-IQ%20Centralized%20Management",
     "product_name": "F5 BIG-IQ CM",
     "product_url": "https://f5.com/products/big-iq-centralized-management",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fedora-cloud.gns3a b/gns3server/appliances/fedora-cloud.gns3a
index 4a718196..9679fe69 100644
--- a/gns3server/appliances/fedora-cloud.gns3a
+++ b/gns3server/appliances/fedora-cloud.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://docs.fedoraproject.org/en-US/docs/",
     "product_name": "Fedora Cloud Base",
     "product_url": "https://alt.fedoraproject.org/cloud/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Da-Geek",
     "maintainer_email": "dageek@dageeks-geeks.gg",
@@ -42,7 +42,7 @@
         }
     ],
     "versions": [
-       {
+        {
             "name": "35-1.2",
             "images": {
                 "hda_disk_image": "Fedora-Cloud-Base-35-1.2.x86_64.qcow2",
diff --git a/gns3server/appliances/firefox.gns3a b/gns3server/appliances/firefox.gns3a
index 14fe1ba4..8e43cfd6 100644
--- a/gns3server/appliances/firefox.gns3a
+++ b/gns3server/appliances/firefox.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://support.mozilla.org",
     "product_name": "Firefox",
     "product_url": "https://www.mozilla.org/firefox",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortiadc-manager.gns3a b/gns3server/appliances/fortiadc-manager.gns3a
index d1df156f..f87882a1 100644
--- a/gns3server/appliances/fortiadc-manager.gns3a
+++ b/gns3server/appliances/fortiadc-manager.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://docs.fortinet.com/fortiadc-manager/",
     "product_name": "FortiADC Manager",
     "product_url": "https://www.fortinet.com/products/application-delivery-controller/fortiadc.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortiadc.gns3a b/gns3server/appliances/fortiadc.gns3a
index dce76870..4ba40af8 100644
--- a/gns3server/appliances/fortiadc.gns3a
+++ b/gns3server/appliances/fortiadc.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/fortiadc-d-series/admin-guides",
     "product_name": "FortiADC",
     "product_url": "https://www.fortinet.com/products-services/products/application-delivery-controllers/fortiadc.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
@@ -34,6 +34,27 @@
             "filesize": 30998528,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-v700-build0111-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.1.0",
+            "md5sum": "5977fe2e031dfa5759b7b2c9958eeb09",
+            "filesize": 134676480,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-v700-build0048-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.0.4",
+            "md5sum": "ea3329a7e18085838c83436ee7a6e3f8",
+            "filesize": 127664128,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-v600-build0237-FORTINET.out.kvm-boot.qcow2",
+            "version": "6.2.4",
+            "md5sum": "7cf30c1af4891e13b37e6a5c3933169f",
+            "filesize": 125304832,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-V500-build0655-FORTINET.out.kvm-boot.qcow2",
             "version": "5.3.3",
@@ -204,6 +225,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.1.0",
+            "images": {
+                "hda_disk_image": "FAD_KVM-v700-build0111-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "7.0.4",
+            "images": {
+                "hda_disk_image": "FAD_KVM-v700-build0048-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "6.2.4",
+            "images": {
+                "hda_disk_image": "FAD_KVM-v600-build0237-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "5.3.3",
             "images": {
diff --git a/gns3server/appliances/fortianalyzer.gns3a b/gns3server/appliances/fortianalyzer.gns3a
index 4ff054c5..96be826a 100644
--- a/gns3server/appliances/fortianalyzer.gns3a
+++ b/gns3server/appliances/fortianalyzer.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/fortianalyzer/",
     "product_name": "FortiAnalyzer",
     "product_url": "https://www.fortinet.com/products-services/products/management-reporting/fortianalyzer.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortiauthenticator.gns3a b/gns3server/appliances/fortiauthenticator.gns3a
index f766ad96..24ec0f4b 100644
--- a/gns3server/appliances/fortiauthenticator.gns3a
+++ b/gns3server/appliances/fortiauthenticator.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/fortiauthenticator/admin-guides",
     "product_name": "FortiAuthenticator",
     "product_url": "https://www.fortinet.com/products/identity-access-management/fortiauthenticator.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/forticache.gns3a b/gns3server/appliances/forticache.gns3a
index b2a6d037..c41ae745 100644
--- a/gns3server/appliances/forticache.gns3a
+++ b/gns3server/appliances/forticache.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/forticache/admin-guides",
     "product_name": "FortiCache",
     "product_url": "https://www.fortinet.com/products-services/products/wan-appliances/forticache.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortigate.gns3a b/gns3server/appliances/fortigate.gns3a
index 9e48f232..9b4df6b7 100644
--- a/gns3server/appliances/fortigate.gns3a
+++ b/gns3server/appliances/fortigate.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/p/inside-fortios",
     "product_name": "FortiGate",
     "product_url": "http://www.fortinet.com/products/fortigate/virtual-appliances.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortimail.gns3a b/gns3server/appliances/fortimail.gns3a
index 4d5cf111..d99765e4 100644
--- a/gns3server/appliances/fortimail.gns3a
+++ b/gns3server/appliances/fortimail.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/fortimail/admin-guides",
     "product_name": "FortiMail",
     "product_url": "http://www.fortinet.com/products/fortimail/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortimanager.gns3a b/gns3server/appliances/fortimanager.gns3a
index faf00d78..d0d304ea 100644
--- a/gns3server/appliances/fortimanager.gns3a
+++ b/gns3server/appliances/fortimanager.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/p/inside-fortios",
     "product_name": "FortiManager",
     "product_url": "http://www.fortinet.com/products/fortimanager/virtual-security-management.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortiproxy.gns3a b/gns3server/appliances/fortiproxy.gns3a
index a03f9cce..4782f4c1 100644
--- a/gns3server/appliances/fortiproxy.gns3a
+++ b/gns3server/appliances/fortiproxy.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://docs.fortinet.com/fortiproxy/",
     "product_name": "FortiProxy",
     "product_url": "https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/FortiProxy.pdf",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortirecorder.gns3a b/gns3server/appliances/fortirecorder.gns3a
index 9a1331d8..e38aff3f 100644
--- a/gns3server/appliances/fortirecorder.gns3a
+++ b/gns3server/appliances/fortirecorder.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://docs.fortinet.com/fortirecorder/",
     "product_name": "FortiRecorder",
     "product_url": "https://www.fortinet.com/products/network-based-video-security/forticam-fortirecorder.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortisandbox.gns3a b/gns3server/appliances/fortisandbox.gns3a
index 6fa98c51..7173fba2 100644
--- a/gns3server/appliances/fortisandbox.gns3a
+++ b/gns3server/appliances/fortisandbox.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/fortisandbox/admin-guides",
     "product_name": "FortiSandbox",
     "product_url": "https://www.fortinet.com/products/sandbox/fortisandbox.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortisiem-super_worker.gns3a b/gns3server/appliances/fortisiem-super_worker.gns3a
index 92c345d3..4500c4bf 100644
--- a/gns3server/appliances/fortisiem-super_worker.gns3a
+++ b/gns3server/appliances/fortisiem-super_worker.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/fortisiem/admin-guides",
     "product_name": "FortiSIEM",
     "product_url": "https://www.fortinet.com/products/siem/fortisiem.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/fortiweb.gns3a b/gns3server/appliances/fortiweb.gns3a
index 6a39036d..63eb984f 100644
--- a/gns3server/appliances/fortiweb.gns3a
+++ b/gns3server/appliances/fortiweb.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://docs.fortinet.com/fortiweb",
     "product_name": "FortiWeb",
     "product_url": "http://www.fortinet.com/products/fortiweb/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/freeRouter.gns3a b/gns3server/appliances/freeRouter.gns3a
index cc9b887b..ca53df88 100644
--- a/gns3server/appliances/freeRouter.gns3a
+++ b/gns3server/appliances/freeRouter.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://freerouter.nop.hu/",
     "product_name": "freeRouter",
     "product_url": "http://freerouter.nop.hu/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/freebsd.gns3a b/gns3server/appliances/freebsd.gns3a
index f05f2986..ad1821d5 100644
--- a/gns3server/appliances/freebsd.gns3a
+++ b/gns3server/appliances/freebsd.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.freebsd.org",
     "documentation_url": "https://www.freebsd.org/docs.html",
     "product_name": "FreeBSD",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/freenas.gns3a b/gns3server/appliances/freenas.gns3a
index 5d2a684a..55567d4a 100644
--- a/gns3server/appliances/freenas.gns3a
+++ b/gns3server/appliances/freenas.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://doc.freenas.org/9.10/freenas.html",
     "product_name": "FreeNAS",
     "product_url": "http://www.openfiler.com/products",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/frr.gns3a b/gns3server/appliances/frr.gns3a
index fc2ab658..0ab9a66a 100644
--- a/gns3server/appliances/frr.gns3a
+++ b/gns3server/appliances/frr.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "FRRouting Project",
     "vendor_url": "https://frrouting.org",
     "product_name": "FRR",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/hp-vsr1001.gns3a b/gns3server/appliances/hp-vsr1001.gns3a
index 015eb771..ccbc2c9c 100644
--- a/gns3server/appliances/hp-vsr1001.gns3a
+++ b/gns3server/appliances/hp-vsr1001.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://support.hpe.com/hpesc/public/home/documentHome?document_type=135&sp4ts.oid=5195141",
     "product_name": "VSR1001",
     "product_url": "https://www.hpe.com/us/en/product-catalog/networking/networking-routers/pip.hpe-flexnetwork-vsr1000-virtual-services-router-series.5443163.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/huawei-ar1kv.gns3a b/gns3server/appliances/huawei-ar1kv.gns3a
index f98698a7..ea556578 100644
--- a/gns3server/appliances/huawei-ar1kv.gns3a
+++ b/gns3server/appliances/huawei-ar1kv.gns3a
@@ -26,7 +26,7 @@
         "options": "-machine type=pc,accel=kvm -vga std -usbdevice tablet -cpu host"
     },
     "images": [
-	    {
+        {
             "filename": "huaweiar1k-5.170-V300R021C00SPC100T-Auto-update-esn.qcow2",
             "version": "V300R021C00SPC100T",
             "md5sum": "9d98b31d400a94af37b5af6e9cfe8d80",
@@ -40,10 +40,9 @@
             "filesize": 534904832,
             "download_url": "https://support.huawei.com/enterprise/en/routers/ar1000v-pid-21768212/software"
         }
-		
     ],
     "versions": [
-	    {
+        {
             "name": "V300R021C00SPC100T",
             "images": {
                 "hda_disk_image": "huaweiar1k-5.170-V300R021C00SPC100T-Auto-update-esn.qcow2"
@@ -55,6 +54,5 @@
                 "hda_disk_image": "ar1k-V300R019C00SPC300.qcow2"
             }
         }
-		
     ]
 }
diff --git a/gns3server/appliances/internet.gns3a b/gns3server/appliances/internet.gns3a
index 489d35ce..729de3c5 100644
--- a/gns3server/appliances/internet.gns3a
+++ b/gns3server/appliances/internet.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.gns3.com",
     "documentation_url": "http://www.gns3.com",
     "product_name": "Internet",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ipfire.gns3a b/gns3server/appliances/ipfire.gns3a
index 07610b57..fd86dd88 100644
--- a/gns3server/appliances/ipfire.gns3a
+++ b/gns3server/appliances/ipfire.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.ipfire.org/en/start",
     "product_name": "IPFire",
     "product_url": "http://www.ipfire.org/features",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ipterm.gns3a b/gns3server/appliances/ipterm.gns3a
index be1875ab..d4b19e7f 100644
--- a/gns3server/appliances/ipterm.gns3a
+++ b/gns3server/appliances/ipterm.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "ipterm",
     "vendor_url": "https://www.debian.org",
     "product_name": "ipterm",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ipxe.gns3a b/gns3server/appliances/ipxe.gns3a
index ad4af414..e4fe2e9b 100644
--- a/gns3server/appliances/ipxe.gns3a
+++ b/gns3server/appliances/ipxe.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://ipxe.org",
     "product_name": "iPXE netboot",
     "product_url": "http://ipxe.org/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/juniper-junos-space.gns3a b/gns3server/appliances/juniper-junos-space.gns3a
index ea462c32..c333c349 100644
--- a/gns3server/appliances/juniper-junos-space.gns3a
+++ b/gns3server/appliances/juniper-junos-space.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.juniper.net/techpubs/",
     "product_name": "Junos Space",
     "product_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/juniper-vmx-vcp.gns3a b/gns3server/appliances/juniper-vmx-vcp.gns3a
index 6a94a9fb..089f4dce 100644
--- a/gns3server/appliances/juniper-vmx-vcp.gns3a
+++ b/gns3server/appliances/juniper-vmx-vcp.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.juniper.net/techpubs/",
     "product_name": "Juniper vMX vCP",
     "product_url": "https://www.juniper.net/us/en/products/routers/mx-series/vmx-virtual-router-software.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/juniper-vmx-vfp.gns3a b/gns3server/appliances/juniper-vmx-vfp.gns3a
index 11708d3c..dba3ee1e 100644
--- a/gns3server/appliances/juniper-vmx-vfp.gns3a
+++ b/gns3server/appliances/juniper-vmx-vfp.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.juniper.net/techpubs/",
     "product_name": "Juniper vMX vFP",
     "product_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/juniper-vqfx-pfe.gns3a b/gns3server/appliances/juniper-vqfx-pfe.gns3a
index b605c22e..23cacef5 100644
--- a/gns3server/appliances/juniper-vqfx-pfe.gns3a
+++ b/gns3server/appliances/juniper-vqfx-pfe.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.juniper.net/techpubs/",
     "product_name": "Juniper vQFX PFE",
     "product_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/juniper-vqfx-re.gns3a b/gns3server/appliances/juniper-vqfx-re.gns3a
index 4235c280..b47c34d5 100644
--- a/gns3server/appliances/juniper-vqfx-re.gns3a
+++ b/gns3server/appliances/juniper-vqfx-re.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.juniper.net/techpubs/",
     "product_name": "Juniper vQFX RE",
     "product_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/juniper-vrr.gns3a b/gns3server/appliances/juniper-vrr.gns3a
index acfe6a9c..8c447a26 100644
--- a/gns3server/appliances/juniper-vrr.gns3a
+++ b/gns3server/appliances/juniper-vrr.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.juniper.net/documentation/product/en_US/virtual-route-reflector",
     "product_name": "Juniper vRR",
     "product_url": "https://www.juniper.net/us/en/products-services/nos/junos/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
@@ -34,12 +34,6 @@
             "md5sum": "69638ba0ad83d7a99a28b658b1dd8def",
             "filesize": 2773090304
         },
-        {
-            "filename": "metadata.img",
-            "version": "20.4R3.8-KVM",
-            "md5sum": "ae4e3562aa389929476d82420c79d511",
-            "filesize": 393216
-        },
         {
             "filename": "junos-x86-64-20.3R1.8.img",
             "version": "20.3R1.8-KVM",
@@ -48,7 +42,7 @@
         },
         {
             "filename": "metadata.img",
-            "version": "20.3R1.8-KVM",
+            "version": "1",
             "md5sum": "ae4e3562aa389929476d82420c79d511",
             "filesize": 393216
         }
diff --git a/gns3server/appliances/juniper-vsrx.gns3a b/gns3server/appliances/juniper-vsrx.gns3a
index d78ed8a2..febb9ad9 100644
--- a/gns3server/appliances/juniper-vsrx.gns3a
+++ b/gns3server/appliances/juniper-vsrx.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.juniper.net/techpubs/",
     "product_name": "Juniper vSRX",
     "product_url": "https://www.juniper.net/us/en/products-services/security/srx-series/vsrx/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/jupyter.gns3a b/gns3server/appliances/jupyter.gns3a
index 3ba8b88a..0e16d1aa 100644
--- a/gns3server/appliances/jupyter.gns3a
+++ b/gns3server/appliances/jupyter.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Project Jupyter",
     "vendor_url": "http://jupyter.org/",
     "product_name": "Jupyter",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/jupyter27.gns3a b/gns3server/appliances/jupyter27.gns3a
index 30ac7a14..ce10ebbd 100644
--- a/gns3server/appliances/jupyter27.gns3a
+++ b/gns3server/appliances/jupyter27.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Project Jupyter",
     "vendor_url": "http://jupyter.org/",
     "product_name": "Jupyter",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/kali-linux-cli.gns3a b/gns3server/appliances/kali-linux-cli.gns3a
index 89585cac..028446b5 100644
--- a/gns3server/appliances/kali-linux-cli.gns3a
+++ b/gns3server/appliances/kali-linux-cli.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://www.kali.org/",
     "documentation_url": "https://www.kali.org/kali-linux-documentation/",
     "product_name": "Kali Linux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/kali-linux.gns3a b/gns3server/appliances/kali-linux.gns3a
index c5ad4112..5452ec05 100644
--- a/gns3server/appliances/kali-linux.gns3a
+++ b/gns3server/appliances/kali-linux.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://www.kali.org/",
     "documentation_url": "https://www.kali.org/kali-linux-documentation/",
     "product_name": "Kali Linux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/kemp-vlm.gns3a b/gns3server/appliances/kemp-vlm.gns3a
index 0f02a734..eeacce77 100644
--- a/gns3server/appliances/kemp-vlm.gns3a
+++ b/gns3server/appliances/kemp-vlm.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://support.kemptechnologies.com/hc/en-us/articles/204427785",
     "product_name": "KEMP Free VLM",
     "product_url": "http://freeloadbalancer.com/#about",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/kerio-connect.gns3a b/gns3server/appliances/kerio-connect.gns3a
index d7e9bb0e..0e9f168e 100644
--- a/gns3server/appliances/kerio-connect.gns3a
+++ b/gns3server/appliances/kerio-connect.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://kb.kerio.com/product/kerio-connect/",
     "product_name": "Kerio Connect",
     "product_url": "http://www.kerio.com/products/kerio-connect",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/kerio-control.gns3a b/gns3server/appliances/kerio-control.gns3a
index baaf2b39..440a0a46 100644
--- a/gns3server/appliances/kerio-control.gns3a
+++ b/gns3server/appliances/kerio-control.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://kb.kerio.com/product/kerio-control/",
     "product_name": "Kerio Control",
     "product_url": "http://www.kerio.com/products/kerio-control",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/kerio-operator.gns3a b/gns3server/appliances/kerio-operator.gns3a
index 83d68701..3733c12b 100644
--- a/gns3server/appliances/kerio-operator.gns3a
+++ b/gns3server/appliances/kerio-operator.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://kb.kerio.com/product/kerio-operator/",
     "product_name": "Kerio Operator",
     "product_url": "http://www.kerio.com/products/kerio-operator",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/loadbalancer_org-va.gns3a b/gns3server/appliances/loadbalancer_org-va.gns3a
index c8479f65..3dd59b3a 100644
--- a/gns3server/appliances/loadbalancer_org-va.gns3a
+++ b/gns3server/appliances/loadbalancer_org-va.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://loadbalancer.org/support/support-resources",
     "product_name": "Loadbalancer.org Enterprise VA",
     "product_url": "https://loadbalancer.org/products/virtual",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/mcjoin.gns3a b/gns3server/appliances/mcjoin.gns3a
index d99ff3ff..8e936994 100644
--- a/gns3server/appliances/mcjoin.gns3a
+++ b/gns3server/appliances/mcjoin.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Joachim Nilsson",
     "vendor_url": "https://github.com/troglobit",
     "product_name": "mcjoin",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/microcore-linux.gns3a b/gns3server/appliances/microcore-linux.gns3a
index 0085a680..a7507164 100644
--- a/gns3server/appliances/microcore-linux.gns3a
+++ b/gns3server/appliances/microcore-linux.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.tinycorelinux.net/",
     "product_name": "Micro Core Linux",
     "product_url": "http://distro.ibiblio.org/tinycorelinux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/mikrotik-chr.gns3a b/gns3server/appliances/mikrotik-chr.gns3a
index 69092601..cf1d9987 100644
--- a/gns3server/appliances/mikrotik-chr.gns3a
+++ b/gns3server/appliances/mikrotik-chr.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
     "product_name": "MikroTik Cloud Hosted Router",
     "product_url": "http://www.mikrotik.com/download",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
@@ -17,8 +17,8 @@
     "port_name_format": "ether{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
-        "adapters": 2,
-        "ram": 128,
+        "adapters": 8,
+        "ram": 384,
         "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
@@ -28,12 +28,21 @@
     },
     "images": [
         {
-            "filename": "chr-7.4rc2.img",
-            "version": "7.4rc2",
-            "md5sum": "ddb107c95cc7d231f8d8bbdb4eebdab6",
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
             "filesize": 134217728,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download.mikrotik.com/routeros/7.4rc2/chr-7.4rc2.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
             "compression": "zip"
         },
         {
@@ -75,9 +84,15 @@
     ],
     "versions": [
         {
-            "name": "7.4rc2",
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
             "images": {
-                "hda_disk_image": "chr-7.4rc2.img"
+                "hda_disk_image": "chr-7.6.img"
             }
         },
         {
@@ -105,4 +120,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/gns3server/appliances/net_toolbox.gns3a b/gns3server/appliances/net_toolbox.gns3a
index 3bcc2a6b..90ebe293 100644
--- a/gns3server/appliances/net_toolbox.gns3a
+++ b/gns3server/appliances/net_toolbox.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Ubuntu",
     "vendor_url": "https://www.ubuntu.com/",
     "product_name": "Networkers' toolbox",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Andras Dosztal",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/netem.gns3a b/gns3server/appliances/netem.gns3a
index ce071fa8..6bee7e81 100644
--- a/gns3server/appliances/netem.gns3a
+++ b/gns3server/appliances/netem.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.linuxfoundation.org/",
     "documentation_url": "http://www.cs.unm.edu/~crandall/netsfall13/TCtutorial.pdf",
     "product_name": "netem",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "Bernhard Ehlers",
     "maintainer_email": "none@b-ehlers.de",
diff --git a/gns3server/appliances/network_automation.gns3a b/gns3server/appliances/network_automation.gns3a
index 8d10a494..b9bcd83c 100644
--- a/gns3server/appliances/network_automation.gns3a
+++ b/gns3server/appliances/network_automation.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "GNS3",
     "vendor_url": "http://www.gns3.com",
     "product_name": "Network Automation",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ntopng.gns3a b/gns3server/appliances/ntopng.gns3a
index 8804d7cb..78639951 100644
--- a/gns3server/appliances/ntopng.gns3a
+++ b/gns3server/appliances/ntopng.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://www.ntop.org/",
     "documentation_url": "https://www.ntop.org/guides/ntopng/",
     "product_name": "ntopng",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/onos.gns3a b/gns3server/appliances/onos.gns3a
index 28f7f6ab..14b87882 100644
--- a/gns3server/appliances/onos.gns3a
+++ b/gns3server/appliances/onos.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://wiki.onosproject.org",
     "product_name": "Onos",
     "product_url": "http://onosproject.org/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/op5-monitor.gns3a b/gns3server/appliances/op5-monitor.gns3a
index 70f97de9..32881514 100644
--- a/gns3server/appliances/op5-monitor.gns3a
+++ b/gns3server/appliances/op5-monitor.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://kb.op5.com/display/MAN/Documentation+Home#sthash.pohb5bis.dpbs",
     "product_name": "OP5 Monitor",
     "product_url": "https://www.op5.com/op5-monitor/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/openbsd.gns3a b/gns3server/appliances/openbsd.gns3a
index d39c956d..c25a59d6 100644
--- a/gns3server/appliances/openbsd.gns3a
+++ b/gns3server/appliances/openbsd.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.openbsd.org",
     "documentation_url": "http://www.openbsd.org/faq/index.html",
     "product_name": "OpenBSD",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/opennac.gns3a b/gns3server/appliances/opennac.gns3a
index f189c9c4..c68890bc 100644
--- a/gns3server/appliances/opennac.gns3a
+++ b/gns3server/appliances/opennac.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.opennac.org/opennac/en/support.html",
     "product_name": "OpenNAC",
     "product_url": "https://opennac.org/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Brent Stewart",
     "maintainer_email": "brent@stewart.tc",
diff --git a/gns3server/appliances/openvswitch-management.gns3a b/gns3server/appliances/openvswitch-management.gns3a
index a9637293..a31b36eb 100644
--- a/gns3server/appliances/openvswitch-management.gns3a
+++ b/gns3server/appliances/openvswitch-management.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://openvswitch.org/",
     "documentation_url": "http://openvswitch.org/support/",
     "product_name": "Open vSwitch",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/openvswitch.gns3a b/gns3server/appliances/openvswitch.gns3a
index e792689a..14c35d2c 100644
--- a/gns3server/appliances/openvswitch.gns3a
+++ b/gns3server/appliances/openvswitch.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://openvswitch.org/support/",
     "product_name": "Open vSwitch",
     "product_url": "http://openvswitch.org/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/openwrt-realview.gns3a b/gns3server/appliances/openwrt-realview.gns3a
index ee520702..46a6ec3e 100644
--- a/gns3server/appliances/openwrt-realview.gns3a
+++ b/gns3server/appliances/openwrt-realview.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.openwrt.org/doc/",
     "product_name": "OpenWrt",
     "product_url": "http://openwrt.org",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/openwrt.gns3a b/gns3server/appliances/openwrt.gns3a
index a8bc8bf7..e6428658 100644
--- a/gns3server/appliances/openwrt.gns3a
+++ b/gns3server/appliances/openwrt.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.openwrt.org/doc/",
     "product_name": "OpenWrt",
     "product_url": "http://openwrt.org",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
@@ -23,7 +23,7 @@
         "kvm": "allow"
     },
     "images": [
-         {
+        {
             "filename": "openwrt-22.03.0-x86-64-generic-ext4-combined.img",
             "version": "22.03.0",
             "md5sum": "0f9a266bd8a6cdfcaf0b59f7ba103a0e",
diff --git a/gns3server/appliances/opnsense.gns3a b/gns3server/appliances/opnsense.gns3a
index 45583124..7e39a7e4 100644
--- a/gns3server/appliances/opnsense.gns3a
+++ b/gns3server/appliances/opnsense.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://wiki.opnsense.org/",
     "product_name": "OPNsense",
     "product_url": "https://opnsense.org/about/about-opnsense/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ovs-snmp.gns3a b/gns3server/appliances/ovs-snmp.gns3a
index 2592022f..7e4b8ca4 100644
--- a/gns3server/appliances/ovs-snmp.gns3a
+++ b/gns3server/appliances/ovs-snmp.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Open vSwitch",
     "vendor_url": "http://openvswitch.org/",
     "product_name": "Open vSwitch",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
@@ -15,4 +15,4 @@
         "adapters": 8,
         "image": "gns3/ovs-snmp:latest"
     }
-}
\ No newline at end of file
+}
diff --git a/gns3server/appliances/packetfence-zen.gns3a b/gns3server/appliances/packetfence-zen.gns3a
index 6a6a8dea..06cedbe8 100644
--- a/gns3server/appliances/packetfence-zen.gns3a
+++ b/gns3server/appliances/packetfence-zen.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://packetfence.org/support/index.html#/documentation",
     "product_name": "PacketFence ZEN",
     "product_url": "https://packetfence.org/about.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/pan-vm-fw.gns3a b/gns3server/appliances/pan-vm-fw.gns3a
index 25f8725e..eb34c763 100644
--- a/gns3server/appliances/pan-vm-fw.gns3a
+++ b/gns3server/appliances/pan-vm-fw.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.paloaltonetworks.com/documentation/80/virtualization/virtualization",
     "product_name": "PAN VM-Series Firewall",
     "product_url": "https://www.paloaltonetworks.com/products/secure-the-network/virtualized-next-generation-firewall/vm-series",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "Community",
     "maintainer_email": "",
diff --git a/gns3server/appliances/parrot-os.gns3a b/gns3server/appliances/parrot-os.gns3a
index e9270803..d5b9fe1a 100644
--- a/gns3server/appliances/parrot-os.gns3a
+++ b/gns3server/appliances/parrot-os.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://docs.parrotsec.org/doku.php",
     "product_name": "ParrotOS",
     "product_url": "https://parrotsec.org/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Brent Stewart",
     "maintainer_email": "brent@stewart.tc",
diff --git a/gns3server/appliances/pfsense.gns3a b/gns3server/appliances/pfsense.gns3a
index bf3cf1ae..42fa5a9d 100644
--- a/gns3server/appliances/pfsense.gns3a
+++ b/gns3server/appliances/pfsense.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://www.pfsense.org",
     "documentation_url": "https://doc.pfsense.org/index.php/Main_Page",
     "product_name": "pfSense",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Jose Phillips",
     "maintainer_email": "jose@latinol.com",
diff --git a/gns3server/appliances/proxmox-mg.gns3a b/gns3server/appliances/proxmox-mg.gns3a
index 588073da..f18137f1 100644
--- a/gns3server/appliances/proxmox-mg.gns3a
+++ b/gns3server/appliances/proxmox-mg.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.proxmox.com/en/downloads/category/documentation-pmg",
     "product_name": "Proxmox MG",
     "product_url": "http://www.proxmox.com/en/proxmox-mail-gateway",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/puppy-linux.gns3a b/gns3server/appliances/puppy-linux.gns3a
index e6bfca79..ac2d7048 100644
--- a/gns3server/appliances/puppy-linux.gns3a
+++ b/gns3server/appliances/puppy-linux.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://puppylinux.com/",
     "documentation_url": "http://wikka.puppylinux.com/HomePage",
     "product_name": "Puppy Linux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Savio D'souza",
     "maintainer_email": "savio2002@yahoo.in",
diff --git a/gns3server/appliances/python-go-perl-php.gns3a b/gns3server/appliances/python-go-perl-php.gns3a
index 6ab1298f..5ec5f39c 100644
--- a/gns3server/appliances/python-go-perl-php.gns3a
+++ b/gns3server/appliances/python-go-perl-php.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "GNS3 Team",
     "vendor_url": "https://www.gns3.com",
     "product_name": "Python, Go, Perl, PHP",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/raspian.gns3a b/gns3server/appliances/raspian.gns3a
index 0c4cafca..97431dc8 100644
--- a/gns3server/appliances/raspian.gns3a
+++ b/gns3server/appliances/raspian.gns3a
@@ -38,7 +38,7 @@
             "filesize": 3091660800,
             "download_url": "https://www.raspberrypi.org/downloads/raspberry-pi-desktop/"
         },
-		{
+        {
             "filename": "2020-02-12-rpd-x86-buster.iso",
             "version": "2020-02-12",
             "md5sum": "98f34fb53086752b4c9c452094f30740",
@@ -68,7 +68,7 @@
                 "cdrom_image": "2021-01-11-raspios-buster-i386.iso"
             }
         },
-		{
+        {
             "name": "2020-02-12",
             "images": {
                 "hda_disk_image": "empty8G.qcow2",
diff --git a/gns3server/appliances/reactos.gns3a b/gns3server/appliances/reactos.gns3a
index 391abe95..1b1c2fd8 100644
--- a/gns3server/appliances/reactos.gns3a
+++ b/gns3server/appliances/reactos.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://reactos.org/what-is-reactos/",
     "product_name": "ReactOS",
     "product_url": "https://reactos.org/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Savio D'souza",
     "maintainer_email": "savio2002@yahoo.co.in",
diff --git a/gns3server/appliances/rockylinux.gns3a b/gns3server/appliances/rockylinux.gns3a
index 5829bbc8..098ba5c8 100644
--- a/gns3server/appliances/rockylinux.gns3a
+++ b/gns3server/appliances/rockylinux.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://rockylinux.org",
     "documentation_url": "https://docs.rockylinux.org",
     "product_name": "Rocky Linux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Da-Geek",
     "maintainer_email": "dageek@dageeks-geeks.gg",
diff --git a/gns3server/appliances/security-onion.gns3a b/gns3server/appliances/security-onion.gns3a
index abaf5003..cccca609 100644
--- a/gns3server/appliances/security-onion.gns3a
+++ b/gns3server/appliances/security-onion.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://github.com/Security-Onion-Solutions/security-onion/wiki",
     "product_name": "Security Onion",
     "product_url": "https://securityonion.net/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Brent Stewart",
     "maintainer_email": "brent@stewart.tc",
diff --git a/gns3server/appliances/smoothwall.gns3a b/gns3server/appliances/smoothwall.gns3a
index 987cd791..ab285019 100644
--- a/gns3server/appliances/smoothwall.gns3a
+++ b/gns3server/appliances/smoothwall.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://sourceforge.net/projects/smoothwall/files/SmoothWall%20Manuals/",
     "product_name": "Smoothwall Express",
     "product_url": "http://www.smoothwall.org/about/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/sophos-iview.gns3a b/gns3server/appliances/sophos-iview.gns3a
index 28d131b1..08188887 100644
--- a/gns3server/appliances/sophos-iview.gns3a
+++ b/gns3server/appliances/sophos-iview.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.sophos.com/en-us/support/documentation/sophos-iview.aspx",
     "product_name": "Sophos iView",
     "product_url": "https://www.sophos.com/en-us/products/next-gen-firewall.aspx",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/sophos-utm.gns3a b/gns3server/appliances/sophos-utm.gns3a
index 6bbc6cff..5fbac719 100644
--- a/gns3server/appliances/sophos-utm.gns3a
+++ b/gns3server/appliances/sophos-utm.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://community.sophos.com/products/unified-threat-management/",
     "product_name": "Sophos UTM Home Edition",
     "product_url": "https://www.sophos.com/en-us/products/free-tools/sophos-utm-home-edition.aspx",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/sophos-xg.gns3a b/gns3server/appliances/sophos-xg.gns3a
index 54496c71..670946cb 100644
--- a/gns3server/appliances/sophos-xg.gns3a
+++ b/gns3server/appliances/sophos-xg.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://www.sophos.com/en-us/support/documentation/sophos-xg-firewall.aspx",
     "product_name": "Sophos XG Firewall",
     "product_url": "https://www.sophos.com/en-us/products/next-gen-firewall.aspx",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/tacacs-gui.gns3a b/gns3server/appliances/tacacs-gui.gns3a
index 3738523e..a5dab0a9 100644
--- a/gns3server/appliances/tacacs-gui.gns3a
+++ b/gns3server/appliances/tacacs-gui.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://tacacsgui.com/documentation/",
     "product_name": "TacacsGUI",
     "product_url": "https://drive.google.com/open?id=1U8tbj14NqEyCmarayhZm54qTyjgsJm4B",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/tinycore-linux.gns3a b/gns3server/appliances/tinycore-linux.gns3a
index ef1e23aa..86638b46 100644
--- a/gns3server/appliances/tinycore-linux.gns3a
+++ b/gns3server/appliances/tinycore-linux.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.tinycorelinux.net/",
     "product_name": "Tiny Core Linux",
     "product_url": "http://distro.ibiblio.org/tinycorelinux",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/trendmicro-imsva.gns3a b/gns3server/appliances/trendmicro-imsva.gns3a
index 6520be66..655c3b1c 100644
--- a/gns3server/appliances/trendmicro-imsva.gns3a
+++ b/gns3server/appliances/trendmicro-imsva.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://success.trendmicro.com/product-support/interscan-messaging-security",
     "product_name": "IMS VA",
     "product_url": "http://www.trendmicro.com/enterprise/network-security/interscan-message-security/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/trendmicro-iwsva.gns3a b/gns3server/appliances/trendmicro-iwsva.gns3a
index 17bd1161..12e0c1c6 100644
--- a/gns3server/appliances/trendmicro-iwsva.gns3a
+++ b/gns3server/appliances/trendmicro-iwsva.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://success.trendmicro.com/product-support/interscan-web-security-virtual-appliance",
     "product_name": "IWS VA",
     "product_url": "http://www.trendmicro.com/enterprise/network-security/interscan-web-security/virtual-appliance/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/turnkey-wordpress.gns3a b/gns3server/appliances/turnkey-wordpress.gns3a
index 377b6bd4..20dd1c69 100644
--- a/gns3server/appliances/turnkey-wordpress.gns3a
+++ b/gns3server/appliances/turnkey-wordpress.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "https://www.turnkeylinux.org/",
     "product_name": "TurnKey Linux WordPress",
     "product_url": "https://www.turnkeylinux.org/wordpress",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ubuntu-cloud.gns3a b/gns3server/appliances/ubuntu-cloud.gns3a
index d0ddd03e..59aba8a7 100644
--- a/gns3server/appliances/ubuntu-cloud.gns3a
+++ b/gns3server/appliances/ubuntu-cloud.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://help.ubuntu.com/community/UEC/Images",
     "product_name": "Ubuntu Cloud Guest",
     "product_url": "https://www.ubuntu.com/cloud",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ubuntu-docker.gns3a b/gns3server/appliances/ubuntu-docker.gns3a
index 1753f147..bd6dcca7 100644
--- a/gns3server/appliances/ubuntu-docker.gns3a
+++ b/gns3server/appliances/ubuntu-docker.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Canonical",
     "vendor_url": "http://www.ubuntu.com",
     "product_name": "Ubuntu",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ubuntu-gui.gns3a b/gns3server/appliances/ubuntu-gui.gns3a
index 5a073e4f..fc1e5d2d 100644
--- a/gns3server/appliances/ubuntu-gui.gns3a
+++ b/gns3server/appliances/ubuntu-gui.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://help.ubuntu.com",
     "product_name": "Ubuntu",
     "product_url": "https://www.ubuntu.com/desktop",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/ubuntu-server.gns3a b/gns3server/appliances/ubuntu-server.gns3a
index 534be61c..ff6bc214 100644
--- a/gns3server/appliances/ubuntu-server.gns3a
+++ b/gns3server/appliances/ubuntu-server.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://help.ubuntu.com",
     "product_name": "Ubuntu",
     "product_url": "https://ubuntu.com/server",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Mohamad Siblini",
     "maintainer_email": "info@ictkin.com",
diff --git a/gns3server/appliances/untangle.gns3a b/gns3server/appliances/untangle.gns3a
index 38f6b1d1..cdf0bbad 100644
--- a/gns3server/appliances/untangle.gns3a
+++ b/gns3server/appliances/untangle.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.untangle.com/index.php/Main_Page",
     "product_name": "Untangle NG",
     "product_url": "https://www.untangle.com/untangle-ng-firewall/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/viptela-edge-genericx86-64.gns3a b/gns3server/appliances/viptela-edge-genericx86-64.gns3a
index 34589774..f729590d 100644
--- a/gns3server/appliances/viptela-edge-genericx86-64.gns3a
+++ b/gns3server/appliances/viptela-edge-genericx86-64.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/",
     "product_name": "VIPtela Edge",
     "product_url": "http://www.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "Laurent LEVIER",
     "maintainer_email": "laurent.levier@orange.com",
diff --git a/gns3server/appliances/viptela-smart-genericx86-64.gns3a b/gns3server/appliances/viptela-smart-genericx86-64.gns3a
index 040cd6f4..c877743e 100644
--- a/gns3server/appliances/viptela-smart-genericx86-64.gns3a
+++ b/gns3server/appliances/viptela-smart-genericx86-64.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/",
     "product_name": "VIPtela Smart",
     "product_url": "http://www.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "Laurent LEVIER",
     "maintainer_email": "laurent.levier@orange.com",
diff --git a/gns3server/appliances/viptela-vmanage-genericx86-64.gns3a b/gns3server/appliances/viptela-vmanage-genericx86-64.gns3a
index ad94b338..8c547ec4 100644
--- a/gns3server/appliances/viptela-vmanage-genericx86-64.gns3a
+++ b/gns3server/appliances/viptela-vmanage-genericx86-64.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "http://www.cisco.com/",
     "product_name": "VIPtela Manage",
     "product_url": "http://www.cisco.com/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "Laurent LEVIER",
     "maintainer_email": "laurent.levier@orange.com",
diff --git a/gns3server/appliances/vrin.gns3a b/gns3server/appliances/vrin.gns3a
index 830e7ea7..ef386123 100644
--- a/gns3server/appliances/vrin.gns3a
+++ b/gns3server/appliances/vrin.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "Andras Dosztal",
     "vendor_url": "https://sourceforge.net/projects/vrin/",
     "product_name": "vRIN",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Andras Dosztal",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/vyos.gns3a b/gns3server/appliances/vyos.gns3a
index 7fbe68ca..232cdccd 100644
--- a/gns3server/appliances/vyos.gns3a
+++ b/gns3server/appliances/vyos.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://docs.vyos.io/",
     "product_name": "VyOS",
     "product_url": "https://vyos.net/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/watchguard-fireboxv.gns3a b/gns3server/appliances/watchguard-fireboxv.gns3a
index c6ddd2f2..0719ba6b 100644
--- a/gns3server/appliances/watchguard-fireboxv.gns3a
+++ b/gns3server/appliances/watchguard-fireboxv.gns3a
@@ -1,6 +1,6 @@
 {
     "appliance_id": "dee2b360-e1f4-487f-bd2f-2296f7167543",
-    "name": "WatchGuard",
+    "name": "WatchGuard FireboxV",
     "category": "firewall",
     "description": "Organizations of all sizes are turning to virtualization to reduce costs and increase the efficiency, availability, and flexibility of their IT resources. But virtualization comes at a cost. Virtual environments are complex to manage and vulnerable to security threats. IT must be prepared. Now applications can be secured, resources can be maximized and your IT department can reap the rewards of having a single, unified management system - without a security risk in sight. WatchGuard FireboxV brings best-in-class network security to the world of virtualization. With real-time monitoring, multi-WAN support and scalable solutions to fit any-sized business, your virtual environments can be just as secure as your physical one.",
     "vendor_name": "WatchGuard",
diff --git a/gns3server/appliances/watchguard-xtmv.gns3a b/gns3server/appliances/watchguard-xtmv.gns3a
index 62451a59..3153e695 100644
--- a/gns3server/appliances/watchguard-xtmv.gns3a
+++ b/gns3server/appliances/watchguard-xtmv.gns3a
@@ -1,6 +1,6 @@
 {
     "appliance_id": "816cedad-04ae-46e5-840d-20c2a50b6ba5",
-    "name": "WatchGuard",
+    "name": "WatchGuard XTMv",
     "category": "firewall",
     "description": "Organizations of all sizes are turning to virtualization to reduce costs and increase the efficiency, availability, and flexibility of their IT resources. But virtualization comes at a cost. Virtual environments are complex to manage and vulnerable to security threats. IT must be prepared. Now applications can be secured, resources can be maximized and your IT department can reap the rewards of having a single, unified management system - without a security risk in sight. WatchGuard XTMv brings best-in-class network security to the world of virtualization. With real-time monitoring, multi-WAN support and scalable solutions to fit any-sized business, your virtual environments can be just as secure as your physical one.",
     "vendor_name": "WatchGuard",
diff --git a/gns3server/appliances/webterm.gns3a b/gns3server/appliances/webterm.gns3a
index ffb71d7a..56fe301a 100644
--- a/gns3server/appliances/webterm.gns3a
+++ b/gns3server/appliances/webterm.gns3a
@@ -6,7 +6,7 @@
     "vendor_name": "webterm",
     "vendor_url": "https://www.debian.org",
     "product_name": "webterm",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/windows-11-dev-env.gns3a b/gns3server/appliances/windows-11-dev-env.gns3a
index 1a856d07..6c7514d1 100644
--- a/gns3server/appliances/windows-11-dev-env.gns3a
+++ b/gns3server/appliances/windows-11-dev-env.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://developer.microsoft.com/en-us/windows/downloads/virtual-machines/",
     "product_name": "Windows 11 Development Environment",
     "product_url": "https://developer.microsoft.com/en-us/windows/downloads/virtual-machines/",
-    "registry_version": 4,
+    "registry_version": 5,
     "status": "experimental",
     "availability": "free",
     "maintainer": "Ean Towne",
@@ -49,11 +49,11 @@
     ],
     "versions": [
         {
+            "name": "2212",
             "images": {
                 "bios_image": "OVMF-20160813.fd",
                 "hda_disk_image": "WinDev2212Eval-disk1.vmdk"
-            },
-            "name": "2212"
+            }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/gns3server/appliances/windows-xp+ie.gns3a b/gns3server/appliances/windows-xp+ie.gns3a
index eedc0de2..15b40cee 100644
--- a/gns3server/appliances/windows-xp+ie.gns3a
+++ b/gns3server/appliances/windows-xp+ie.gns3a
@@ -1,12 +1,12 @@
 {
     "appliance_id": "3976f732-7d50-4dba-b5f7-e2f2c17129eb",
-    "name": "Windows",
+    "name": "Windows XP",
     "category": "guest",
     "description": "Microsoft Windows XP is a graphical operating system developed, marketed, and sold by Microsoft.\n\nMicrosoft has released time limited VMs for testing Internet Explorer.",
     "vendor_name": "Microsoft",
     "vendor_url": "http://www.microsoft.com",
     "product_name": "Windows XP",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/zentyal-server.gns3a b/gns3server/appliances/zentyal-server.gns3a
index b173b812..9d45ab94 100644
--- a/gns3server/appliances/zentyal-server.gns3a
+++ b/gns3server/appliances/zentyal-server.gns3a
@@ -8,7 +8,7 @@
     "documentation_url": "https://wiki.zentyal.org/wiki/Zentyal_Wiki",
     "product_name": "Zentyal Server",
     "product_url": "http://www.zentyal.com/zentyal-server/",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
diff --git a/gns3server/appliances/zeroshell.gns3a b/gns3server/appliances/zeroshell.gns3a
index e34dc337..27ea916a 100644
--- a/gns3server/appliances/zeroshell.gns3a
+++ b/gns3server/appliances/zeroshell.gns3a
@@ -7,7 +7,7 @@
     "vendor_url": "http://www.zeroshell.org",
     "documentation_url": "http://www.zeroshell.org/documentation/",
     "product_name": "ZeroShell",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",