diff --git a/ipfire.gns3a b/ipfire.gns3a
new file mode 100644
index 0000000..92f2e6b
--- /dev/null
+++ b/ipfire.gns3a
@@ -0,0 +1,165 @@
+{
+    "name": "IPFire",
+    "category": "firewall",
+    "description": "IPFire was designed with both modularity and a high-level of flexibility in mind. You can easily deploy many variations of it, such as a firewall, a proxy server or a VPN gateway. The modular design ensures that it runs exactly what you've configured it for and nothing more. Everything is simple to manage and update through the package manager, making maintenance a breeze.",
+    "vendor_name": "IPFire Project",
+    "vendor_url": "http://www.ipfire.org/",
+    "documentation_url": "http://wiki.ipfire.org/en/start",
+    "product_name": "IPFire",
+    "product_url": "http://www.ipfire.org/features",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "A config wizard will be started at first boot.",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 1024,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "ipfire-2.23.2gb-ext4.x86_64-full-core131.img",
+            "version": "2.23",
+            "md5sum": "604c06e20c36985ff00802da4509340c",
+            "filesize": 1541160960,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://muug.ca/mirror/ipfire/releases/ipfire-2.x/2.23-core131/ipfire-2.23.2gb-ext4.x86_64-full-core131.img.xz",
+            "compression": "xz"
+        },
+        {
+            "filename": "ipfire-2.21.2gb-ext4.x86_64-full-core129.img",
+            "version": "2.21.129",
+            "md5sum": "84801c588174763c585967a2851a7769",
+            "filesize": 1541160960,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core129/ipfire-2.21.2gb-ext4.x86_64-full-core129.img.xz",
+            "compression": "xz"
+        },
+        {
+            "filename": "ipfire-2.21.2gb-ext4.x86_64-full-core124.img",
+            "version": "2.21.124",
+            "md5sum": "970a5cafaa0cb4cfbf42772f41d24932",
+            "filesize": 1541160960,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core124/ipfire-2.21.2gb-ext4.x86_64-full-core124.img.xz",
+            "compression": "xz"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core119.img",
+            "version": "2.19.119",
+            "md5sum": "b57be976ff54569b71eae4ee66634b0d",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core119/ipfire-2.19.1gb-ext4-scon.x86_64-full-core119.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core118.img",
+            "version": "2.19.118",
+            "md5sum": "4dbeb474848d87c16c20ff4e31feb204",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core118/ipfire-2.19.1gb-ext4-scon.x86_64-full-core118.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core117.img",
+            "version": "2.19.117",
+            "md5sum": "657673d88b94ed7d22332aebe817bc86",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core117/ipfire-2.19.1gb-ext4-scon.x86_64-full-core117.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core116.img",
+            "version": "2.19.116",
+            "md5sum": "2a8df99d117a0dbfb67870494c0c67cd",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core116/ipfire-2.19.1gb-ext4-scon.x86_64-full-core116.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core111.img",
+            "version": "2.19.111",
+            "md5sum": "741ab771cadd2f6a1fc4a85b3478ae5f",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "http://downloads.ipfire.org/releases/ipfire-2.x/2.19-core110/ipfire-2.19.1gb-ext4-scon.x86_64-full-core110.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core110.img",
+            "version": "2.19.110",
+            "md5sum": "d91bdabee5db83d0f93573f88ea542b1",
+            "filesize": 958398464,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "http://downloads.ipfire.org/releases/ipfire-2.x/2.19-core110/ipfire-2.19.1gb-ext4-scon.x86_64-full-core110.img.gz",
+            "compression": "gzip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "2.23",
+            "images": {
+                "hda_disk_image": "ipfire-2.23.2gb-ext4.x86_64-full-core131.img"
+            }
+        },
+        {
+            "name": "2.21.129",
+            "images": {
+                "hda_disk_image": "ipfire-2.21.2gb-ext4.x86_64-full-core129.img"
+            }
+        },
+        {
+            "name": "2.21.124",
+            "images": {
+                "hda_disk_image": "ipfire-2.21.2gb-ext4.x86_64-full-core124.img"
+            }
+        },
+        {
+            "name": "2.19.119",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core119.img"
+            }
+        },
+        {
+            "name": "2.19.118",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core118.img"
+            }
+        },
+        {
+            "name": "2.19.117",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core117.img"
+            }
+        },
+        {
+            "name": "2.19.116",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core116.img"
+            }
+        },
+        {
+            "name": "2.19.111",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core111.img"
+            }
+        },
+        {
+            "name": "2.19.110",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core110.img"
+            }
+        }
+    ]
+}
diff --git a/kali-linux.gns3a b/kali-linux.gns3a
new file mode 100644
index 0000000..10ce5e2
--- /dev/null
+++ b/kali-linux.gns3a
@@ -0,0 +1,194 @@
+{
+    "name": "Kali Linux",
+    "category": "guest",
+    "description": "From the creators of BackTrack comes Kali Linux, the most advanced and versatile penetration testing platform  ever created. We have a set of amazing features lined up in our security distribution geared at streamlining the penetration testing experience.",
+    "vendor_name": "Kali Linux",
+    "vendor_url": "https://www.kali.org/",
+    "documentation_url": "https://www.kali.org/kali-linux-documentation/",
+    "product_name": "Kali Linux",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Default password is toor",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 8,
+        "ram": 1024,
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "kali-linux-mate-2019.2-amd64.iso",
+            "version": "2019.2 (MATE)",
+            "md5sum": "fec8dd7009f932c51a74323df965a709",
+            "filesize": 3313217536,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2019.1a/kali-linux-mate-2019.2-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2019.2-amd64.iso",
+            "version": "2019.2",
+            "md5sum": "0f89b6225d7ea9c18682f7cc541c1179",
+            "filesize": 3353227264,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2019.1a/kali-linux-2019.2-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2019.1a-amd64.iso",
+            "version": "2019.1a",
+            "md5sum": "58c6111ed0be1919ea87267e7e65ab0f",
+            "filesize": 3483873280,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2019.1a/kali-linux-2019.1a-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2018.4-amd64.iso",
+            "version": "2018.4",
+            "md5sum": "1b2d598bb8d2003e6207c119c0ba42fe",
+            "filesize": 3139436544,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2018.4/kali-linux-2018.4-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2018.3a-amd64.iso",
+            "version": "2018.3a",
+            "md5sum": "2da675d016bd690c05e180e33aa98b94",
+            "filesize": 3192651776,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2018.3a/kali-linux-2018.3a-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2018.1-amd64.iso",
+            "version": "2018.1",
+            "md5sum": "a3feb90df5b71b3c7f4a02bdddf221d7",
+            "filesize": 3028500480,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2018.1/kali-linux-2018.1-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2017.3-amd64.iso",
+            "version": "2017.3",
+            "md5sum": "b465580c897e94675ac1daf031fa66b9",
+            "filesize": 2886402048,
+            "download_url": "http://cdimage.kali.org/kali-2017.3/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2017.3/kali-linux-2017.3-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2017.2-amd64.iso",
+            "version": "2017.2",
+            "md5sum": "541654f8f818450dc0db866a0a0f6eec",
+            "filesize": 3020619776,
+            "download_url": "http://cdimage.kali.org/kali-2017.2/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2017.2/kali-linux-2017.2-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2017.1-amd64.iso",
+            "version": "2017.1",
+            "md5sum": "c8e742283929d7a12dbe7c58e398ff08",
+            "filesize": 2794307584,
+            "download_url": "http://cdimage.kali.org/kali-2017.1/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2017.1/kali-linux-2017.1-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2016.2-amd64.iso",
+            "version": "2016.2",
+            "md5sum": "3d163746bc5148e61ad689d94bc263f9",
+            "filesize": 3076767744,
+            "download_url": "http://cdimage.kali.org/kali-2016.2/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2016.2/kali-linux-2016.2-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2016.1-amd64.iso",
+            "version": "2016.1",
+            "md5sum": "2e1230dc14036935b3279dfe3e49ad39",
+            "filesize": 2945482752,
+            "download_url": "http://cdimage.kali.org/kali-2016.1/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2016.1/kali-linux-2016.1-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2.0-amd64.iso",
+            "version": "2.0",
+            "md5sum": "ef192433017c5d99a156eaef51fd389d",
+            "filesize": 3320512512,
+            "download_url": "https://www.offensive-security.com/kali-linux-vmware-arm-image-download/",
+            "direct_download_url": "http://images.kali.org/Kali-Linux-2.0.0-vm-amd64.7z"
+        }
+    ],
+    "versions": [
+        {
+            "name": "2019.2 (MATE)",
+            "images": {
+                "cdrom_image": "kali-linux-mate-2019.2-amd64.iso"
+            }
+        },
+        {
+            "name": "2019.2",
+            "images": {
+                "cdrom_image": "kali-linux-2019.2-amd64.iso"
+            }
+        },
+        {
+            "name": "2019.1a",
+            "images": {
+                "cdrom_image": "kali-linux-2019.1a-amd64.iso"
+            }
+        },
+        {
+            "name": "2018.4",
+            "images": {
+                "cdrom_image": "kali-linux-2018.4-amd64.iso"
+            }
+        },
+        {
+            "name": "2018.3a",
+            "images": {
+                "cdrom_image": "kali-linux-2018.3a-amd64.iso"
+            }
+        },
+        {
+            "name": "2018.1",
+            "images": {
+                "cdrom_image": "kali-linux-2018.1-amd64.iso"
+            }
+        },
+        {
+            "name": "2017.3",
+            "images": {
+                "cdrom_image": "kali-linux-2017.3-amd64.iso"
+            }
+        },
+        {
+            "name": "2017.2",
+            "images": {
+                "cdrom_image": "kali-linux-2017.2-amd64.iso"
+            }
+        },
+        {
+            "name": "2017.1",
+            "images": {
+                "cdrom_image": "kali-linux-2017.1-amd64.iso"
+            }
+        },
+        {
+            "name": "2016.2",
+            "images": {
+                "cdrom_image": "kali-linux-2016.2-amd64.iso"
+            }
+        },
+        {
+            "name": "2016.1",
+            "images": {
+                "cdrom_image": "kali-linux-2016.1-amd64.iso"
+            }
+        },
+        {
+            "name": "2.0",
+            "images": {
+                "cdrom_image": "kali-linux-2.0-amd64.iso"
+            }
+        }
+    ]
+}