diff --git a/templates b/templates
index bb16f8f7..2cbf7fc0 100755
--- a/templates
+++ b/templates
@@ -4959,7 +4959,7 @@
                         { key => "KICKSTART", value => "1" },
                         { key => "USER_LOGIN", value => "false" },
                         { key => "ROOT_PASSWORD", value => "111111" },
-                        { key => "PARALLEL_WITH", value => "support_server:%ARCH_BASE_MACHINE%" },
+                        { key => "PARALLEL_WITH", value => "support_server@%ARCH_BASE_MACHINE%" },
                         { key => "NICTYPE", value => "tap" },
                         { key => "WORKER_CLASS", value => "tap" },
                       ],
diff --git a/templates-updates b/templates-updates
index 8b094c5c..027d794c 100755
--- a/templates-updates
+++ b/templates-updates
@@ -997,9 +997,9 @@
                         { key => "ISO", value => "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso" },
                         { key => "NICTYPE", value => "tap" },
                         { key => "PACKAGE_SET", value => "default" },
-                        { key => "PARALLEL_WITH", value => "support_server:%ARCH_BASE_MACHINE%" },
+                        { key => "PARALLEL_WITH", value => "support_server@%ARCH_BASE_MACHINE%" },
                         { key => "ADD_REPOSITORY_VARIATION", value => "nfs://10.0.2.110:/opt/update_repo" },
-                        { key => "+START_AFTER_TEST", value => "installer_build:%ARCH_BASE_MACHINE%" },
+                        { key => "+START_AFTER_TEST", value => "installer_build@%ARCH_BASE_MACHINE%" },
                         { key => "WORKER_CLASS", value => "tap" },
                       ],
                     },
@@ -1008,7 +1008,7 @@
                       settings => [
                         { key => "INSTALL", value => "1" },
                         { key => "ISO", value => "Fedora-%SUBVARIANT%-Live-%ARCH%-%ADVISORY_OR_TASK%.iso" },
-                        { key => "+START_AFTER_TEST", value => "live_build:%ARCH_BASE_MACHINE%" },
+                        { key => "+START_AFTER_TEST", value => "live_build@%ARCH_BASE_MACHINE%" },
                       ],
                     },
                   ],