diff --git a/packerfiles/iso/ubuntu-19.04-x64-desktop.cfg b/packerfiles/iso/ubuntu-19.04-x64-desktop.cfg
deleted file mode 100755
index 3ff21c6..0000000
--- a/packerfiles/iso/ubuntu-19.04-x64-desktop.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-19.04-desktop-amd64",
-    "iso_checksum": "2da6f8b5c65b71b040c5c510311eae1798545b8ba801c9b63e9e3fd3c0457cbe",
-    "iso_mirror": "http://releases.ubuntu.com/19.04/",
-    "iso_checksum_type": "sha256"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu-19.04-x64-server.cfg b/packerfiles/iso/ubuntu-19.04-x64-server.cfg
deleted file mode 100755
index 41699cf..0000000
--- a/packerfiles/iso/ubuntu-19.04-x64-server.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-19.04-live-server-amd64",
-    "iso_checksum": "25d483341ccd0d522a6660b00db933787c86c47b42f1845bcf997127f4b61e9d",
-    "iso_mirror": "http://releases.ubuntu.com/19.04/",
-    "iso_checksum_type": "sha256"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_16.04_x64_desktop.cfg b/packerfiles/iso/ubuntu_16.04_x64_desktop.cfg
deleted file mode 100755
index fbc4f20..0000000
--- a/packerfiles/iso/ubuntu_16.04_x64_desktop.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-16.04.3-desktop-amd64",
-	"iso_checksum": "0d9fe8e1ea408a5895cbbe3431989295",
-	"iso_mirror": "http://releases.ubuntu.com/16.04.3/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_16.04_x64_server.cfg b/packerfiles/iso/ubuntu_16.04_x64_server.cfg
deleted file mode 100755
index 5dbf189..0000000
--- a/packerfiles/iso/ubuntu_16.04_x64_server.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-16.04.3-server-amd64",
-	"iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",
-	"iso_mirror": "http://releases.ubuntu.com/16.04.3/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_16.10_x32_desktop.cfg b/packerfiles/iso/ubuntu_16.10_x32_desktop.cfg
deleted file mode 100755
index be54430..0000000
--- a/packerfiles/iso/ubuntu_16.10_x32_desktop.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-16.10-desktop-i386",
-    "iso_checksum": "e9e9a6c6b3c8c265788f4e726af25994",
-	"iso_mirror": "http://releases.ubuntu.com/16.10/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_16.10_x32_server.cfg b/packerfiles/iso/ubuntu_16.10_x32_server.cfg
deleted file mode 100755
index 26c8d5c..0000000
--- a/packerfiles/iso/ubuntu_16.10_x32_server.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-16.10-server-i386",
-    "iso_checksum": "e532cfbc738876b353c7c9943d872606",
-	"iso_mirror": "http://releases.ubuntu.com/16.10/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_16.10_x64_desktop.cfg b/packerfiles/iso/ubuntu_16.10_x64_desktop.cfg
deleted file mode 100755
index 26067c1..0000000
--- a/packerfiles/iso/ubuntu_16.10_x64_desktop.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-16.10-desktop-amd64",
-	"iso_checksum": "3f50877c05121f7fd8544bef2d722824",
-	"iso_mirror": "http://releases.ubuntu.com/16.10/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_16.10_x64_server.cfg b/packerfiles/iso/ubuntu_16.10_x64_server.cfg
deleted file mode 100755
index 37f4c41..0000000
--- a/packerfiles/iso/ubuntu_16.10_x64_server.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-16.10-server-amd64",
-	"iso_checksum": "7d6de832aee348bacc894f0a2ab1170d",
-	"iso_mirror": "http://releases.ubuntu.com/16.10/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_17.04_x64_server.cfg b/packerfiles/iso/ubuntu_17.04_x64_server.cfg
deleted file mode 100755
index 4f8ed72..0000000
--- a/packerfiles/iso/ubuntu_17.04_x64_server.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-17.04-server-amd64",
-	"iso_checksum": "4672ce371fb3c1170a9e71bc4b2810b9",
-	"iso_mirror": "http://releases.ubuntu.com/17.04/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_17.10_x64_desktop.cfg b/packerfiles/iso/ubuntu_17.10_x64_desktop.cfg
deleted file mode 100755
index 9ebe81d..0000000
--- a/packerfiles/iso/ubuntu_17.10_x64_desktop.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-17.10-desktop-amd64",
-	"iso_checksum": "5eb0631f28384665b57bceffe69c29b0",
-	"iso_mirror": "http://releases.ubuntu.com/17.10/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_17.10_x64_server.cfg b/packerfiles/iso/ubuntu_17.10_x64_server.cfg
deleted file mode 100755
index e1f4d1c..0000000
--- a/packerfiles/iso/ubuntu_17.10_x64_server.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-17.10-server-amd64",
-	"iso_checksum": "be2ab38bb169ed9dddc6cd142a8b9d8b",
-	"iso_mirror": "http://releases.ubuntu.com/17.10/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_18.04_x64_desktop.cfg b/packerfiles/iso/ubuntu_18.04_x64_desktop.cfg
deleted file mode 100755
index 50fd0b9..0000000
--- a/packerfiles/iso/ubuntu_18.04_x64_desktop.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-18.04.1-desktop-amd64",
-	"iso_checksum": "f430da8fa59d2f5f4262518e3c177246",
-	"iso_mirror": "http://releases.ubuntu.com/18.04.1/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_18.04_x64_server.cfg b/packerfiles/iso/ubuntu_18.04_x64_server.cfg
deleted file mode 100755
index db79f99..0000000
--- a/packerfiles/iso/ubuntu_18.04_x64_server.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "iso_name": "ubuntu-18.04.1-live-server-amd64",
-	"iso_checksum": "9b15b331455c0f7cb5dac53bbe050f61",
-	"iso_mirror": "http://releases.ubuntu.com/18.04.1/",
-    "iso_checksum_type": "md5"
-}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_20.04_x64_desktop.cfg b/packerfiles/iso/ubuntu_20.04_x64_desktop.cfg
new file mode 100755
index 0000000..6fe67cc
--- /dev/null
+++ b/packerfiles/iso/ubuntu_20.04_x64_desktop.cfg
@@ -0,0 +1,6 @@
+{
+    "iso_name": "ubuntu-20.04.2.0-desktop-amd64.iso",
+    "iso_checksum": "93bdab204067321ff131f560879db46bee3b994bf24836bb78538640f689e58f",
+    "iso_mirror": "http://releases.ubuntu.com/20.04/",
+    "iso_checksum_type": "sha256"
+}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_20.04_x64_server.cfg b/packerfiles/iso/ubuntu_20.04_x64_server.cfg
new file mode 100755
index 0000000..de9db68
--- /dev/null
+++ b/packerfiles/iso/ubuntu_20.04_x64_server.cfg
@@ -0,0 +1,6 @@
+{
+    "iso_name": "ubuntu-20.04.2-live-server-amd64.iso",
+    "iso_checksum": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423",
+    "iso_mirror": "http://releases.ubuntu.com/20.04/",
+    "iso_checksum_type": "sha256"
+}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_21.04_x64_desktop.cfg b/packerfiles/iso/ubuntu_21.04_x64_desktop.cfg
new file mode 100755
index 0000000..48817b7
--- /dev/null
+++ b/packerfiles/iso/ubuntu_21.04_x64_desktop.cfg
@@ -0,0 +1,6 @@
+{
+    "iso_name": "ubuntu-21.04-desktop-amd64.iso",
+    "iso_checksum": "fa95fb748b34d470a7cfa5e3c1c8fa1163e2dc340cd5a60f7ece9dc963ecdf88",
+    "iso_mirror": "http://releases.ubuntu.com/21.04/",
+    "iso_checksum_type": "sha256"
+}
\ No newline at end of file
diff --git a/packerfiles/iso/ubuntu_21.04_x64_server.cfg b/packerfiles/iso/ubuntu_21.04_x64_server.cfg
new file mode 100755
index 0000000..e4348a2
--- /dev/null
+++ b/packerfiles/iso/ubuntu_21.04_x64_server.cfg
@@ -0,0 +1,6 @@
+{
+    "iso_name": "ubuntu-21.04-live-server-amd64.iso",
+    "iso_checksum": "e4089c47104375b59951bad6c7b3ee5d9f6d80bfac4597e43a716bb8f5c1f3b0",
+    "iso_mirror": "http://releases.ubuntu.com/21.04/",
+    "iso_checksum_type": "sha256"
+}
\ No newline at end of file
diff --git a/packerfiles/iso/windows_server_2012_R2_standard_x64.cfg b/packerfiles/iso/windows_server_2012_R2_standard_x64.cfg
deleted file mode 100755
index 61c81ae..0000000
--- a/packerfiles/iso/windows_server_2012_R2_standard_x64.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "iso_name": "en_windows_server_2012_r2_with_update_x64_dvd_6052708",
-	"iso_checksum": "865494E969704BE1C4496D8614314361D025775E",
-	"iso_checksum_type": "sha1",
-	"iso_mirror": "D:/iso",
-	"license_key": "YC6KT-GKW9T-YTKYR-T4X34-R7VHC", 
-	"guest_os_type": "Windows10_64",
-	"winversion": "server-2012-r2-std",
-	"output": "windows-server-2012-R2-standard"
-}
\ No newline at end of file