diff --git a/templates.fif.json b/templates.fif.json
index f23e364b..797ac402 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -2578,6 +2578,38 @@
                 "USER_LOGIN": "false"
             }
         },
+        "remote_desktop_server": {
+            "profiles": {
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "NICTYPE": "tap",
+                "POSTINSTALL": "remote_desktop_server",
+                "PARALLEL_WITH": "remote_desktop_client",
+                "POST_STATIC": "172.16.2.107 rdpserver.openqa.fedoraproject.org",
+                "ROOT_PASSWORD": "weakpassword",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
+                "WORKER_CLASS": "tap"
+            }
+        },
+        "remote_desktop_client": {
+            "profiles": {
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "NICTYPE": "tap",
+                "POSTINSTALL": "remote_desktop_client",
+                "PARALLEL_WITH": "remote_desktop_server",
+                "POST_STATIC": "172.16.2.108 rdpclient.openqa.fedoraproject.org",
+                "ROOT_PASSWORD": "weakpassword",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
+                "WORKER_CLASS": "tap"
+            }
+        },
         "rpmostree_overlay": {
             "profiles": {
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,