diff --git a/main.pm b/main.pm
index e9952340..eb01f67d 100644
--- a/main.pm
+++ b/main.pm
@@ -352,11 +352,8 @@ sub load_postinstall_tests() {
     }
 
     # load the ADVISORY / KOJITASK post-install test - this records which
-    # update or task packages were actually installed during the test. Don't
-    # do this for netinst tests; as these just use the default install repo,
-    # they will not get the packages from the update. But installs from live
-    # image and ostree installer image should get them.
-    if (get_var("ADVISORY_OR_TASK") && get_var("TEST") ne "install_default_update_netinst") {
+    # update or task packages were actually installed during the test.
+    if (get_var("ADVISORY_OR_TASK") && !get_var("NO_ADVISORY_POST")) {
         # don't do this for support server unless the update is for the same
         # release as the support server disk image, as we don't install the
         # updates on support server when they differ
diff --git a/needles/kde/apps/keyring/keyring_wallet_password_reveal-f39-20241005.json b/needles/kde/apps/keyring/keyring_wallet_password_reveal-f39-20241005.json
new file mode 100644
index 00000000..4fd0a3ab
--- /dev/null
+++ b/needles/kde/apps/keyring/keyring_wallet_password_reveal-f39-20241005.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 95,
+      "ypos": 231,
+      "xpos": 484,
+      "height": 19
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_wallet_password_reveal"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/keyring/keyring_wallet_password_reveal-f39-20241005.png b/needles/kde/apps/keyring/keyring_wallet_password_reveal-f39-20241005.png
new file mode 100644
index 00000000..64488797
Binary files /dev/null and b/needles/kde/apps/keyring/keyring_wallet_password_reveal-f39-20241005.png differ
diff --git a/needles/kde/apps/kwalletmanager_runs-f39-20241005.json b/needles/kde/apps/kwalletmanager_runs-f39-20241005.json
new file mode 100644
index 00000000..55b08e64
--- /dev/null
+++ b/needles/kde/apps/kwalletmanager_runs-f39-20241005.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "ypos": 97,
+      "xpos": 460,
+      "width": 104,
+      "height": 23
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kwalletmanager_runs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/kwalletmanager_runs-f39-20241005.png b/needles/kde/apps/kwalletmanager_runs-f39-20241005.png
new file mode 100644
index 00000000..454d536b
Binary files /dev/null and b/needles/kde/apps/kwalletmanager_runs-f39-20241005.png differ
diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index fd68ee7c..d11251e8 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -351,12 +351,24 @@
                 "fedora-updates-workstation-x86_64-*-64bit": 5
             }
         },
+        "desktop_keyring": {
+            "profiles": {
+                "fedora-updates-kde-x86_64-*-64bit": 5,
+                "fedora-updates-workstation-x86_64-*-64bit": 5
+            }
+        },
         "desktop_printing": {
             "profiles": {
                 "fedora-updates-kde-x86_64-*-64bit": 5,
                 "fedora-updates-workstation-x86_64-*-64bit": 5
             }
         },
+        "desktop_printing_builtin": {
+            "profiles": {
+                "fedora-updates-kde-x86_64-*-64bit": 5,
+                "fedora-updates-workstation-x86_64-*-64bit": 5
+            }
+        },
         "desktop_terminal": {
             "profiles": {
                 "fedora-updates-kde-x86_64-*-64bit": 5,
@@ -395,6 +407,7 @@
                 "INSTALL_UNLOCK": "support_ready",
                 "ISO": "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso",
                 "NICTYPE": "tap",
+                "NO_ADVISORY_POST": "1",
                 "PACKAGE_SET": "default",
                 "PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%",
                 "WORKER_CLASS": "tap"
@@ -601,6 +614,11 @@
                 "fedora-updates-everything-boot-iso-x86_64-*-64bit": 5
             }
         },
+        "toolbox": {
+            "profiles": {
+                "fedora-updates-workstation-x86_64-*-64bit": 5
+            }
+        },
         "upgrade_desktop_encrypted_64bit": {
             "profiles": {
                 "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
diff --git a/templates.fif.json b/templates.fif.json
index f3b01584..f607c3c4 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -964,6 +964,8 @@
             "settings": {
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "NO_ADVISORY_POST": "1",
+                "NO_UEFI_POST": "1",
                 "POSTINSTALL": "desktop_login",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }