diff --git a/templates b/templates
index e7879ca3..9bffe2ec 100755
--- a/templates
+++ b/templates
@@ -171,28 +171,6 @@
                                     },
                       test_suite => { name => "install_default" },
                     },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 50,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "Atomic-dvd_ostree-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      machine    => { name => "uefi" },
-                      prio       => 51,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "Atomic-dvd_ostree-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 50,
@@ -1953,30 +1931,6 @@
                                     },
                       test_suite => { name => "install_package_set_kde" },
                     },
-                    {
-                      group_name => "Fedora PowerPC",
-                      machine    => { name => "ppc64le" },
-                      prio       => 10,
-                      product    => {
-                                      arch    => "ppc64le",
-                                      distri  => "fedora",
-                                      flavor  => "Atomic-dvd_ostree-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      group_name => "Fedora PowerPC",
-                      machine    => { name => "ppc64le" },
-                      prio       => 10,
-                      product    => {
-                                      arch    => "ppc64le",
-                                      distri  => "fedora",
-                                      flavor  => "Atomic-dvd_ostree-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default_upload" },
-                    },
                     {
                       group_name => "Fedora PowerPC",
                       machine    => { name => "ppc64le" },
@@ -3645,30 +3599,6 @@
                                     },
                       test_suite => { name => "server_firewall_default" },
                     },
-		    {
-                      group_name => "Fedora AArch64",
-                      machine    => { name => "aarch64" },
-                      prio       => 10,
-                      product    => {
-                                      arch    => "aarch64",
-                                      distri  => "fedora",
-                                      flavor  => "Atomic-dvd_ostree-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      group_name => "Fedora AArch64",
-                      machine    => { name => "aarch64" },
-                      prio       => 10,
-                      product    => {
-                                      arch    => "aarch64",
-                                      distri  => "fedora",
-                                      flavor  => "Atomic-dvd_ostree-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default_upload" },
-                    },
                     {
                       group_name => "Fedora AArch64",
                       machine    => { name => "aarch64" },
@@ -4640,18 +4570,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "x86_64",
-                      distri    => "fedora",
-                      flavor    => "Atomic-dvd_ostree-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "CANNED", value => "1" },
-                        { key => "PACKAGE_SET", value => "default" },
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "x86_64",
                       distri    => "fedora",
@@ -4834,18 +4752,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "ppc64le",
-                      distri    => "fedora",
-                      flavor    => "Atomic-dvd_ostree-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "CANNED", value => "1" },
-                        { key => "PACKAGE_SET", value => "default" },
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "ppc64le",
                       distri    => "fedora",
@@ -4918,18 +4824,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "aarch64",
-                      distri    => "fedora",
-                      flavor    => "Atomic-dvd_ostree-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "CANNED", value => "1" },
-                        { key => "PACKAGE_SET", value => "default" },
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "aarch64",
                       distri    => "fedora",