diff --git a/templates b/templates
index cc776f8d..658228f2 100755
--- a/templates
+++ b/templates
@@ -128,50 +128,6 @@
                                     },
                       test_suite => { name => "install_default" },
                     },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 15,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "Workstation-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 100,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "Workstation-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "memory_check" },
-                    },
-                    {
-                      machine    => { name => "uefi" },
-                      prio       => 100,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "Workstation-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "memory_check" },
-                    },
-                    {
-                      machine    => { name => "uefi" },
-                      prio       => 16,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "Workstation-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 15,
@@ -1932,28 +1888,6 @@
                                     },
                       test_suite => { name => "install_default" },
                     },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 100,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "Workstation-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "memory_check" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 67,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "Workstation-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 67,
@@ -4470,18 +4404,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "x86_64",
-                      distri    => "fedora",
-                      flavor    => "Workstation-boot-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "DESKTOP", value => "gnome" },
-                        { key => "TEST_TARGET", value => "ISO" },
-                        { key => "HDDSIZEGB", value => "13" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "x86_64",
                       distri    => "fedora",
@@ -4561,18 +4483,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "Workstation-boot-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "DESKTOP", value => "gnome" },
-                        { key => "TEST_TARGET", value => "ISO" },
-                        { key => "HDDSIZEGB", value => "12" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "i386",
                       distri    => "fedora",