diff --git a/templates b/templates
index 3680376a..d717028c 100755
--- a/templates
+++ b/templates
@@ -131,8 +131,8 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "server",
-                                      version => "rawhide",
+                                      flavor  => "universal",
+                                      version => "*",
                                     },
                       test_suite => { name => "server_simple_free_space" },
                     },
@@ -141,8 +141,8 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "server",
-                                      version => "rawhide",
+                                      flavor  => "universal",
+                                      version => "*",
                                     },
                       test_suite => { name => "server_multi_empty" },
                     },
@@ -151,8 +151,8 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "server",
-                                      version => "rawhide",
+                                      flavor  => "universal",
+                                      version => "*",
                                     },
                       test_suite => { name => "server_software_raid" },
                     },
@@ -161,8 +161,8 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "server",
-                                      version => "rawhide",
+                                      flavor  => "universal",
+                                      version => "*",
                                     },
                       test_suite => { name => "server_delete_partial" },
                     },
@@ -171,8 +171,8 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "server",
-                                      version => "rawhide",
+                                      flavor  => "universal",
+                                      version => "*",
                                     },
                       test_suite => { name => "server_kickstart_hdd" },
                     },