diff --git a/templates.fif.json b/templates.fif.json
index 0a827c8a..55317b76 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -2517,20 +2517,20 @@
         },
         "remote_desktop_server": {
             "profiles": {
-                "fedora-Workstation-live-iso-x86_64-*-64bit": 40
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 35
             },
             "settings": {
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
                 "NICTYPE": "tap",
                 "POSTINSTALL": "remote_desktop_server",
-                "POST_STATIC": "172.16.2.107 rdpserver.openqa.fedoraproject.org",
+                "POST_STATIC": "172.16.2.107 king.test.openqa.fedoraproject.org",
                 "ROOT_PASSWORD": "weakpassword",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
                 "WORKER_CLASS": "tap"
             }
         },
-        "remote_desktop_client": {
+        "remote_desktop_freerdp": {
             "profiles": {
                 "fedora-Workstation-live-iso-x86_64-*-64bit": 40
             },
@@ -2540,7 +2540,7 @@
                 "NICTYPE": "tap",
                 "POSTINSTALL": "remote_desktop_client",
                 "PARALLEL_WITH": "remote_desktop_server",
-                "POST_STATIC": "172.16.2.108 rdpclient.openqa.fedoraproject.org",
+                "POST_STATIC": "172.16.2.108 pawn.test.openqa.fedoraproject.org",
                 "ROOT_PASSWORD": "weakpassword",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
                 "WORKER_CLASS": "tap"