diff --git a/gns3server/appliances/kali-linux.gns3a b/gns3server/appliances/kali-linux.gns3a
index 10ce5e20b..c4d666154 100644
--- a/gns3server/appliances/kali-linux.gns3a
+++ b/gns3server/appliances/kali-linux.gns3a
@@ -10,31 +10,33 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default password is toor",
+    "usage": "Default password is toor\nEnable persistence by selecting boot option 'Live USB Persistence'",
+    "port_name_format": "eth{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 8,
         "ram": 1024,
         "arch": "x86_64",
         "console_type": "vnc",
+        "boot_priority": "d",
         "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"
+            "direct_download_url": "http://cdimage.kali.org/kali-2019.2/kali-linux-2019.2-amd64.iso"
+        },
+        {
+            "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.2/kali-linux-mate-2019.2-amd64.iso"
         },
         {
             "filename": "kali-linux-2019.1a-amd64.iso",
@@ -115,78 +117,98 @@
             "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"
+        },
+        {
+            "filename": "kali-linux-persistence-1gb.qcow2",
+            "version": "1.0",
+            "md5sum": "14e9c92f3ba5a0bd1128c1ea26a129ea",
+            "filesize": 34734080,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/kali-linux-persistence-1gb.qcow2/download"
         }
     ],
     "versions": [
         {
-            "name": "2019.2 (MATE)",
+            "name": "2019.2",
             "images": {
-                "cdrom_image": "kali-linux-mate-2019.2-amd64.iso"
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
+                "cdrom_image": "kali-linux-2019.2-amd64.iso"
             }
         },
         {
-            "name": "2019.2",
+            "name": "2019.2 (MATE)",
             "images": {
-                "cdrom_image": "kali-linux-2019.2-amd64.iso"
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
+                "cdrom_image": "kali-linux-mate-2019.2-amd64.iso"
             }
         },
         {
             "name": "2019.1a",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2019.1a-amd64.iso"
             }
         },
         {
             "name": "2018.4",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2018.4-amd64.iso"
             }
         },
         {
             "name": "2018.3a",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2018.3a-amd64.iso"
             }
         },
         {
             "name": "2018.1",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2018.1-amd64.iso"
             }
         },
         {
             "name": "2017.3",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2017.3-amd64.iso"
             }
         },
         {
             "name": "2017.2",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2017.2-amd64.iso"
             }
         },
         {
             "name": "2017.1",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2017.1-amd64.iso"
             }
         },
         {
             "name": "2016.2",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2016.2-amd64.iso"
             }
         },
         {
             "name": "2016.1",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2016.1-amd64.iso"
             }
         },
         {
             "name": "2.0",
             "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
                 "cdrom_image": "kali-linux-2.0-amd64.iso"
             }
         }
diff --git a/gns3server/appliances/ubuntu-gui.gns3a b/gns3server/appliances/ubuntu-gui.gns3a
index 410abe1e1..fe1050d20 100644
--- a/gns3server/appliances/ubuntu-gui.gns3a
+++ b/gns3server/appliances/ubuntu-gui.gns3a
@@ -26,45 +26,59 @@
     },
     "images": [
         {
-            "filename": "Ubuntu_17.04-VM-64bit.vmdk",
-            "version": "17.04",
-            "md5sum": "5c82d69c49ba08179e9a94901f67da1f",
-            "filesize": 4792123392,
+            "filename": "Ubuntu 19.04 (64bit).vmdk",
+            "version": "19.04",
+            "md5sum": "21535675c54507e9325bf8774a7bd73e",
+            "filesize": 5558435840,
             "download_url": "http://www.osboxes.org/ubuntu/"
         },
         {
-            "filename": "Ubuntu_16.10_Yakkety-VM-64bit.vmdk",
-            "version": "16.10",
-            "md5sum": "c835f24dbb86f5f61c78d992ed38b6b1",
-            "filesize": 9133293568,
+            "filename": "Ubuntu 18.10 Cosmic (64Bit).vmdk",
+            "version": "18.10",
+            "md5sum": "7f72be569356baa20863cd354d2efa60",
+            "filesize": 6747389952,
             "download_url": "http://www.osboxes.org/ubuntu/"
         },
         {
-            "filename": "Ubuntu_16.04.3-VM-64bit.vmdk",
-            "version": "16.04",
-            "md5sum": "45bccf63f2777e492f022dbf025f67d0",
-            "filesize": 4302110720,
+            "filename": "Ubuntu 18.04.2 (64bit).vmdk",
+            "version": "18.04.2",
+            "md5sum": "d57b732d90759e3b3a62594a83f8f196",
+            "filesize": 6003097600,
+            "download_url": "http://www.osboxes.org/ubuntu/"
+        },
+        {
+            "filename": "Ubuntu 16.04.6 (64bit).vmdk",
+            "version": "16.04.6",
+            "md5sum": "33b2964cef607c1c9fe748db8a2fa6ea",
+            "filesize": 4780982272,
             "download_url": "http://www.osboxes.org/ubuntu/"
         }
     ],
     "versions": [
         {
-            "name": "17.04",
+            "name": "19.04",
             "images": {
-                "hda_disk_image": "Ubuntu_17.04-VM-64bit.vmdk"
+                "hda_disk_image": "Ubuntu 19.04 (64bit).vmdk"
             }
         },
         {
-            "name": "16.10",
+            "name": "18.10",
             "images": {
-                "hda_disk_image": "Ubuntu_16.10_Yakkety-VM-64bit.vmdk"
+                "hda_disk_image": "Ubuntu 18.10 Cosmic (64Bit).vmdk"
             }
         },
         {
-            "name": "16.04",
+            "name": "18.04.2",
             "images": {
-                "hda_disk_image": "Ubuntu_16.04.3-VM-64bit.vmdk"
+                "hda_disk_image": "Ubuntu 18.04.2 (64bit).vmdk"
+            }
+        },
+        {
+            "name": "16.04.6",
+            "images": {
+                "hda_disk_image": "Ubuntu 16.04.6 (64bit).vmdk"
             }
         }
     ]
 }
+