diff --git a/templates b/templates
index f7ed1227..a0ead451 100755
--- a/templates
+++ b/templates
@@ -199,7 +199,29 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicHost-dvd_ostree-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_default" },
+                    },
+                    {
+                      machine    => { name => "uefi" },
+                      prio       => 51,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "AtomicHost-dvd_ostree-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_default" },
+                    },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 50,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "install_default_upload" },
@@ -210,7 +232,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "install_default" },
@@ -243,7 +265,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "install_no_user" },
@@ -287,7 +309,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "base_selinux" },
@@ -331,7 +353,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "base_services_start" },
@@ -386,7 +408,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "base_service_manipulation" },
@@ -463,7 +485,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "base_system_logging" },
@@ -518,7 +540,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "desktop_terminal" },
@@ -551,7 +573,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "Workstation Ostree-dvd_ostree-iso",
+                                      flavor  => "AtomicWorkstation-dvd_ostree-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "desktop_browser" },
@@ -1834,6 +1856,30 @@
                                     },
                       test_suite => { name => "install_default_upload" },
                     },
+                    {
+                      group_name => "Fedora PowerPC",
+                      machine    => { name => "ppc64le" },
+                      prio       => 10,
+                      product    => {
+                                      arch    => "ppc64le",
+                                      distri  => "fedora",
+                                      flavor  => "AtomicHost-dvd_ostree-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_default" },
+                    },
+                    {
+                      group_name => "Fedora PowerPC",
+                      machine    => { name => "ppc64le" },
+                      prio       => 10,
+                      product    => {
+                                      arch    => "ppc64le",
+                                      distri  => "fedora",
+                                      flavor  => "AtomicHost-dvd_ostree-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_default_upload" },
+                    },
                     {
                       group_name => "Fedora PowerPC",
                       machine    => { name => "ppc64le" },
@@ -3409,6 +3455,18 @@
                                    ],
                       version   => "*",
                     },
+                    {
+                      arch      => "x86_64",
+                      distri    => "fedora",
+                      flavor    => "AtomicHost-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",
@@ -3538,7 +3596,7 @@
                     {
                       arch      => "x86_64",
                       distri    => "fedora",
-                      flavor    => "Workstation Ostree-dvd_ostree-iso",
+                      flavor    => "AtomicWorkstation-dvd_ostree-iso",
                       name      => "",
                       settings  => [
                         { key => "CANNED", value => "1" },
@@ -3590,6 +3648,18 @@
                                    ],
                       version   => "*",
                     },
+                    {
+                      arch      => "ppc64le",
+                      distri    => "fedora",
+                      flavor    => "AtomicHost-dvd_ostree-iso",
+                      name      => "",
+                      settings  => [
+                        { key => "CANNED", value => "1" },
+                        { key => "PACKAGE_SET", value => "default" },
+                        { key => "TEST_TARGET", value => "ISO" }
+                                   ],
+                      version   => "*",
+                    },
                     {
                       arch      => "ppc64",
                       distri    => "fedora",