diff --git a/templates b/templates
index 7d8cbf2b..3b1ccc34 100755
--- a/templates
+++ b/templates
@@ -1585,7 +1585,7 @@
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
-                                      flavor  => "universal",
+                                      flavor  => "Server-dvd-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "modularity_tests" },
@@ -2255,7 +2255,7 @@
                       product    => {
                                       arch    => "ppc64le",
                                       distri  => "fedora",
-                                      flavor  => "universal",
+                                      flavor  => "Server-dvd-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "modularity_tests" },
@@ -3251,7 +3251,7 @@
                       product    => {
                                       arch    => "ppc64",
                                       distri  => "fedora",
-                                      flavor  => "universal",
+                                      flavor  => "Server-dvd-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "modularity_tests" },
@@ -3803,7 +3803,7 @@
                       product    => {
                                       arch    => "aarch64",
                                       distri  => "fedora",
-                                      flavor  => "universal",
+                                      flavor  => "Server-dvd-iso",
                                       version => "*",
                                     },
                       test_suite => { name => "modularity_tests" },