diff --git a/templates.fif.json b/templates.fif.json
index e1d48f8e..6b3a7f47 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -244,6 +244,16 @@
             },
             "version": "*"
         },
+        "fedora-PiKVM-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "PiKVM",
+            "settings": {
+                "+QEMURAM": 3072,
+                "TEST_TARGET": "ISO"
+            },
+            "version": "*"
+        },
         "fedora-Server-dvd-iso-aarch64-*": {
             "arch": "aarch64",
             "distri": "fedora",
@@ -497,6 +507,10 @@
             "machine": "ppc64le",
             "product": "fedora-Server-boot-iso-ppc64le-*"
         },
+        "fedora-PiKVM-x86_64-*-64bit": {
+            "machine": "64bit",
+            "product": "fedora-PiKVM-x86_64-*"
+        },
         "fedora-Server-boot-iso-x86_64-*-64bit": {
             "machine": "64bit",
             "product": "fedora-Server-boot-iso-x86_64-*"
@@ -1286,6 +1300,19 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
+        "pikvm_connect": {
+            "profiles": {
+                "fedora-PiKVM-x86_64-*-64bit": 20
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "PiKVM.qcow2",
+                "USER_LOGIN": "pikvm",
+                "USER_PASSWORD": "weakpassword",
+                "KVM_IP": "10.43.17.27",
+                "ENTRYPOINT": "tests/pikvm/connect"
+            }
+        },
         "desktop_update_graphical": {
             "profiles": {
                 "fedora-KDE-live-iso-x86_64-*-64bit": 32,