diff --git a/templates-updates b/templates-updates
index 2f91f66b..330db49f 100755
--- a/templates-updates
+++ b/templates-updates
@@ -498,30 +498,6 @@
                                     },
                       test_suite => { name => "base_update_cli" },
                     },
-                    {
-                      group_name => "Fedora PowerPC Updates",
-                      machine    => { name => "ppc64le" },
-                      prio       => 40,
-                      product    => {
-                                      arch    => "ppc64le",
-                                      distri  => "fedora",
-                                      flavor  => "updates-server-upgrade",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "upgrade_server_domain_controller" },
-                    },
-                    {
-                      group_name => "Fedora PowerPC Updates",
-                      machine    => { name => "ppc64le" },
-                      prio       => 30,
-                      product    => {
-                                      arch    => "ppc64le",
-                                      distri  => "fedora",
-                                      flavor  => "updates-server-upgrade",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "upgrade_realmd_client" },
-                    },
                     {
                       group_name => "Fedora PowerPC Updates",
                       machine    => { name => "ppc64le" },
@@ -582,6 +558,30 @@
                                     },
                       test_suite => { name => "realmd_join_sssd" },
                     },
+                    {
+                      group_name => "Fedora PowerPC Updates",
+                      machine    => { name => "ppc64le" },
+                      prio       => 40,
+                      product    => {
+                                      arch    => "ppc64le",
+                                      distri  => "fedora",
+                                      flavor  => "updates-server-upgrade",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_server_domain_controller" },
+                    },
+                    {
+                      group_name => "Fedora PowerPC Updates",
+                      machine    => { name => "ppc64le" },
+                      prio       => 30,
+                      product    => {
+                                      arch    => "ppc64le",
+                                      distri  => "fedora",
+                                      flavor  => "updates-server-upgrade",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_realmd_client" },
+                    },
                     {
                       group_name => "Fedora PowerPC Updates",
                       machine    => { name => "ppc64le" },
@@ -620,27 +620,15 @@
                     },
                     {
                       group_name => "Fedora PowerPC Updates",
-                      machine    => { name => "ppc64" },
+                      machine    => { name => "ppc64le" },
                       prio       => 40,
                       product    => {
-                                      arch    => "ppc64",
+                                      arch    => "ppc64le",
                                       distri  => "fedora",
-                                      flavor  => "updates-server-upgrade",
+                                      flavor  => "updates-server",
                                       version => "*",
                                     },
-                      test_suite => { name => "upgrade_server_domain_controller" },
-                    },
-                    {
-                      group_name => "Fedora PowerPC Updates",
-                      machine    => { name => "ppc64" },
-                      prio       => 30,
-                      product    => {
-                                      arch    => "ppc64",
-                                      distri  => "fedora",
-                                      flavor  => "updates-server-upgrade",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "upgrade_realmd_client" },
+                      test_suite => { name => "advisory_boot" },
                     },
                     {
                       group_name => "Fedora PowerPC Updates",
@@ -750,6 +738,30 @@
                                     },
                       test_suite => { name => "realmd_join_sssd" },
                     },
+                    {
+                      group_name => "Fedora PowerPC Updates",
+                      machine    => { name => "ppc64" },
+                      prio       => 40,
+                      product    => {
+                                      arch    => "ppc64",
+                                      distri  => "fedora",
+                                      flavor  => "updates-server-upgrade",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_server_domain_controller" },
+                    },
+                    {
+                      group_name => "Fedora PowerPC Updates",
+                      machine    => { name => "ppc64" },
+                      prio       => 30,
+                      product    => {
+                                      arch    => "ppc64",
+                                      distri  => "fedora",
+                                      flavor  => "updates-server-upgrade",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_realmd_client" },
+                    },
                     {
                       group_name => "Fedora PowerPC Updates",
                       machine    => { name => "ppc64" },