diff --git a/templates b/templates
index 4164b564..a550dfee 100755
--- a/templates
+++ b/templates
@@ -61,6 +61,17 @@
                                     },
                       test_suite => { name => "default_install" },
                     },
+                    {
+                      machine    => { name => "uefi" },
+                      prio       => 11,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "server_dvd",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "default_install" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 10,
@@ -86,6 +97,39 @@
                     {
                       machine    => { name => "64bit" },
                       prio       => 15,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "workstation_boot",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "default_install" },
+                    },
+                    {
+                      machine    => { name => "uefi" },
+                      prio       => 16,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "workstation_boot",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "default_install" },
+                    },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 15,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "kde_live",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "default_install" },
+                    },
+                    {
+                      machine    => { name => "uefi" },
+                      prio       => 16,
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
@@ -622,6 +666,17 @@
                                     },
                       test_suite => { name => "default_install" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 17,
+                      product    => {
+                                      arch    => "i386",
+                                      distri  => "fedora",
+                                      flavor  => "workstation_boot",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "default_install" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 17,
@@ -827,6 +882,16 @@
                                    ],
                       version   => "*",
                     },
+                    {
+                      arch      => "x86_64",
+                      distri    => "fedora",
+                      flavor    => "workstation_boot",
+                      name      => "",
+                      settings  => [
+                        { key => "DESKTOP", value => "gnome" }
+                                   ],
+                      version   => "*",
+                    },
                     {
                       arch      => "x86_64",
                       distri    => "fedora",
@@ -885,6 +950,16 @@
                                    ],
                       version   => "*",
                     },
+                    {
+                      arch      => "i386",
+                      distri    => "fedora",
+                      flavor    => "workstation_boot",
+                      name      => "",
+                      settings  => [
+                        { key => "DESKTOP", value => "gnome" }
+                                   ],
+                      version   => "*",
+                    },
                     {
                       arch      => "i386",
                       distri    => "fedora",