diff --git a/needles/iot/zezere_claim_button-20230302.json b/needles/iot/zezere_claim_button-20230302.json
deleted file mode 100644
index a0bbad92..00000000
--- a/needles/iot/zezere_claim_button-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 255,
-      "type": "match",
-      "match": 90,
-      "height": 16,
-      "ypos": 214,
-      "width": 36
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_claim_button"
-  ]
-}
diff --git a/needles/iot/zezere_claim_button-20230302.png b/needles/iot/zezere_claim_button-20230302.png
deleted file mode 100644
index fbde1b42..00000000
Binary files a/needles/iot/zezere_claim_button-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_claim_button-20230329.json b/needles/iot/zezere_claim_button-20230329.json
deleted file mode 100644
index bf5e09b5..00000000
--- a/needles/iot/zezere_claim_button-20230329.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 251,
-      "width": 36,
-      "ypos": 214,
-      "height": 16
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_claim_button"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_claim_button-20230329.png b/needles/iot/zezere_claim_button-20230329.png
deleted file mode 100644
index 7b8de09a..00000000
Binary files a/needles/iot/zezere_claim_button-20230329.png and /dev/null differ
diff --git a/needles/iot/zezere_claim_button-20230607.json b/needles/iot/zezere_claim_button-20230607.json
deleted file mode 100644
index 0297b881..00000000
--- a/needles/iot/zezere_claim_button-20230607.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 253,
-      "ypos": 213,
-      "height": 16,
-      "type": "match",
-      "width": 36
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_claim_button"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_claim_button-20230607.png b/needles/iot/zezere_claim_button-20230607.png
deleted file mode 100644
index b0023acc..00000000
Binary files a/needles/iot/zezere_claim_button-20230607.png and /dev/null differ
diff --git a/needles/iot/zezere_claim_button-alt-20230302.json b/needles/iot/zezere_claim_button-alt-20230302.json
deleted file mode 100644
index 0335389e..00000000
--- a/needles/iot/zezere_claim_button-alt-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 36,
-      "ypos": 214,
-      "height": 16,
-      "type": "match",
-      "match": 90,
-      "xpos": 254
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_claim_button"
-  ]
-}
diff --git a/needles/iot/zezere_claim_button-alt-20230302.png b/needles/iot/zezere_claim_button-alt-20230302.png
deleted file mode 100644
index 3adfedef..00000000
Binary files a/needles/iot/zezere_claim_button-alt-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_claim_unowned-20230302.json b/needles/iot/zezere_claim_unowned-20230302.json
deleted file mode 100644
index 08454dc5..00000000
--- a/needles/iot/zezere_claim_unowned-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 136,
-      "width": 151,
-      "height": 14,
-      "xpos": 270,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_claim_unowned"
-  ]
-}
diff --git a/needles/iot/zezere_claim_unowned-20230302.png b/needles/iot/zezere_claim_unowned-20230302.png
deleted file mode 100644
index 44d20f14..00000000
Binary files a/needles/iot/zezere_claim_unowned-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_device_management-20230302.json b/needles/iot/zezere_device_management-20230302.json
deleted file mode 100644
index 9a7614a3..00000000
--- a/needles/iot/zezere_device_management-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 14,
-      "width": 130,
-      "ypos": 137,
-      "xpos": 617,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_device_management"
-  ]
-}
diff --git a/needles/iot/zezere_device_management-20230302.png b/needles/iot/zezere_device_management-20230302.png
deleted file mode 100644
index 659bfbbf..00000000
Binary files a/needles/iot/zezere_device_management-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_login-20230302.json b/needles/iot/zezere_login-20230302.json
deleted file mode 100644
index 0782a591..00000000
--- a/needles/iot/zezere_login-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 133,
-      "width": 60,
-      "height": 21,
-      "xpos": 15,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_login"
-  ]
-}
diff --git a/needles/iot/zezere_login-20230302.png b/needles/iot/zezere_login-20230302.png
deleted file mode 100644
index e3a1d67a..00000000
Binary files a/needles/iot/zezere_login-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_login-20231114.json b/needles/iot/zezere_login-20231114.json
deleted file mode 100644
index 013c392a..00000000
--- a/needles/iot/zezere_login-20231114.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 60,
-      "type": "match",
-      "ypos": 132,
-      "height": 21,
-      "xpos": 15
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_login"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_login-20231114.png b/needles/iot/zezere_login-20231114.png
deleted file mode 100644
index df317c73..00000000
Binary files a/needles/iot/zezere_login-20231114.png and /dev/null differ
diff --git a/needles/iot/zezere_provision_installed-20230302.json b/needles/iot/zezere_provision_installed-20230302.json
deleted file mode 100644
index 2a4bcb66..00000000
--- a/needles/iot/zezere_provision_installed-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 17,
-      "ypos": 296,
-      "width": 106,
-      "type": "match",
-      "match": 90,
-      "xpos": 49
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_provision_installed"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_provision_installed-20230302.png b/needles/iot/zezere_provision_installed-20230302.png
deleted file mode 100644
index 7b3d2290..00000000
Binary files a/needles/iot/zezere_provision_installed-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_provision_menu-20230302.json b/needles/iot/zezere_provision_menu-20230302.json
deleted file mode 100644
index f11a7706..00000000
--- a/needles/iot/zezere_provision_menu-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 175,
-      "type": "match",
-      "match": 90,
-      "height": 13,
-      "width": 12,
-      "ypos": 216
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_provision_menu"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_provision_menu-20230302.png b/needles/iot/zezere_provision_menu-20230302.png
deleted file mode 100644
index 1ea61b00..00000000
Binary files a/needles/iot/zezere_provision_menu-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_provision_menu-20231026.json b/needles/iot/zezere_provision_menu-20231026.json
deleted file mode 100644
index c6c757aa..00000000
--- a/needles/iot/zezere_provision_menu-20231026.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 12,
-      "ypos": 215,
-      "type": "match",
-      "height": 13,
-      "xpos": 175
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_provision_menu"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_provision_menu-20231026.png b/needles/iot/zezere_provision_menu-20231026.png
deleted file mode 100644
index 4ada5496..00000000
Binary files a/needles/iot/zezere_provision_menu-20231026.png and /dev/null differ
diff --git a/needles/iot/zezere_provision_schedule-20230302.json b/needles/iot/zezere_provision_schedule-20230302.json
deleted file mode 100644
index d9759bf8..00000000
--- a/needles/iot/zezere_provision_schedule-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 14,
-      "ypos": 215,
-      "width": 58,
-      "xpos": 200,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_provision_schedule"
-  ]
-}
diff --git a/needles/iot/zezere_provision_schedule-20230302.png b/needles/iot/zezere_provision_schedule-20230302.png
deleted file mode 100644
index 580e7cd9..00000000
Binary files a/needles/iot/zezere_provision_schedule-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_ssh_key-20230302.json b/needles/iot/zezere_ssh_key-20230302.json
deleted file mode 100644
index 881b6005..00000000
--- a/needles/iot/zezere_ssh_key-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 15,
-      "width": 142,
-      "ypos": 136,
-      "xpos": 450,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_ssh_key"
-  ]
-}
diff --git a/needles/iot/zezere_ssh_key-20230302.png b/needles/iot/zezere_ssh_key-20230302.png
deleted file mode 100644
index 3dc5bf42..00000000
Binary files a/needles/iot/zezere_ssh_key-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_ssh_key-20231115.json b/needles/iot/zezere_ssh_key-20231115.json
deleted file mode 100644
index 14d8f8dd..00000000
--- a/needles/iot/zezere_ssh_key-20231115.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 448,
-      "height": 15,
-      "ypos": 135,
-      "type": "match",
-      "width": 142
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_ssh_key"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_ssh_key-20231115.png b/needles/iot/zezere_ssh_key-20231115.png
deleted file mode 100644
index dac667ae..00000000
Binary files a/needles/iot/zezere_ssh_key-20231115.png and /dev/null differ
diff --git a/needles/iot/zezere_ssh_key_contents-20230302.json b/needles/iot/zezere_ssh_key_contents-20230302.json
deleted file mode 100644
index 8782be09..00000000
--- a/needles/iot/zezere_ssh_key_contents-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 11,
-      "ypos": 284,
-      "width": 185,
-      "type": "match",
-      "match": 90,
-      "xpos": 67
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_ssh_key_contents"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_ssh_key_contents-20230302.png b/needles/iot/zezere_ssh_key_contents-20230302.png
deleted file mode 100644
index 95aeb29d..00000000
Binary files a/needles/iot/zezere_ssh_key_contents-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_submit_provision-20230302.json b/needles/iot/zezere_submit_provision-20230302.json
deleted file mode 100644
index 3f7df2c2..00000000
--- a/needles/iot/zezere_submit_provision-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 234,
-      "width": 69,
-      "height": 15,
-      "xpos": 398,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_submit_provision"
-  ]
-}
diff --git a/needles/iot/zezere_submit_provision-20230302.png b/needles/iot/zezere_submit_provision-20230302.png
deleted file mode 100644
index 7a8917ef..00000000
Binary files a/needles/iot/zezere_submit_provision-20230302.png and /dev/null differ
diff --git a/needles/iot/zezere_submit_provision-alt-20230302.json b/needles/iot/zezere_submit_provision-alt-20230302.json
deleted file mode 100644
index 8937d499..00000000
--- a/needles/iot/zezere_submit_provision-alt-20230302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 15,
-      "ypos": 234,
-      "width": 69,
-      "type": "match",
-      "match": 90,
-      "xpos": 396
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "zezere_submit_provision"
-  ]
-}
\ No newline at end of file
diff --git a/needles/iot/zezere_submit_provision-alt-20230302.png b/needles/iot/zezere_submit_provision-alt-20230302.png
deleted file mode 100644
index 5c0f92ba..00000000
Binary files a/needles/iot/zezere_submit_provision-alt-20230302.png and /dev/null differ
diff --git a/templates.fif.json b/templates.fif.json
index 29a7c5b5..ece91bbe 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1961,45 +1961,6 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
-        "iot_zezere_ignition": {
-                "profiles": {
-                "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40
-            },
-            "settings": {
-                "BOOTFROM": "c",
-                "GRUB_POSTINSTALL": "zezere.url=http://172.16.2.118",
-                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
-                "NICTYPE": "tap",
-                "PARALLEL_WITH": "iot_zezere_server",
-                "POSTINSTALL": "iot_zezere_ignition",
-                "POST_STATIC": "172.16.2.119 zezere001.test.openqa.fedoraproject.org",
-                "ROOT_PASSWORD": "weakpassword",
-                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
-                "USER_LOGIN": "false",
-                "WORKER_CLASS": "tap"
-            }
-        },
-        "iot_zezere_server": {
-            "profiles": {
-                "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
-                "fedora-IoT-dvd_ostree-iso-x86_64-*-64bit": 40
-            },
-            "settings": {
-                "BOOTFROM": "c",
-                "CANNED": "",
-                "HDD_1": "disk_f%CURRREL%_minimal_4_%ARCH%.qcow2",
-                "NICTYPE": "tap",
-                "PARALLEL_CANCEL_WHOLE_CLUSTER": "0",
-                "POSTINSTALL": "_iot_zezere_server _setup_browser _iot_zezere_remote",
-                "POST_STATIC": "172.16.2.118 zezere002.test.openqa.fedoraproject.org",
-                "ROOT_PASSWORD": "weakpassword",
-                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
-                "TEST_TARGET": "NONE",
-                "USER_LOGIN": "false",
-                "WORKER_CLASS": "tap"
-            }
-        },
         "kwrite": {
             "profiles": {
                 "fedora-KDE-live-iso-x86_64-*-64bit": 42
diff --git a/tests/_iot_zezere_remote.pm b/tests/_iot_zezere_remote.pm
deleted file mode 100644
index 21c28fc3..00000000
--- a/tests/_iot_zezere_remote.pm
+++ /dev/null
@@ -1,62 +0,0 @@
-use base "installedtest";
-use strict;
-use lockapi;
-use testapi;
-use utils;
-
-sub run {
-    my $self = shift;
-    # set up an ssh key
-    type_string "ssh-keygen\n";
-    sleep 2;
-    # confirm directory
-    send_key "ret";
-    sleep 2;
-    # empty passphrase
-    send_key "ret";
-    sleep 2;
-    # confirm empty passphrase
-    send_key "ret";
-    my $sshpub = script_output "cat /root/.ssh/id_ed25519.pub";
-    # launch Firefox
-    type_string "startx /usr/bin/firefox -width 1024 -height 768 http://172.16.2.118\n";
-    # log in as admin
-    assert_screen "zezere_login";
-    type_string "admin";
-    send_key "tab";
-    type_string "weakpassword\n";
-    # allow for UI to stabilize
-    wait_still_screen 10;
-    # add our ssh key
-    assert_and_click "zezere_ssh_key";
-    assert_and_click "zezere_ssh_key_contents";
-    type_string "$sshpub";
-    send_key "tab";
-    send_key "ret";
-    wait_still_screen 3;
-    # claim the device
-    assert_and_click "zezere_claim_unowned";
-    assert_and_click "zezere_claim_button";
-    # provision it
-    assert_and_click "zezere_device_management";
-    assert_and_click "zezere_submit_provision";
-    assert_and_click "zezere_provision_menu";
-    send_key_until_needlematch("zezere_provision_installed", "down", 3, 3);
-    send_key "ret";
-    assert_and_click "zezere_provision_schedule";
-    # exit
-    quit_firefox;
-    # time before the provision request goes through is kinda hard to
-    # predict, so we'll just try over and over for up to 10 minutes
-    # and bail as soon as it works
-    assert_script_run 'until ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no root@172.16.2.119 touch /tmp/zezerekeyfile; do sleep 10; done', 600;
-}
-
-
-sub test_flags {
-    return {fatal => 1};
-}
-
-1;
-
-# vim: set sw=4 et:
diff --git a/tests/_iot_zezere_server.pm b/tests/_iot_zezere_server.pm
deleted file mode 100644
index 77ff5e35..00000000
--- a/tests/_iot_zezere_server.pm
+++ /dev/null
@@ -1,47 +0,0 @@
-use base "installedtest";
-use strict;
-use testapi;
-use utils;
-
-sub run {
-    my $self = shift;
-    # deploy a zezere (Fedora IoT provisioning server) instance
-    assert_script_run "dnf --enablerepo=updates-testing -y install zezere", 180;
-    # write config file
-    assert_script_run "printf '[global]\nsecret_key = SECRET_KEY\ndebug = yes\nallowed_hosts = localhost, localhost.localdomain, 172.16.2.118\nsecure_cookie = no\nauth_method = local\n\n[oidc.rp]\nsign_algo = RS256\n\n[database]\nengine = django.db.backends.sqlite3\nname = /var/local/zezere.sqlite3' > /etc/zezere.conf";
-    # write systemd unit file
-    assert_script_run "printf '[Unit]\nDescription=Zezere provisioning server\n\n[Service]\nExecStart=/usr/bin/zezere-manage runserver 172.16.2.118:80\n\n[Install]\nWantedBy=multi-user.target' > /etc/systemd/system/zezere.service";
-    assert_script_run "systemctl daemon-reload";
-    # open firewall port
-    assert_script_run "firewall-cmd --add-service=http";
-    # update DB schema
-    assert_script_run "zezere-manage makemigrations";
-    assert_script_run "zezere-manage migrate";
-    # load DB fixtures
-    assert_script_run "zezere-manage loaddata fedora_iot_runreqs";
-    assert_script_run "zezere-manage loaddata fedora_installed";
-    # create admin user
-    assert_script_run 'zezere-manage createsuperuser --username admin --email zezere@test.openqa.fedoraproject.org --no-input';
-    # set admin password (can't find a non-interactive way sadly)
-    type_string "zezere-manage changepassword admin\n";
-    wait_still_screen 5;
-    type_string "weakpassword\n";
-    wait_still_screen 5;
-    type_string "weakpassword\n";
-    wait_still_screen 5;
-    # check DB exists
-    assert_script_run "ls -l /var/local/zezere.sqlite3";
-    # start server
-    assert_script_run "systemctl start zezere.service";
-    # check it seems to be running
-    assert_script_run "curl http://172.16.2.118";
-}
-
-
-sub test_flags {
-    return {fatal => 1};
-}
-
-1;
-
-# vim: set sw=4 et:
diff --git a/tests/iot_zezere_ignition.pm b/tests/iot_zezere_ignition.pm
deleted file mode 100644
index 7369f094..00000000
--- a/tests/iot_zezere_ignition.pm
+++ /dev/null
@@ -1,19 +0,0 @@
-use base "installedtest";
-use strict;
-use testapi;
-
-sub run {
-    my $self = shift;
-    # wait for the remote test to ssh in and create a file, that
-    # tells us we're done
-    assert_script_run "until test -f /tmp/zezerekeyfile; do sleep 1; done", 900;
-}
-
-
-sub test_flags {
-    return {fatal => 1};
-}
-
-1;
-
-# vim: set sw=4 et: