Release v2.2.41

Merge remote-tracking branch 'origin/master' into 2.2
Bundle web-ui v2.2.41
2026-11-07 07:33:43 +02:00 · 2023-07-12 17:07:39 +10:00 · 2023-07-12 17:04:12 +10:00 · 2023-07-12 16:31:54 +10:00 · 2023-07-12 16:20:29 +10:00 · 2023-07-12 13:26:22 +10:00
281 changed files with 5725 additions and 1164 deletions
@@ -0,0 +1,16 @@
+name: Add new issues to GNS3 project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.4.0
+        with:
+          project-url: https://github.com/orgs/GNS3/projects/3
+          github-token: ${{ secrets.ADD_NEW_ISSUES_TO_PROJECT }}
@@ -2,17 +2,21 @@ name: testing

 on:
  push:
-    branches: [ master ]
+    branches:
+      - master
+      - 2.2
  pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - 2.2

 jobs:
  build:

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04  # Downgrade Ubuntu to 20.04 to fix missing Python 3.6
    strategy:
      matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]

    steps:
    - uses: actions/checkout@v2
@@ -2,7 +2,8 @@
  "scanSettings": {
    "configMode": "AUTO",
    "configExternalURL": "",
-    "projectToken" : ""
+    "projectToken" : "",
+    "baseBranches": ["master", "2.2", "3.0"]
  },
  "checkRunSettings": {
    "vulnerableCheckRunConclusionLevel": "failure"
@@ -1,5 +1,107 @@
 # Change Log

+## 2.2.41 12/07/2023
+
+* Bundle web-ui v2.2.41
+* Catch urllib3 exceptions when sending crash report. Ref https://github.com/GNS3/gns3-gui/issues/3483
+* Only fetch Qemu version once when starting Qemu + only add speed/duplex for virtio-net-pci with Qemu version >= 2.12
+* Use recent OVMF firmware (stable-202305) and use flash drives to configure Qemu command line
+* Remove the useless executable permissions to the file gns3server/disks/empty8G.qcow2
+* Backport UEFI boot mode support for Qemu VMs
+
+## 2.2.40.1 10/06/2023
+
+* Re-bundle Web-Ui v2.2.40. Fixes #2239
+
+## 2.2.40 06/06/2023
+
+* qemu : with network adapter_type equal to "virtio-net-pci", fix the speed to 10000 and duplex to full. 	The values are actually fake. 	(https://github.com/GNS3/gns3-gui/issues/3476)
+* Parse name for request to node creation from template
+* Remove Xvfb + x11vnc support
+* Require a Host-Only Network to start the VirtualBox GNS3 VM on macOS with VirtualBox 7
+* Properly catch aiohttp client exception. Ref #2228
+* Catch ConnectionResetError when waiting for the wrap console
+* Fix open IPv6 address for HTTP consoles on controller. Fixes https://github.com/GNS3/gns3-gui/issues/3448
+* Use proc.communicate() when checking for subprocess output As recommended in https://docs.python.org/3/library/asyncio-subprocess.html#asyncio.subprocess.Process.stderr
+
+## 2.2.39 08/05/2023
+
+* Install web-ui v2.2.39
+* Add generic function to install resource files
+* Install empty Qemu disks on first start
+* Check for colon in project name. Fixes #2203
+* Upgrade distro and aiohttp dependencies
+
+## 2.2.38 28/02/2023
+
+* Bundle web-ui v2.2.38
+* Fix c7200_i0_log.txt is created in the current directory. Fixes #2191
+* Check swtpm version and start swtpm before qemu
+* Fix broken websocket console with Python 3.11
+* Fix "cannot reopen console". Ref #2182
+* Fix Qemu binary not set when adding appliance from template
+
+## 2.2.37 25/01/2023
+
+* Fix link communication issues on Windows with uBridge
+* Fix StreamWriter doesn't have the wait_closed() method in Python3.6. Fixes #2170
+* Install built-in appliances when no previous version has been detected. Fixes #2168
+* Update documentation to install gns3-server. Fixes #2124
+* Give udhcpc executable right. Fixes #2159
+
+## 2.2.36 04/01/2023
+
+* Install web-ui v2.2.36
+* Add Trusted Platform Module (TPM) support for Qemu VMs
+* Require Dynamips 0.2.23 and bind Dynamips hypervisor on 127.0.0.1
+* Delete the built-in appliance directory before installing updated files
+* Use a stock BusyBox for the Docker integration
+* Overwrite built-in appliance files when starting a more recent version of the server
+* Fix reset console. Fixes #1619
+* Only use importlib_resources for Python <= 3.9. Fixes #2147
+* Support when the user field defined in Docker container is an ID. Fixes #2134
+
+## 2.2.35.1 10/11/2022
+
+* Re-release Web-Ui v2.2.35
+
+## 2.2.35 08/11/2022
+
+* Release web-ui v2.2.35
+* Fix issues with VMnet interface on macOS >= 11.0. Ref #3381
+* Use importlib_resources instead of pkg_resources and install built-in appliances in config dir.
+* Fix console vnc don't use configured ports in some case. Fixes #2111
+* Add missing VMware settings in gns3_server.conf
+* Make version PEP 440 compliant
+* Support for Python 3.11
+* Allow for more dependency versions at patch level
+* Replace deprecated distro.linux_distribution() call
+* Update gns3.service.systemd
+* gns3.service.openrc: make openrc script posix compliant
+* fix: use exact match to find interface in windows to avoid get wrong interface
+
+## 2.2.34 28/08/2022
+
+* Use original $PATH in init.sh for Docker containers. Ref #2069
+* Support pytest-asyncio 0.19.0
+* Upgrade dev dependencies and fix issues after upgrading to pytest-aiohttp v1.0.4
+* Update compute.py
+
+## 2.2.33.1 21/06/2022
+
+* Add missing file for web-ui v2.2.33
+
+## 2.2.33 20/06/2022
+
+* Release web-ui v2.2.33
+* Upgrade sentry-sdk and psutil
+* Remove parameter "Name" not useful to create a Docker container
+* Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619
+* Config option to disable built-in templates
+* Add hostname entry to sample network config for Docker nodes. Fixes #2039
+* Run Xtigervnc with MIT-SHM extension disabled for Docker VNC console support. Fixes #2071
+* Added OpenRC init script
+
 ## 2.2.32 27/04/2022

 * Docker: load custom interface files from /etc/network/interfaces (commented by default). Ref #2052
@@ -1,4 +1,4 @@
-include README.rst
+include README.md
 include AUTHORS
 include LICENSE
 include MANIFEST.in
@@ -0,0 +1,257 @@
+GNS3-server
+===========
+
+[![image](https://github.com/GNS3/gns3-server/workflows/testing/badge.svg)](https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting)
+
+[![image](https://img.shields.io/pypi/v/gns3-server.svg)](https://pypi.python.org/pypi/gns3-server)
+
+[![image](https://snyk.io/test/github/GNS3/gns3-server/badge.svg)](https://snyk.io/test/github/GNS3/gns3-server)
+
+This is the GNS3 server repository.
+
+The GNS3 server manages emulators such as Dynamips, VirtualBox or
+Qemu/KVM. Clients like the [GNS3 GUI](https://github.com/GNS3/gns3-gui/)
+and the [GNS3 Web UI](https://github.com/GNS3/gns3-web-ui) control the
+server using an HTTP REST API.
+
+Software dependencies
+---------------------
+
+In addition of Python dependencies listed in a section below, other
+software may be required, recommended or optional.
+
+-   [uBridge](https://github.com/GNS3/ubridge/) is required, it
+    interconnects the nodes.
+-   [Dynamips](https://github.com/GNS3/dynamips/) is required for
+    running IOS routers (using real IOS images) as well as the internal
+    switches and hubs.
+-   [VPCS](https://github.com/GNS3/vpcs/) is recommended, it is a
+    builtin node simulating a very simple computer to perform
+    connectitivy tests using ping, traceroute etc.
+-   Qemu is strongly recommended on Linux, as most node types are based
+    on Qemu, for example Cisco IOSv and Arista vEOS.
+-   libvirt is recommended (Linux only), as it\'s needed for the NAT
+    cloud.
+-   Docker is optional (Linux only), some nodes are based on Docker.
+-   mtools is recommended to support data transfer to/from QEMU VMs
+    using virtual disks.
+-   i386-libraries of libc and libcrypto are optional (Linux only), they
+    are only needed to run IOU based nodes.
+
+### Docker support
+
+Docker support needs the script program (bsdutils or
+util-linux package), when running a docker VM and a static
+busybox during installation (python3 setup.py install / pip3 install /
+package creation).
+
+Branches
+--------
+
+### master
+
+master is the next stable release, you can test it in your day to day
+activities. Bug fixes or small improvements pull requests go here.
+
+### 2.x (2.3 for example)
+
+Next major release
+
+*Never* use this branch for production. Pull requests for major new
+features go here.
+
+Linux
+-----
+
+GNS3 is perhaps packaged for your distribution:
+
+-   Gentoo: <https://packages.gentoo.org/package/net-misc/gns3-server>
+-   Alpine:
+    <https://pkgs.alpinelinux.org/package/v3.10/community/x86_64/gns3-server>
+-   NixOS:
+    <https://search.nixos.org/packages?channel=21.11&from=0&size=50&sort=relevance&type=packages&query=gns3-server>
+
+Linux (Debian based)
+--------------------
+
+The following instructions have been tested with Ubuntu and Mint. You
+must be connected to the Internet in order to install the dependencies.
+
+Dependencies:
+
+-   Python 3.6, setuptools and the ones listed
+    [here](https://github.com/GNS3/gns3-server/blob/master/requirements.txt)
+
+The following commands will install some of these dependencies:
+
+``` {.bash}
+sudo apt-get install python3-setuptools python3-pip
+```
+
+Finally, these commands will install the server as well as the rest of
+the dependencies:
+
+``` {.bash}
+cd gns3-server-master
+python3 -m pip install -r requirements.txt
+python3 -m pip install .
+gns3server
+```
+
+To run tests use:
+
+``` {.bash}
+python3 -m pytest tests
+```
+
+### Docker container
+
+For development, you can run the GNS3 server in a container
+
+``` {.bash}
+bash scripts/docker_dev_server.sh
+```
+
+### Run as daemon (Unix only)
+
+You will find init sample scripts for various systems inside the init
+directory.
+
+Useful options:
+
+-   `--daemon`: start process as a daemon
+-   `--log logfile`: store output in a logfile
+-   `--pid pidfile`: store the pid of the running process in a file and
+    prevent double execution
+
+All init scripts require the creation of a GNS3 user. You can change it
+to another user.
+
+``` {.bash}
+sudo adduser gns3
+```
+
+upstart
+-------
+
+For ubuntu < 15.04
+
+You need to copy init/gns3.conf.upstart to /etc/init/gns3.conf
+
+``` {.bash}
+sudo chown root /etc/init/gns3.conf
+sudo service gns3 start
+```
+
+systemd
+-------
+
+You need to copy init/gns3.service.systemd to
+/lib/systemd/system/gns3.service
+
+``` {.bash}
+sudo chown root /lib/systemd/system/gns3.service
+sudo systemctl start gns3
+```
+
+Windows
+-------
+
+Please use our [all-in-one
+installer](https://community.gns3.com/software/download) to install the
+stable build.
+
+If you install via source you need to first install:
+
+-   Python (3.3 or above) - <https://www.python.org/downloads/windows/>
+-   Pywin32 - <https://sourceforge.net/projects/pywin32/>
+
+Then you can call
+
+``` {.bash}
+python setup.py install
+```
+
+to install the remaining dependencies.
+
+To run the tests, you also need to call
+
+``` {.bash}
+pip install pytest pytest-capturelog
+```
+
+before actually running the tests with
+
+``` {.bash}
+python setup.py test
+```
+
+or with
+
+``` {.bash}
+py.test -v
+```
+
+Mac OS X
+--------
+
+Please use our DMG package for a simple installation.
+
+If you want to test the current git version or contribute to the
+project, you can follow these instructions with virtualenvwrapper:
+<http://virtualenvwrapper.readthedocs.org/> and homebrew:
+<http://brew.sh/>.
+
+``` {.bash}
+brew install python3
+mkvirtualenv gns3-server --python=/usr/local/bin/python3.5
+python3 setup.py install
+gns3server
+```
+
+SSL
+---
+
+If you want enable SSL support on GNS3 you can generate a self signed
+certificate:
+
+``` {.bash}
+bash gns3server/cert_utils/create_cert.sh
+```
+
+This command will put the files in \~/.config/GNS3/ssl
+
+After you can start the server in SSL mode with:
+
+``` {.bash}
+python gns3server/main.py --certfile ~/.config/GNS3/ssl/server.cert --certkey ~/.config/GNS3/ssl/server.key --ssl
+```
+
+Or in your gns3\_server.conf by adding in the Server section:
+
+``` {.ini}
+[Server]
+certfile=/Users/noplay/.config/GNS3/ssl/server.cert
+certkey=/Users/noplay/.config/GNS3/ssl/server.key
+ssl=True
+```
+
+### Running tests
+
+Just run:
+
+``` {.bash}
+py.test -vv
+```
+
+If you want test coverage:
+
+``` {.bash}
+py.test --cov-report term-missing --cov=gns3server
+```
+
+Security issues
+---------------
+
+Please contact us using contact form available here:
+<http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html>
@@ -1,236 +0,0 @@
-GNS3-server
-===========
-
-.. image:: https://github.com/GNS3/gns3-server/workflows/testing/badge.svg
-    :target: https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting
-
-.. image:: https://img.shields.io/pypi/v/gns3-server.svg
-    :target: https://pypi.python.org/pypi/gns3-server
-
-.. image:: https://snyk.io/test/github/GNS3/gns3-server/badge.svg
-    :target: https://snyk.io/test/github/GNS3/gns3-server
-
-This is the GNS3 server repository.
-
-The GNS3 server manages emulators such as Dynamips, VirtualBox or Qemu/KVM.
-Clients like the `GNS3 GUI <https://github.com/GNS3/gns3-gui/>`_ and the `GNS3 Web UI <https://github.com/GNS3/gns3-web-ui>`_ control the server using a HTTP REST API.
-
-Software dependencies
---------------------
-
-In addition of Python dependencies listed in a section below, other software may be required, recommended or optional.
-
-* `uBridge <https://github.com/GNS3/ubridge/>`_ is required, it interconnects the nodes.
-* `Dynamips <https://github.com/GNS3/dynamips/>`_ is required for running IOS routers (using real IOS images) as well as the internal switches and hubs.
-* `VPCS <https://github.com/GNS3/vpcs/>`_ is recommended, it is a builtin node simulating a very simple computer to perform connectitivy tests using ping, traceroute etc.
-* Qemu is strongly recommended on Linux, as most node types are based on Qemu, for example Cisco IOSv and Arista vEOS.
-* libvirt is recommended (Linux only), as it's needed for the NAT cloud.
-* Docker is optional (Linux only), some nodes are based on Docker.
-* mtools is recommended to support data transfer to/from QEMU VMs using virtual disks.
-* i386-libraries of libc and libcrypto are optional (Linux only), they are only needed to run IOU based nodes.
-
-Branches
--------
-
-master
-******
-master is the next stable release, you can test it in your day to day activities.
-Bug fixes or small improvements pull requests go here.
-
-2.x (2.3 for example)
-*********************
-Next major release
-
-*Never* use this branch for production. Pull requests for major new features go here.
-
-Linux
-----
-
-GNS3 is perhaps packaged for your distribution:
-
-* Gentoo: https://packages.gentoo.org/package/net-misc/gns3-server
-* Alpine: https://pkgs.alpinelinux.org/package/v3.10/community/x86_64/gns3-server
-* NixOS: https://search.nixos.org/packages?channel=21.11&from=0&size=50&sort=relevance&type=packages&query=gns3-server
-
-
-Linux (Debian based)
--------------------
-
-The following instructions have been tested with Ubuntu and Mint.
-You must be connected to the Internet in order to install the dependencies.
-
-Dependencies:
-
- Python 3.6, setuptools and the ones listed `here <https://github.com/GNS3/gns3-server/blob/master/requirements.txt>`_
-
-The following commands will install some of these dependencies:
-
-.. code:: bash
-
-   sudo apt-get install python3-setuptools
-
-Finally these commands will install the server as well as the rest of the dependencies:
-
-.. code:: bash
-
-   cd gns3-server-master
-   sudo python3 setup.py install
-   gns3server
-
-To run tests use:
-
-.. code:: bash
-
-   py.test -v
-
-
-Docker container
-****************
-
-For development you can run the GNS3 server in a container
-
-.. code:: bash
-
-    bash scripts/docker_dev_server.sh
-
-
-Run as daemon (Unix only)
-**************************
-
-You will find init sample scripts for various systems
-inside the init directory.
-
-Usefull options:
-
-* --daemon: start process as a daemon
-* --log logfile: store output in a logfile
-* --pid pidfile: store the pid of the running process in a file and prevent double execution
-
-All init scripts require the creation of a GNS3 user. You can change it to another user.
-
-.. code:: bash
-
-    sudo adduser gns3
-
-upstart
-------
-
-For ubuntu < 15.04
-
-You need to copy init/gns3.conf.upstart to /etc/init/gns3.conf
-
-.. code:: bash
-
-    sudo chown root /etc/init/gns3.conf
-    sudo service gns3 start
-
-
-systemd
-------
-
-You need to copy init/gns3.service.systemd to /lib/systemd/system/gns3.service
-
-.. code:: bash
-
-    sudo chown root /lib/systemd/system/gns3.service
-    sudo systemctl start gns3
-
-Windows
-------
-
-
-Please use our `all-in-one installer <https://community.gns3.com/software/download>`_ to install the stable build.
-
-If you install via source you need to first install:
-
- Python (3.3 or above) - https://www.python.org/downloads/windows/
- Pywin32 - https://sourceforge.net/projects/pywin32/
-
-Then you can call
-
-.. code:: bash
-
-    python setup.py install
-
-to install the remaining dependencies.
-
-To run the tests, you also need to call
-
-.. code:: bash
-
-   pip install pytest pytest-capturelog
-
-before actually running the tests with
-
-.. code:: bash
-
-   python setup.py test
-
-or with
-
-.. code:: bash
-
-   py.test -v
-
-Mac OS X
--------
-
-Please use our DMG package for a simple installation.
-
-If you want to test the current git version or contribute to the project,
-you can follow these instructions with virtualenwrapper: http://virtualenvwrapper.readthedocs.org/
-and homebrew: http://brew.sh/.
-
-.. code:: bash
-
-   brew install python3
-   mkvirtualenv gns3-server --python=/usr/local/bin/python3.5
-   python3 setup.py install
-   gns3server
-
-SSL
---
-
-If you want enable SSL support on GNS3 you can generate a self signed certificate:
-
-.. code:: bash
-
-    bash gns3server/cert_utils/create_cert.sh
-
-This command will put the files in ~/.config/GNS3/ssl
-
-After you can start the server in SSL mode with:
-
-.. code:: bash
-
-    python gns3server/main.py --certfile ~/.config/GNS3/ssl/server.cert --certkey ~/.config/GNS3/ssl/server.key --ssl
-
-
-Or in your gns3_server.conf by adding in the Server section:
-
-.. code:: ini
-    
-    [Server]
-    certfile=/Users/noplay/.config/GNS3/ssl/server.cert
-    certkey=/Users/noplay/.config/GNS3/ssl/server.key
-    ssl=True
-
-Running tests
-*************
-
-Just run:
-
-.. code:: bash
-
-    py.test -vv
-
-If you want test coverage:
-
-.. code:: bash
-
-    py.test --cov-report term-missing --cov=gns3server
-
-Security issues
----------------
-Please contact us using contact form available here:
-http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html
@@ -14,4 +14,4 @@ currently being supported with security updates.

 ## Reporting a Vulnerability

-Please contact us at security@gns3.net
+Please use GitHub's report a vulnerability feature. More information can be found in https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability
@@ -1,17 +1,18 @@
 version: '{build}-{branch}'

-image: Visual Studio 2015
+image: Visual Studio 2022

 platform: x64

 environment:
-    PYTHON: "C:\\Python36-x64"
+    PYTHON: "C:\\Python37-x64"
    DISTUTILS_USE_SDK: "1"
    API_TOKEN:
        secure: VEKn4bYH3QO0ixtQW5ni4Enmn8cS1NlZV246ludBDgQ=

 install:
   - cinst nmap
+   - "%PYTHON%\\python.exe -m pip install -U pip setuptools"  # upgrade pip & setuptools first
   - "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt"
   - "%PYTHON%\\python.exe -m pip install -r win-requirements.txt"

@@ -59,6 +59,9 @@ allowed_interfaces = eth0,eth1,virbr0
 ; Default is virbr0 on Linux (requires libvirt) and vmnet8 for other platforms (requires VMware)
 default_nat_interface = vmnet10

+; Enable the built-in templates
+enable_builtin_templates = True
+
 [VPCS]
 ; VPCS executable location, default: search in PATH
 ;vpcs_path = vpcs
@@ -87,3 +90,9 @@ require_kvm = True
 enable_hardware_acceleration = True
 ; Require hardware acceleration in order to start VMs (all platforms)
 require_hardware_acceleration = False
+
+[VMware]
+; First vmnet interface of the range that can be managed by the GNS3 server
+vmnet_start_range = 2
+; Last vmnet interface of the range that can be managed by the GNS3 server. It must be maximum 19 on Windows.
+vmnet_end_range = 255
@@ -1,6 +1,8 @@
 -rrequirements.txt

-pytest==7.0.0
-flake8==4.0.1
-pytest-timeout==1.4.2
-pytest-aiohttp==0.3.0
+pytest==7.2.0; python_version >= '3.7'
+pytest==7.0.1; python_version < '3.7'  # v7.0.1 is the last version to support Python 3.6
+flake8==5.0.4
+pytest-timeout==2.1.0
+pytest-aiohttp==1.0.4; python_version >= '3.7'
+pytest-aiohttp==0.3.0; python_version < '3.7'  # last version to support Python 3.6
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -25,26 +25,27 @@
    },
    "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",
            "version": "1.0",
            "md5sum": "72fb52af76e9561d125dd99224e2c1d1",
            "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/AlmaLinux/almalinux-cloud-init-data.iso"
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/AlmaLinux",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/AlmaLinux/almalinux-cloud-init-data.iso"
        }
    ],
    "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"
            }
        }
@@ -0,0 +1,45 @@
+{
+    "appliance_id": "3da5c614-772c-4963-af86-f24e058c9216",
+    "name": "Alpine Linux Virt",
+    "category": "guest",
+    "description": "Alpine Linux is a security-oriented, lightweight Linux distribution based on musl libc and busybox.\n\nThis is the qemu version of Alpine Linux, stripped down to the maximum, only the default packages are installed without an SSH server.",
+    "vendor_name": "Alpine Linux Development Team",
+    "vendor_url": "http://alpinelinux.org",
+    "documentation_url": "http://wiki.alpinelinux.org",
+    "product_name": "Alpine Linux Virt",
+    "registry_version": 4,
+    "status": "stable",
+    "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 \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": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 1,
+        "ram": 128,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "alpine-virt-3.16.img",
+            "version": "3.16",
+            "md5sum": "ce90ff64b8f8e5860c49ea4a038e54cc",
+            "filesize": 96468992,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/alpine-virt-3.16.img/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "3.16",
+            "images": {
+                "hda_disk_image": "alpine-virt-3.16.img"
+            }
+        }
+    ]
+}
@@ -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",
@@ -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",
@@ -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",
@@ -2,10 +2,12 @@
    "appliance_id": "8f074218-9d61-4e99-ab89-35ca19ad44ee",
    "name": "ArubaOS-CX Simulation Software",
    "category": "multilayer_switch",
-    "description": "The ArubaOS-CX Simulation Software is a virtual platform to enable simulation of the ArubaOS-CX Network Operating System. Simulated networks can be created using many of the protocols in the ArubaOS-CX Operating system like OSPF, BGP (inc. EVPN). Key features like the Aruba Network Analytics Engine and the REST API can be simulated, providing a lightweight development platform to building the modern network.",
+    "description": "The Aruba AOS-CX Switch Simulator is a virtual platform to enable simulation of the Aruba AOS-CX Network Operating System. Simulated networks can be created using many of the protocols in the ArubaOS-CX Operating system like OSPF, BGP (inc. EVPN). Key features like the Aruba Network Analytics Engine and the REST API can be simulated, providing a lightweight development platform to building the modern network.",
    "vendor_name": "HPE Aruba",
-    "vendor_url": "arubanetworks.com",
-    "product_name": "ArubaOS-CX Simulation Software",
+    "vendor_url": "https://www.arubanetworks.com",
+    "documentation_url": "https://asp.arubanetworks.com/downloads;search=Aruba%20AOS%20CX%20Switch%20Simulator;products=Aruba%20Switches",
+    "product_name": "Aruba AOS-CX Switch Simulator",
+    "product_url": "https://www.arubanetworks.com/products/switches/",
    "registry_version": 4,
    "status": "stable",
    "availability": "service-contract",
@@ -30,6 +32,34 @@
        "process_priority": "normal"
    },
    "images": [
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20230531220439.vmdk",
+            "version": "10.12.0006",
+            "md5sum": "c4f80fecd02ef93b431b75dd610e0063",
+            "filesize": 384638464,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20221130174651.vmdk",
+            "version": "10.11.0001",
+            "md5sum": "ed5434173c898f47f19bfda51000611a",
+            "filesize": 364597760,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20220815162137.vmdk",
+            "version": "10.10.1000",
+            "md5sum": "40f9ddf1e12640376af443b5d982f2f6",
+            "filesize": 356162560,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20220616193419.vmdk",
+            "version": "10.10.0002",
+            "md5sum": "ed031aeb6caf92adb408c7603d294fd4",
+            "filesize": 355858944,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
        {
            "filename": "arubaoscx-disk-image-genericx86-p4-20220223012712.vmdk",
            "version": "10.09.1000",
@@ -88,6 +118,30 @@
        }
    ],
    "versions": [
+        {
+            "name": "10.12.0006",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20230531220439.vmdk"
+            }
+        },
+        {
+            "name": "10.11.0001",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20221130174651.vmdk"
+            }
+        },
+        {
+            "name": "10.10.1000",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20220815162137.vmdk"
+            }
+        },
+        {
+            "name": "10.10.0002",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20220616193419.vmdk"
+            }
+        },
        {
            "name": "10.09.1000",
            "images": {
@@ -4,7 +4,7 @@
    "category": "firewall",
    "description": "Aruba Virtual Gateways allow customers to bring their public cloud infrastructure to the SD-WAN fabric and facilitate connectivity between branches and the public cloud.",
    "vendor_name": "HPE Aruba",
-    "vendor_url": "arubanetworks.com",
+    "vendor_url": "https://www.arubanetworks.com",
    "documentation_url": "https://asp.arubanetworks.com/downloads;products=Aruba%20SD-WAN",
    "product_name": "Aruba SD-WAN Virtual Gateway",
    "product_url": "https://www.arubanetworks.com/products/networking/gateways-and-controllers/",
@@ -4,7 +4,7 @@
    "category": "guest",
    "description": "Aruba Virtual Mobility Controller",
    "vendor_name": "HPE Aruba",
-    "vendor_url": "arubanetworks.com",
+    "vendor_url": "https://www.arubanetworks.com",
    "product_name": "Aruba VMC",
    "registry_version": 4,
    "status": "stable",
@@ -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",
@@ -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",
@@ -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",
@@ -0,0 +1,43 @@
+{
+    "appliance_id": "8fecbf89-5cd1-4aea-b735-5f36cf0efbb7",
+    "name": "BIRD2",
+    "category": "router",
+    "description": "The BIRD project aims to develop a fully functional dynamic IP routing daemon primarily targeted on (but not limited to) Linux, FreeBSD and other UNIX-like systems and distributed under the GNU General Public License.",
+    "vendor_name": "CZ.NIC Labs",
+    "vendor_url": "https://bird.network.cz",
+    "documentation_url": "https://bird.network.cz/?get_doc&f=bird.html&v=20",
+    "product_name": "BIRD internet routing daemon",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "Bernhard Ehlers",
+    "maintainer_email": "dev-ehlers@mailbox.org",
+    "usage": "Username:\tgns3\nPassword:\tgns3\nTo become root, use \"sudo -s\".\n\nNetwork configuration:\nsudo nano /etc/network/interfaces\nsudo systemctl restart networking\n\nBIRD:\nRestart: sudo systemctl restart bird\nReconfigure: birdc configure",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 512,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "bird2-debian-2.0.12.qcow2",
+            "version": "2.0.12",
+            "md5sum": "435218a2e90cba921cc7fde1d64a9419",
+            "filesize": 287965184,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/bird2-debian-2.0.12.qcow2"
+        }
+    ],
+    "versions": [
+        {
+            "name": "2.0.12",
+            "images": {
+                "hda_disk_image": "bird2-debian-2.0.12.qcow2"
+            }
+        }
+    ]
+}
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -26,33 +26,37 @@
        "options": "-nographic"
    },
    "images": [
+        {
+            "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
+            "version": "8.4 (2105)",
+            "md5sum": "032eed270415526546eac07628905a62",
+            "filesize": 1309652992,
+            "download_url": "https://cloud.centos.org/centos/8/x86_64/images",
+            "direct_download_url": "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2"
+        },
        {
            "filename": "CentOS-7-x86_64-GenericCloud-2111.qcow2",
            "version": "7 (2111)",
            "md5sum": "730b8662695831670721c8245be61dac",
            "filesize": 897384448,
-            "download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2111.qcow2"
+            "download_url": "https://cloud.centos.org/centos/7/images",
+            "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2111.qcow2"
        },
        {
            "filename": "CentOS-7-x86_64-GenericCloud-1809.qcow2",
            "version": "7 (1809)",
            "md5sum": "da79108d1324b27bd1759362b82fbe40",
            "filesize": 914948096,
-            "download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2"
-        },
-        {
-            "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
-            "version": "8.4 (2105)",
-            "md5sum": "032eed270415526546eac07628905a62",
-            "filesize": 1309652992,
-            "download_url": "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2"
+            "download_url": "https://cloud.centos.org/centos/7/images",
+            "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2"
        },
        {
            "filename": "centos-cloud-init-data.iso",
-            "version": "1.0",
-            "md5sum": "15ca60c12db6d13b8eeae1a19613fd6e",
-            "filesize": 378880,
-            "download_url": "https://github.com/asenci/gns3-centos-cloud-init-data/raw/master/centos-cloud-init-data.iso"
+            "version": "1.1",
+            "md5sum": "59ea8223fd659d8bce9081ff175912e9",
+            "filesize": 374784,
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/centos-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/centos-cloud/centos-cloud-init-data.iso"
        }
    ],
    "versions": [
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -21,14 +21,14 @@
    "images": [
        {
            "filename": "c3725-adventerprisek9-mz.124-15.T14.image",
-            "version": "124-25.T14",
+            "version": "124-15.T14",
            "md5sum": "64f8c427ed48fd21bd02cf1ff254c4eb",
            "filesize": 97859480
        }
    ],
    "versions": [
        {
-            "name": "124-25.T14",
+            "name": "124-15.T14",
            "idlepc": "0x60c09aa0",
            "images": {
                "image": "c3725-adventerprisek9-mz.124-15.T14.image"
@@ -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",
@@ -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",
@@ -21,6 +21,18 @@
        "npe": "npe-400"
    },
    "images": [
+        {
+            "filename": "c7200-adventerprisek9-mz.153-3.XB12.image",
+            "version": "153-3.XB12",
+            "md5sum": "3d234a3793331c972776354531f87221",
+            "filesize": 131471340
+        },
+        {
+            "filename": "c7200-advipservicesk9-mz.152-4.S5.image",
+            "version": "152-4.S5",
+            "md5sum": "cbbbea66a253f1dac0fcf81274dc778d",
+            "filesize": 87756936
+        },
        {
            "filename": "c7200-adventerprisek9-mz.124-24.T5.image",
            "version": "124-24.T5",
@@ -29,6 +41,20 @@
        }
    ],
    "versions": [
+        {
+            "name": "153-3.XB12",
+            "idlepc": "0x60630d08",
+            "images": {
+                "image": "c7200-adventerprisek9-mz.153-3.XB12.image"
+            }
+        },
+        {
+            "name": "152-4.S5",
+            "idlepc": "0x62cc930c",
+            "images": {
+                "image": "c7200-advipservicesk9-mz.152-4.S5.image"
+            }
+        },
        {
            "name": "124-24.T5",
            "idlepc": "0x606df838",
@@ -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",
@@ -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,14 @@
        "kvm": "require"
    },
    "images": [
-	    {
+        {
+            "filename": "asav9-16-2.qcow2",
+            "version": "9.16.2 CML",
+            "md5sum": "1f8db97063a7f738fddc81ac880a906c",
+            "filesize": 262078976,
+            "download_url": "https://learningnetworkstore.cisco.com/cisco-modeling-labs-personal/cisco-modeling-labs-personal/CML-PERSONAL.html"
+        },
+        {
            "filename": "asav9-16-2.qcow2",
            "version": "9.16.2",
            "md5sum": "c3aa2b73b029146ec345bf888dd54eab",
@@ -112,6 +119,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "9.16.2 CML",
+            "images": {
+                "hda_disk_image": "asav9-16-2.qcow2"
+            }
+        },
        {
            "name": "9.16.2",
            "images": {
@@ -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",
@@ -24,6 +24,20 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "c8000v-universalk9_8G_serial.17.06.05.qcow2",
+            "version": "17.06.05 8G",
+            "md5sum": "aeb15ab8e1cbd0cd76f7260a81442f98",
+            "filesize": 1777795072,
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Bengaluru-17.6.5"
+        },
+        {
+            "filename": "c8000v-universalk9_8G_serial.17.06.01a.qcow2",
+            "version": "17.06.01a 8G",
+            "md5sum": "e278fa644295c703976a86f7f1c1cd65",
+            "filesize": 1595277312,
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Bengaluru-17.6.1a"
+        },
        {
            "filename": "c8000v-universalk9_8G_serial.17.04.01a.qcow2",
            "version": "17.04.01a 8G",
@@ -40,6 +54,18 @@
        }
    ],
    "versions": [
+        {
+            "name": "17.06.05 8G",
+            "images": {
+                "hda_disk_image": "c8000v-universalk9_8G_serial.17.06.05.qcow2"
+            }
+        },
+        {
+            "name": "17.06.01a 8G",
+            "images": {
+                "hda_disk_image": "c8000v-universalk9_8G_serial.17.06.01a.qcow2"
+            }
+        },
        {
            "name": "17.04.01a 8G",
            "images": {
@@ -0,0 +1,45 @@
+{
+    "appliance_id": "57a85f0e-b8ae-4820-bd2b-816b2cceb842",
+    "name": "Cisco CAT IOS-XE 9000v",
+    "category": "multilayer_switch",
+    "description": "Cisco IOS-XE 9000v. This appliance requires 16GB of memory to run! Recommend 2 or more vCPUs for faster boot performance",
+    "vendor_name": "Cisco",
+    "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/2-5/#!cml-release-notes",
+    "product_name": "Cisco CAT IOS-XE 9000v",
+    "product_url": "http://virl.cisco.com/",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "There is no default configuration present. Virtual Switch and Interfaces may take several minutes to be usable after appliance boot.",
+    "first_port_name": "GigabitEthernet0/0",
+    "port_name_format": "GigabitEthernet1/0/{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 9,
+        "ram": 16384,
+	"cpus": 2,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require"
+		},
+    "images": [
+        {
+            "filename": "cat9kv-prd-17.10.01prd7.qcow2",
+            "version": "17.10(1)",
+            "md5sum": "ffdbace33d31deae33e2a920a96b79ef",
+            "filesize": 2155806720,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        }
+    ],
+    "versions": [
+        {
+            "name": "17.10(1)",
+            "images": {
+                "hda_disk_image": "cat9kv-prd-17.10.01prd7.qcow2"
+            }
+        }
+    ]
+}
@@ -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",
@@ -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",
@@ -77,6 +77,13 @@
            "md5sum": "4cf5b7fd68075b6f7ee0dd41a4029ca0",
            "filesize": 2150017536,
            "download_url": "https://software.cisco.com/download/"
+        },
+        {
+            "filename": "Cisco_Firepower_Management_Center_Virtual-6.2.2-81.qcow2",
+            "version": "6.2.2 (81)",
+            "md5sum": "2f75c9c6c18a6fbb5516f6f451aef3a4",
+            "filesize": 2112356352,
+            "download_url": "https://software.cisco.com/download/"
        }
    ],
    "versions": [
@@ -121,6 +128,12 @@
            "images": {
                "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual_VMware-6.2.1-342-disk1.vmdk"
            }
+        },
+        {
+            "name": "6.2.2 (81)",
+            "images": {
+                "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual-6.2.2-81.qcow2"
+            }
        }
    ]
 }
@@ -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",
@@ -32,6 +32,13 @@
            "download_url": "https://sourceforge.net/projects/gns-3/files",
            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/IOSv_startup_config.img/download"
        },
+        {
+            "filename": "vios-adventerprisek9-m.spa.159-3.m6.qcow2",
+            "version": "15.9(3)M6",
+            "md5sum": "49a6977977263b2774bebc56e4e678ff",
+            "filesize": 57309696,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
        {
            "filename": "vios-adventerprisek9-m.spa.159-3.m4.qcow2",
            "version": "15.9(3)M4",
@@ -90,6 +97,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "15.9(3)M6",
+            "images": {
+                "hda_disk_image": "vios-adventerprisek9-m.spa.159-3.m6.qcow2",
+                "hdb_disk_image": "IOSv_startup_config.img"
+            }
+        },
        {
            "name": "15.9(3)M4",
            "images": {
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -18,6 +18,12 @@
        "startup_config": "iou_l3_base_startup-config.txt"
    },
    "images": [
+        {
+            "filename": "i86bi_LinuxL3-AdvEnterpriseK9-M2_157_3_May_2018.bin",
+            "version": "15.7(3)M2",
+            "md5sum": "d6874260c3daeeb96d10fc844ae0b93b",
+            "filesize": 184759244
+        },
        {
            "filename": "i86bi-linux-l3-adventerprisek9-ms.155-2.T.bin",
            "version": "155-2T",
@@ -32,6 +38,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "15.7(3)M2",
+            "images": {
+                "image": "i86bi_LinuxL3-AdvEnterpriseK9-M2_157_3_May_2018.bin"
+            }
+        },
        {
            "name": "155-2T",
            "images": {
@@ -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",
@@ -33,6 +33,34 @@
            "filesize": 1592000512,
            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.1(1)"
        },
+        {
+            "filename": "nexus9300v.10.1.1.qcow2",
+            "version": "9300v 10.1.1",
+            "md5sum": "4051bdb96aff6e54b72b7e3b06c9d6eb",
+            "filesize": 1990983680,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.1(1)"
+        },
+        {
+            "filename": "nexus9500v.9.3.9.qcow2",
+            "version": "9500v 9.3.9",
+            "md5sum": "30c25039927f89aebe73ea20d15abd6d",
+            "filesize": 1980760064,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(9)"
+        },
+        {
+            "filename": "nexus9300v.9.3.9.qcow2",
+            "version": "9300v 9.3.9",
+            "md5sum": "e807005cb7d2d2957b4af0e59f368b36",
+            "filesize": 1980563456,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(9)"
+        },
+        {
+            "filename": "nexus9300v.9.3.8.qcow2",
+            "version": "9300v 9.3.8",
+            "md5sum": "f8bd834f8395c134dc98d895c98441af",
+            "filesize": 1976434688,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(8)"
+        },
        {
            "filename": "nexus9500v.9.3.7.qcow2",
            "version": "9500v 9.3.7",
@@ -160,12 +188,12 @@
            "download_url": "https://software.cisco.com/download/"
        },
        {
-            "filename": "OVMF-20160813.fd",
-            "version": "16.08.13",
-            "md5sum": "8ff0ef1ec56345db5b6bda1a8630e3c6",
-            "filesize": 2097152,
-            "download_url": "",
-            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-20160813.fd.zip/download",
+            "filename": "OVMF-edk2-stable202305.fd",
+            "version": "stable202305",
+            "md5sum": "6c4cf1519fec4a4b95525d9ae562963a",
+            "filesize": 4194304,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-edk2-stable202305.fd.zip/download",
            "compression": "zip"
        }
    ],
@@ -173,133 +201,161 @@
        {
            "name": "9500v 10.1.1",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nexus9500v64.10.1.1.qcow2"
            }
        },
+        {
+            "name": "9300v 10.1.1",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9300v.10.1.1.qcow2"
+            }
+        },
+        {
+            "name": "9500v 9.3.9",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9500v.9.3.9.qcow2"
+            }
+        },
+        {
+            "name": "9300v 9.3.9",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9300v.9.3.9.qcow2"
+            }
+        },
+        {
+            "name": "9300v 9.3.8",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9300v.9.3.8.qcow2"
+            }
+        },
        {
            "name": "9500v 9.3.7",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nexus9500v.9.3.7.qcow2"
            }
        },
        {
            "name": "9500v 9.3.3",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nexus9500v.9.3.3.qcow2"
            }
        },
        {
            "name": "9300v 9.3.3",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nexus9300v.9.3.3.qcow2"
            }
        },
        {
            "name": "9.3.1",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv.9.3.1.qcow2"
            }
        },
        {
            "name": "9.2.3",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.9.2.3.qcow2"
            }
        },
        {
            "name": "9.2.2",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.9.2.2.qcow2"
            }
        },
        {
            "name": "9.2.1",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.9.2.1.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.9",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.9.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.7",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.7.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.6",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.6.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.5",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.5.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.4",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.4.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.3",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.3.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.2",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.2.qcow2"
            }
        },
        {
            "name": "7.0.3.I7.1",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I7.1.qcow2"
            }
        },
        {
            "name": "7.0.3.I6.1",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I6.1.qcow2"
            }
        },
        {
            "name": "7.0.3.I5.2",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I5.2.qcow2"
            }
        },
        {
            "name": "7.0.3.I5.1",
            "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                "hda_disk_image": "nxosv-final.7.0.3.I5.1.qcow2"
            }
        }
@@ -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"
+    }
+}
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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"
+            }
        }
    ]
 }
@@ -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)"
+            }
        }
    ]
 }
@@ -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",
@@ -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",
@@ -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",
@@ -8,23 +8,47 @@
    "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",
-    "usage": "Default username is cumulus and password is CumulusLinux! in version 4.1 and earlier, and cumulus in version 4.2 and later.",
+    "usage": "Default username/password is cumulus/CumulusLinux! in version 4.1 and earlier, and cumulus/cumulus in version 4.2 and later.",
    "first_port_name": "eth0",
    "port_name_format": "swp{port1}",
    "qemu": {
        "adapter_type": "virtio-net-pci",
        "adapters": 7,
-        "ram": 768,
-        "hda_disk_interface": "ide",
+        "ram": 1024,
+        "hda_disk_interface": "virtio",
        "arch": "x86_64",
        "console_type": "telnet",
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "cumulus-linux-5.4.0-vx-amd64-qemu.qcow2",
+            "version": "5.4.0",
+            "md5sum": "b36d781a168e381e0db5b1d85a2f970d",
+            "filesize": 6254493696,
+            "download_url": "https://www.nvidia.com/en-us/networking/ethernet-switching/cumulus-vx/download/",
+            "direct_download_url": "https://d2cd9e7ca6hntp.cloudfront.net/public/CumulusLinux-5.4.0/cumulus-linux-5.4.0-vx-amd64-qemu.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-5.3.1-vx-amd64-qemu.qcow2",
+            "version": "5.3.1",
+            "md5sum": "366b4e5afbfb638244fac4dd6cd092fd",
+            "filesize": 2147479552,
+            "download_url": "https://www.nvidia.com/en-us/networking/ethernet-switching/cumulus-vx/download/",
+            "direct_download_url": "https://d2cd9e7ca6hntp.cloudfront.net/public/CumulusLinux-5.3.1/cumulus-linux-5.3.1-vx-amd64-qemu.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-5.1.0-vx-amd64-qemu.qcow2",
+            "version": "5.1.0",
+            "md5sum": "b46a68bbb57e77fab5c2927367bead13",
+            "filesize": 4174446592,
+            "download_url": "https://www.nvidia.com/en-us/networking/ethernet-switching/cumulus-vx/download/",
+            "direct_download_url": "https://d2cd9e7ca6hntp.cloudfront.net/public/CumulusLinux-5.1.0/cumulus-linux-5.1.0-vx-amd64-qemu.qcow2"
+        },
        {
            "filename": "cumulus-linux-4.3.0-vx-amd64-qemu.qcow2",
            "version": "4.3.0",
@@ -231,6 +255,24 @@
        }
    ],
    "versions": [
+        {
+            "name": "5.4.0",
+            "images": {
+                "hda_disk_image": "cumulus-linux-5.4.0-vx-amd64-qemu.qcow2"
+            }
+        },
+        {
+            "name": "5.3.1",
+            "images": {
+                "hda_disk_image": "cumulus-linux-5.3.1-vx-amd64-qemu.qcow2"
+            }
+        },
+        {
+            "name": "5.1.0",
+            "images": {
+                "hda_disk_image": "cumulus-linux-5.1.0-vx-amd64-qemu.qcow2"
+            }
+        },
        {
            "name": "4.3.0",
            "images": {
@@ -6,10 +6,10 @@
    "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",
+    "maintainer": "Bernhard Ehlers",
+    "maintainer_email": "dev-ehlers@mailbox.org",
    "usage": "Username:\tdebian\nPassword:\tdebian\nTo become root, use \"sudo -s\".\n\nNetwork configuration:\n- In \"/etc/network/interfaces\" comment out \"source-directory /run/network/interfaces.d\"\n- Remove \"/etc/network/interfaces.d/50-cloud-init\"\n- Create \"/etc/network/interfaces.d/10-ens4\", for example:\n\nauto ens4\n#iface ens4 inet dhcp\niface ens4 inet static\n    address 10.1.1.100/24\n    gateway 10.1.1.1\n    dns-nameservers 10.1.1.1\n",
    "symbol": "linux_guest.svg",
    "port_name_format": "ens{port4}",
@@ -24,41 +24,57 @@
    },
    "images": [
        {
-            "filename": "debian-11-genericcloud-amd64-20220328-962.qcow2",
-            "version": "11.3",
-            "md5sum": "7cf51e23747898485971a656ac2eb96d",
-            "filesize": 253296640,
-            "download_url": "https://cloud.debian.org/images/cloud/bullseye/",
-            "direct_download_url": "https://cloud.debian.org/images/cloud/bullseye/20220328-962/debian-11-genericcloud-amd64-20220328-962.qcow2"
+            "filename": "debian-12-genericcloud-amd64-20230612-1409.qcow2",
+            "version": "12.0",
+            "md5sum": "524cf33a1284d6e3363bd4d843756386",
+            "filesize": 280166400,
+            "download_url": "https://cloud.debian.org/images/cloud/bookworm/",
+            "direct_download_url": "https://cloud.debian.org/images/cloud/bookworm/20230612-1409/debian-12-genericcloud-amd64-20230612-1409.qcow2"
        },
        {
-            "filename": "debian-10-genericcloud-amd64-20220328-962.qcow2",
-            "version": "10.12",
-            "md5sum": "e92dfa1fc779fff807856f6ea6876e42",
-            "filesize": 232980480,
+            "filename": "debian-11-genericcloud-amd64-20230601-1398.qcow2",
+            "version": "11.7",
+            "md5sum": "1b24a841dc5ca9bcf40b94ad4b4775d4",
+            "filesize": 259063808,
+            "download_url": "https://cloud.debian.org/images/cloud/bullseye/",
+            "direct_download_url": "https://cloud.debian.org/images/cloud/bullseye/20230601-1398/debian-11-genericcloud-amd64-20230601-1398.qcow2"
+        },
+        {
+            "filename": "debian-10-genericcloud-amd64-20230601-1398.qcow2",
+            "version": "10.13",
+            "md5sum": "ca799fb4011712f4686c422c1a9731cf",
+            "filesize": 228130816,
            "download_url": "https://cloud.debian.org/images/cloud/buster/",
-            "direct_download_url": "https://cloud.debian.org/images/cloud/buster/20220328-962/debian-10-genericcloud-amd64-20220328-962.qcow2"
+            "direct_download_url": "https://cloud.debian.org/images/cloud/buster/20230601-1398/debian-10-genericcloud-amd64-20230601-1398.qcow2"
        },
        {
            "filename": "debian-cloud-init-data.iso",
            "version": "1.0",
            "md5sum": "43f6bf70c178a9d3c270b5c24971e578",
            "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/Debian/debian-cloud-init-data.iso"
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/Debian",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/Debian/debian-cloud-init-data.iso"
        }
    ],
    "versions": [
        {
-            "name": "11.3",
+            "name": "12.0",
            "images": {
-                "hda_disk_image": "debian-11-genericcloud-amd64-20220328-962.qcow2",
+                "hda_disk_image": "debian-12-genericcloud-amd64-20230612-1409.qcow2",
                "cdrom_image": "debian-cloud-init-data.iso"
            }
        },
        {
-            "name": "10.12",
+            "name": "11.7",
            "images": {
-                "hda_disk_image": "debian-10-genericcloud-amd64-20220328-962.qcow2",
+                "hda_disk_image": "debian-11-genericcloud-amd64-20230601-1398.qcow2",
+                "cdrom_image": "debian-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "10.13",
+            "images": {
+                "hda_disk_image": "debian-10-genericcloud-amd64-20230601-1398.qcow2",
                "cdrom_image": "debian-cloud-init-data.iso"
            }
        }
@@ -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",
@@ -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",
@@ -6,11 +6,11 @@
    "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",
-    "usage": "You can add records by adding entries to the /etc/hosts file in the following format:\n%IP_ADDRESS% %HOSTNAME%.lab %HOSTNAME%\n\nExample:\n192.168.123.10 router1.lab router1",
+    "usage": "You can add records by adding entries to the /etc/hosts file in the following format:\n%IP_ADDRESS% %HOSTNAME%.lab %HOSTNAME%\n\nExample:\n192.168.123.10 router1.lab router1\n\nIf you require DNS requests to be serviced from a different subnet than the one that the DNS server resides on then do the following:\n\n1. Edit (nano or vim) /ect/init.d/dnsmasq\n2. Find the line DNSMASQ_OPTS=\"$DNSMASQ_OPTS --local-service\"\n3. Remove the --local-service or comment that line out and add DNSMASQ_OPTS=\"\"\n4. Restart dnsmasq using the following command: service dnsmasq restart \n\n There is an error in this Docker container, edit /etc/dnsmasq.conf, add: interface=eth0",
    "symbol": "linux_guest.svg",
    "docker": {
        "adapters": 1,
@@ -2,7 +2,7 @@
    "appliance_id": "1cfdf900-7c30-4cb7-8f03-3f61d2581633",
    "name": "Empty VM",
    "category": "guest",
-    "description": "An empty VM with empty hard disks 8G, 30G & 100G.",
+    "description": "A empty VM with empty hard disks 8G, 30G, 100G & 200G.",
    "vendor_name": "GNS3",
    "vendor_url": "https://gns3.com",
    "documentation_url": "",
@@ -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,13 +41,21 @@
            "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",
            "filesize": 198656,
            "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/empty100G.qcow2/download"
+        },
+        {
+            "filename": "empty200G.qcow2",
+            "version": "200G",
+            "md5sum": "d1686d2f25695dee32eab9a6f4652c7c",
+            "filesize": 200192,
+            "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/empty200G.qcow2/download"
        }
    ],
    "versions": [
@@ -63,11 +71,17 @@
                "hda_disk_image": "empty30G.qcow2"
            }
        },
-		    {
+        {
            "name": "100G",
            "images": {
                "hda_disk_image": "empty100G.qcow2"
            }
+        },
+        {
+            "name": "200G",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2"
+            }
        }
-	]
+    ]
 }
@@ -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,6 +27,20 @@
        "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",
+            "filesize": 458227712,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v31.7.1.4.qcow2"
+        },
        {
            "filename": "EXOS-VM_v31.1.1.3.qcow2",
            "version": "31.1.1.3",
@@ -99,6 +113,18 @@
        }
    ],
    "versions": [
+        {
+            "name": "32.1.1.6",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v32.1.1.6.qcow2"
+            }
+        },
+        {
+            "name": "31.7.1.4",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v31.7.1.4.qcow2"
+            }
+        },
        {
            "name": "31.1.1.3",
            "images": {
@@ -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",
@@ -27,6 +27,13 @@
        "options": "-nographic"
    },
    "images": [
+        {
+            "filename": "VOSSGNS3.8.8.0.0.qcow2",
+            "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"
+        },
        {
            "filename": "VOSSGNS3.8.4.0.0.qcow2",
            "version": "v8.4.0.0",
@@ -78,6 +85,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "v8.8.0.0",
+            "images": {
+                "hda_disk_image": "VOSSGNS3.8.8.0.0.qcow2"
+            }
+        },
        {
            "name": "v8.4.0.0",
            "images": {
@@ -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",
@@ -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",
@@ -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",
@@ -31,18 +31,20 @@
            "version": "35-1.2",
            "md5sum": "cfa9cdcfb946e5f4cf9dd4d7906008d0",
            "filesize": 376897536,
-            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images",
+            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
        },
        {
            "filename": "fedora-cloud-init-data.iso",
            "version": "1.0",
            "md5sum": "3d0d6391d3f5ece1180c70b9667c4dca",
            "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/fedora-cloud/fedora-cloud-init-data.iso"
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/fedora-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/fedora-cloud/fedora-cloud-init-data.iso"
        }
    ],
    "versions": [
-       {
+        {
            "name": "35-1.2",
            "images": {
                "hda_disk_image": "Fedora-Cloud-Base-35-1.2.x86_64.qcow2",
@@ -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",
@@ -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",
@@ -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,48 @@
            "filesize": 30998528,
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        },
+        {
+            "filename": "FAD_KVM-V7.2.0-build0210-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.2.0",
+            "md5sum": "e01f14443b0434adc803c482bb92e3a2",
+            "filesize": 145817600,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V7.1.1-build0117-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.1.1",
+            "md5sum": "3ab1a886e4961ded804588de6f3b2e27",
+            "filesize": 134807552,
+            "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-V7.0.5-build0053-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.0.5",
+            "md5sum": "3285114b8f317a367b7bcf79631a42f9",
+            "filesize": 127860736,
+            "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 +246,48 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.2.0",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.2.0-build0210-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "7.1.1",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.1.1-build0117-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "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.5",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.0.5-build0053-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": {
@@ -8,11 +8,11 @@
    "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",
-    "usage": "Default username is admin, no password is set.",
+    "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4",
    "symbol": "fortinet.svg",
    "port_name_format": "Port{port1}",
    "qemu": {
@@ -27,6 +27,34 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+            "version": "7.2.2",
+            "md5sum": "fe445cc79eed00b3abcdba9c36e7445d",
+            "filesize": 345501696,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v7.2.1-build1215-FORTINET.out.kvm.qcow2",
+            "version": "7.2.1",
+            "md5sum": "c13b6c7678a2fc12ab969fc681ad3af5",
+            "filesize": 340631552,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
+            "version": "7.0.6",
+            "md5sum": "2e382abcf661c41c1a69178e9cdc5a3f",
+            "filesize": 335556608,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v7.0.5-build0365-FORTINET.out.kvm.qcow2",
+            "version": "7.0.5",
+            "md5sum": "6cbc1f865ed285bb3a73323e222f03b8",
+            "filesize": 334184448,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FAZ_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
            "version": "6.4.5",
@@ -177,6 +205,34 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.2.2",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.1",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.2.1-build1215-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.6",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.5",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.0.5-build0365-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "6.4.5",
            "images": {
@@ -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",
@@ -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",
@@ -8,11 +8,11 @@
    "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",
-    "usage": "Default username is admin, no password is set.",
+    "usage": "Default username is admin, no password is set.\n\n- FortiGate version 7.0.0 and above require 2GB RAM.\n\n- FortiGate versions higher than 7.2.0 trial license is VERY restrictive, not recommended for use.",
    "symbol": "fortinet.svg",
    "port_name_format": "Port{port1}",
    "qemu": {
@@ -27,6 +27,55 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FGT_VM64_KVM-v7.2.4.F-build1396-FORTINET.out.kvm.qcow2",
+            "version": "7.2.4",
+            "md5sum": "e3bd5958ff3d4f9363152c340e9b9578",
+            "filesize": 95158272,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.2.3.F-build1262-FORTINET.out.kvm.qcow2",
+            "version": "7.2.3",
+            "md5sum": "e8f3c5879f0d6fe238dc2665a3508694",
+            "filesize": 87490560,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.2.1.F-build1254-FORTINET.out.kvm.qcow2",
+            "version": "7.2.1",
+            "md5sum": "e382a1ad5c7c16f49a1c0d3f45e3a3b2",
+            "filesize": 86704128,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.0.10.M-build0450-FORTINET.out.kvm.qcow2",
+            "version": "7.0.10",
+            "md5sum": "c7eb9fad8484405aa5bd8a4dd9e67722",
+            "filesize": 77135872,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.0.9.M-build0444-FORTINET.out.kvm.qcow2",
+            "version": "7.0.9",
+            "md5sum": "0aee912ab11bf9a4b0e3fc1a62dd0e40",
+            "filesize": 77135872,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v6.4.12.M-build2060-FORTINET.out.kvm.qcow2",
+            "version": "6.4.12",
+            "md5sum": "df2569f9fa3e40b65fa0db741cf6e01e",
+            "filesize": 69861376,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v6.M-build2030-FORTINET.out.kvm.qcow2",
+            "version": "6.4.11",
+            "md5sum": "bcd7491ddfa31fec4f618b73792456e4",
+            "filesize": 69861376,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FGT_VM64_KVM-v6-build1828-FORTINET.out.kvm.qcow2",
            "version": "6.4.5",
@@ -254,6 +303,55 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.2.4",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.4.F-build1396-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.3",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.3.F-build1262-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.1",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.1.F-build1254-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.10",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.10.M-build0450-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.9",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.9.M-build0444-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.4.12",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6.4.12.M-build2060-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.4.11",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6.M-build2030-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "6.4.5",
            "images": {
@@ -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",
@@ -27,6 +27,34 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FML_VMKV-64-v722.M-build0380-FORTINET.out.kvm.qcow2",
+            "version": "7.2.2",
+            "md5sum": "ec7c32c90f4cfba32a744ea74adc596b",
+            "filesize": 124387328,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v721.M-build0364-FORTINET.out.kvm.qcow2",
+            "version": "7.2.1",
+            "md5sum": "b7bf13c2fb013693936b45d89dfab1ac",
+            "filesize": 123535360,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v705-build0208-FORTINET.out.kvm.qcow2",
+            "version": "7.0.5",
+            "md5sum": "62e561465ff8134efdea6f66ba9ccf20",
+            "filesize": 118226944,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v647-build0467-FORTINET.out.kvm.qcow2",
+            "version": "6.4.7",
+            "md5sum": "11fab90b39d88446a711bbd01802aca1",
+            "filesize": 112066560,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FML_VMKV-64-v60-build0257-FORTINET.out.kvm.qcow2",
            "version": "6.2.1",
@@ -184,6 +212,34 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.2.2",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v722.M-build0380-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.1",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v721.M-build0364-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.5",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v705-build0208-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.4.7",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v647-build0467-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "6.2.1",
            "images": {
@@ -8,11 +8,11 @@
    "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",
-    "usage": "Default username is admin, no password is set.",
+    "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4",
    "symbol": "fortinet.svg",
    "port_name_format": "Port{port1}",
    "qemu": {
@@ -27,6 +27,34 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FMG_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+            "version": "7.2.2",
+            "md5sum": "2ff1298257321cd485d2cad91d6ce510",
+            "filesize": 246083584,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v7.2.1-build1215-FORTINET.out.kvm.qcow2",
+            "version": "7.2.1",
+            "md5sum": "1a3eeff1204fa8f4243773f7521e12b5",
+            "filesize": 242814976,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
+            "version": "7.0.6",
+            "md5sum": "dfa4df9e976ed87e73cb9601a8a70323",
+            "filesize": 239190016,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v7.0.5-build0365-FORTINET.out.kvm.qcow2",
+            "version": "7.0.5",
+            "md5sum": "e8b9c992784cea766b52a427a5fe0279",
+            "filesize": 237535232,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FMG_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
            "version": "6.4.5",
@@ -177,6 +205,34 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.2.2",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.1",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.2.1-build1215-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.6",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.5",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.0.5-build0365-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "6.4.5",
            "images": {
@@ -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",
@@ -27,6 +27,13 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FPX_KVM-v700.M-build0102-FORTINET.out.kvm.qcow2",
+            "version": "7.0.6",
+            "md5sum": "ad0a4612580b5a2754cc4e0121a9cf22",
+            "filesize": 146800640,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FPX_KVM-v100-build0162-FORTINET.out.kvm.qcow2",
            "version": "1.1.2",
@@ -51,6 +58,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.0.6",
+            "images": {
+                "hda_disk_image": "FPX_KVM-v700.M-build0102-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "1.1.2",
            "images": {
@@ -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",
@@ -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",
@@ -28,6 +28,13 @@
        "options": "-smp 2"
    },
    "images": [
+        {
+            "filename": "FSA_KVM-v400-build0231-FORTINET.out.kvm.qcow2",
+            "version": "4.2.2",
+            "md5sum": "02b7f49e3c04861601a7af26452eed66",
+            "filesize": 156172304,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FSA_KVM-v300-build0124-FORTINET.out.kvm.qcow2",
            "version": "3.1.2",
@@ -114,6 +121,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "4.2.2",
+            "images": {
+                "hda_disk_image": "FSA_KVM-v400-build0231-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FSA-datadrive.qcow2"
+            }
+        },
        {
            "name": "3.1.2",
            "images": {
@@ -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",
@@ -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",
@@ -27,6 +27,34 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FWB_KVM-v7.2.1-build0330-FORTINET.out.kvm.boot.qcow2",
+            "version": "7.2.1",
+            "md5sum": "5806524ca31401c313e0e86e992b6659",
+            "filesize": 260506112,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v7.0.6-build0140-FORTINET.out.kvm.boot.qcow2",
+            "version": "7.0.6",
+            "md5sum": "1327019e891678a0f2fb9602086d998d",
+            "filesize": 258408960,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v700-build0129-FORTINET.out.kvm.qcow2",
+            "version": "7.0.5",
+            "md5sum": "dc14114c68cf42df322e5b89bffd9bf7",
+            "filesize": 258146816,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v700-build0097-FORTINET.out.kvm.qcow2",
+            "version": "7.0.1",
+            "md5sum": "a197e9db03ffaf7feb520c8f77f940f7",
+            "filesize": 257622528,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FWB_KVM-v600-build0727-FORTINET.out.kvm.qcow2",
            "version": "6.2.1",
@@ -121,6 +149,34 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.2.1",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.2.1-build0330-FORTINET.out.kvm.boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.6",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.0.6-build0140-FORTINET.out.kvm.boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.5",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v700-build0129-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.1",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v700-build0097-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "6.2.1",
            "images": {
@@ -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",
@@ -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",
@@ -24,125 +24,35 @@
    },
    "images": [
        {
-            "filename": "FreeBSD-12.1-RELEASE-amd64.qcow2",
-            "version": "12.1",
-            "md5sum": "0079b4ca99f64bb825cfbaefcca10fd4",
-            "filesize": 3043229696,
+            "filename": "FreeBSD-13.0-RELEASE-amd64.qcow2",
+            "version": "13.0",
+            "md5sum": "e8e598959da456c03260421b5f9890de",
+            "filesize": 3466854400,
            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.1-RELEASE/amd64/Latest/FreeBSD-12.1-RELEASE-amd64.qcow2.xz",
+            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/13.0-RELEASE/amd64/Latest/FreeBSD-13.0-RELEASE-amd64.qcow2.xz",
            "compression": "xz"
        },
        {
-            "filename": "FreeBSD-12.0-RELEASE-amd64.qcow2",
-            "version": "12.0",
-            "md5sum": "4d2126ba79dad224628be6f25a908bd8",
-            "filesize": 2644836352,
+            "filename": "FreeBSD-12.3-RELEASE-amd64.qcow2",
+            "version": "12.3",
+            "md5sum": "3d7d5396f3d89ed30c2bfa2ee2e6b013",
+            "filesize": 3412000768,
            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.0-RELEASE/amd64/Latest/FreeBSD-12.0-RELEASE-amd64.qcow2.xz",
-            "compression": "xz"
-        },
-        {
-            "filename": "FreeBSD-11.3-RELEASE-amd64.qcow2",
-            "version": "11.3",
-            "md5sum": "cdb35f676571b91584ff88502c48d399",
-            "filesize": 1698037760,
-            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/11.3-RELEASE/amd64/Latest/FreeBSD-11.3-RELEASE-amd64.qcow2.xz",
-            "compression": "xz"
-        },
-        {
-            "filename": "FreeBSD-11.2-RELEASE-amd64.qcow2",
-            "version": "11.2",
-            "md5sum": "44d37e65be4bb4054f067911c84d074a",
-            "filesize": 1630076928,
-            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/11.2-RELEASE/amd64/Latest/FreeBSD-11.2-RELEASE-amd64.qcow2.xz",
-            "compression": "xz"
-        },
-        {
-            "filename": "FreeBSD-11.1-RELEASE-amd64.qcow2",
-            "version": "11.1",
-            "md5sum": "d78b2a7d05ec62f799e14ded4817ea69",
-            "filesize": 1533345792,
-            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/11.1-RELEASE/amd64/Latest/FreeBSD-11.1-RELEASE-amd64.qcow2.xz",
-            "compression": "xz"
-        },
-        {
-            "filename": "FreeBSD-11.0-RELEASE-amd64.qcow2",
-            "version": "11.0",
-            "md5sum": "1b04999198f492afd6dc4935b8c7cc22",
-            "filesize": 1384382464,
-            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/11.0-RELEASE/amd64/Latest/FreeBSD-11.0-RELEASE-amd64.qcow2.xz",
-            "compression": "xz"
-        },
-        {
-            "filename": "FreeBSD-10.4-RELEASE-amd64.qcow2",
-            "version": "10.4",
-            "md5sum": "ad498873733c57d1f6d890d587a11e3c",
-            "filesize": 1013448704,
-            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/10.4-RELEASE/amd64/Latest/FreeBSD-10.4-RELEASE-amd64.qcow2.xz",
-            "compression": "xz"
-        },
-        {
-            "filename": "FreeBSD-10.3-RELEASE-amd64.qcow2",
-            "version": "10.3",
-            "md5sum": "1a00cebef520dfac8d2bda10ea16a951",
-            "filesize": 974651392,
-            "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/10.3-RELEASE/amd64/Latest/FreeBSD-10.3-RELEASE-amd64.qcow2.xz",
+            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.3-RELEASE/amd64/Latest/FreeBSD-12.3-RELEASE-amd64.qcow2.xz",
            "compression": "xz"
        }
    ],
    "versions": [
        {
-            "name": "12.1",
+            "name": "13.0",
            "images": {
-                "hda_disk_image": "FreeBSD-12.1-RELEASE-amd64.qcow2"
+                "hda_disk_image": "FreeBSD-13.0-RELEASE-amd64.qcow2"
            }
        },
        {
-            "name": "12.0",
+            "name": "12.3",
            "images": {
-                "hda_disk_image": "FreeBSD-12.0-RELEASE-amd64.qcow2"
-            }
-        },
-        {
-            "name": "11.3",
-            "images": {
-                "hda_disk_image": "FreeBSD-11.3-RELEASE-amd64.qcow2"
-            }
-        },
-        {
-            "name": "11.2",
-            "images": {
-                "hda_disk_image": "FreeBSD-11.2-RELEASE-amd64.qcow2"
-            }
-        },
-        {
-            "name": "11.1",
-            "images": {
-                "hda_disk_image": "FreeBSD-11.1-RELEASE-amd64.qcow2"
-            }
-        },
-        {
-            "name": "11.0",
-            "images": {
-                "hda_disk_image": "FreeBSD-11.0-RELEASE-amd64.qcow2"
-            }
-        },
-        {
-            "name": "10.4",
-            "images": {
-                "hda_disk_image": "FreeBSD-10.4-RELEASE-amd64.qcow2"
-            }
-        },
-        {
-            "name": "10.3",
-            "images": {
-                "hda_disk_image": "FreeBSD-10.3-RELEASE-amd64.qcow2"
+                "hda_disk_image": "FreeBSD-12.3-RELEASE-amd64.qcow2"
            }
        }
    ]
@@ -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",
@@ -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",
@@ -22,6 +22,14 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "frr-8.2.2.qcow2",
+            "version": "8.2.2",
+            "md5sum": "45cda6b991a1b9e8205a3a0ecc953640",
+            "filesize": 56609280,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/frr-8.2.2.qcow2"
+        },
        {
            "filename": "frr-8.1.0.qcow2",
            "version": "8.1.0",
@@ -48,6 +56,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "8.2.2",
+            "images": {
+                "hda_disk_image": "frr-8.2.2.qcow2"
+            }
+        },
        {
            "name": "8.1.0",
            "images": {
@@ -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",
@@ -11,7 +11,7 @@
    "status": "experimental",
    "availability": "service-contract",
    "maintainer": "none",
-    "maintainer_email": "none",
+    "maintainer_email": "",
    "usage": "Default user is super, default password is super.",
    "port_name_format": "GigabitEthernet0/0/{0}",
    "qemu": {
@@ -26,6 +26,13 @@
        "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",
+            "filesize": 673465344,
+            "download_url": "https://support.huawei.com/enterprise/en/routers/ar1000v-pid-21768212/software"
+        },
        {
            "filename": "ar1k-V300R019C00SPC300.qcow2",
            "version": "V300R019C00SPC300",
@@ -35,6 +42,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "V300R021C00SPC100T",
+            "images": {
+                "hda_disk_image": "huaweiar1k-5.170-V300R021C00SPC100T-Auto-update-esn.qcow2"
+            }
+        },
        {
            "name": "V300R019C00SPC300",
            "images": {