diff --git a/needles/gnome/apps/keyring/keyring_askpass_password-gnome.json b/needles/gnome/apps/keyring/keyring_askpass_password-gnome.json
deleted file mode 100644
index d4b1111d..00000000
--- a/needles/gnome/apps/keyring/keyring_askpass_password-gnome.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 226,
-      "ypos": 271,
-      "width": 164,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "keyring_askpass_password"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_askpass_password-gnome.png b/needles/gnome/apps/keyring/keyring_askpass_password-gnome.png
deleted file mode 100644
index 636024c4..00000000
Binary files a/needles/gnome/apps/keyring/keyring_askpass_password-gnome.png and /dev/null differ
diff --git a/needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.json b/needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.json
new file mode 100644
index 00000000..b12eff40
--- /dev/null
+++ b/needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 21,
+      "width": 170,
+      "ypos": 240,
+      "xpos": 550,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_askpass_yesno"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.png b/needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.png
new file mode 100644
index 00000000..50532a65
Binary files /dev/null and b/needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.png differ
diff --git a/needles/gnome/apps/nautilus/nautilus_autounlock_password.json b/needles/gnome/apps/nautilus/nautilus_autounlock_password.json
index 0693b99b..512b508e 100644
--- a/needles/gnome/apps/nautilus/nautilus_autounlock_password.json
+++ b/needles/gnome/apps/nautilus/nautilus_autounlock_password.json
@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_autounlock_password"
+    "nautilus_autounlock_password",
+    "keyring_askpass_remember",
+    "DESKTOP-gnome"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/apps/nautilus/nautilus_remember_password.json b/needles/gnome/apps/nautilus/nautilus_remember_password.json
index fb9a9001..3cfaf857 100644
--- a/needles/gnome/apps/nautilus/nautilus_remember_password.json
+++ b/needles/gnome/apps/nautilus/nautilus_remember_password.json
@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_remember_password"
+    "nautilus_remember_password",
+    "keyring_askpass_remember",
+    "DESKTOP-gnome"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/apps/nautilus/nautilus_unlock-20240514.json b/needles/gnome/apps/nautilus/nautilus_unlock-20240514.json
index df320f5f..5c9cdfff 100644
--- a/needles/gnome/apps/nautilus/nautilus_unlock-20240514.json
+++ b/needles/gnome/apps/nautilus/nautilus_unlock-20240514.json
@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_unlock"
+    "nautilus_unlock",
+    "keyring_askpass_confirm",
+    "DESKTOP-gnome"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/apps/nautilus/nautilus_unlock.json b/needles/gnome/apps/nautilus/nautilus_unlock.json
index dbd1766a..9ce65236 100644
--- a/needles/gnome/apps/nautilus/nautilus_unlock.json
+++ b/needles/gnome/apps/nautilus/nautilus_unlock.json
@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_unlock"
+    "nautilus_unlock",
+    "keyring_askpass_confirm",
+    "DESKTOP-gnome"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/keyring/keyring_askpass_confirm.json b/needles/kde/apps/keyring/keyring_askpass_confirm.json
index 33fdbe4f..08d9a7f2 100644
--- a/needles/kde/apps/keyring/keyring_askpass_confirm.json
+++ b/needles/kde/apps/keyring/keyring_askpass_confirm.json
@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_confirm"
+    "keyring_askpass_confirm",
+    "DESKTOP-kde"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/keyring/keyring_askpass_password.json b/needles/kde/apps/keyring/keyring_askpass_password.json
deleted file mode 100644
index 43e1480d..00000000
--- a/needles/kde/apps/keyring/keyring_askpass_password.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 379,
-      "ypos": 322,
-      "width": 167,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "keyring_askpass_password"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/keyring/keyring_askpass_password.png b/needles/kde/apps/keyring/keyring_askpass_password.png
deleted file mode 100644
index 12784f65..00000000
Binary files a/needles/kde/apps/keyring/keyring_askpass_password.png and /dev/null differ
diff --git a/needles/kde/apps/keyring/keyring_askpass_remember.json b/needles/kde/apps/keyring/keyring_askpass_remember.json
index 32334db8..b9941b92 100644
--- a/needles/kde/apps/keyring/keyring_askpass_remember.json
+++ b/needles/kde/apps/keyring/keyring_askpass_remember.json
@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_remember"
+    "keyring_askpass_remember",
+    "DESKTOP-kde"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/keyring/keyring_askpass_yesno-20240510.json b/needles/kde/apps/keyring/keyring_askpass_yesno-20240510.json
index ba323883..f4d7aeef 100644
--- a/needles/kde/apps/keyring/keyring_askpass_yesno-20240510.json
+++ b/needles/kde/apps/keyring/keyring_askpass_yesno-20240510.json
@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_yesno"
+    "keyring_askpass_yesno",
+    "DESKTOP-kde"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/keyring/keyring_askpass_yesno.json b/needles/kde/apps/keyring/keyring_askpass_yesno.json
index 5b3fab4d..ceaa47eb 100644
--- a/needles/kde/apps/keyring/keyring_askpass_yesno.json
+++ b/needles/kde/apps/keyring/keyring_askpass_yesno.json
@@ -11,6 +11,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_yesno"
+    "keyring_askpass_yesno",
+    "DESKTOP-kde"
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/applications/keyring/keyring_password.pm b/tests/applications/keyring/keyring_password.pm
index 3ad62800..fe2086bc 100644
--- a/tests/applications/keyring/keyring_password.pm
+++ b/tests/applications/keyring/keyring_password.pm
@@ -46,10 +46,10 @@ sub connect_localhost {
         # in the password. We will also try to remember the
         # password and confirm the connection.
         if ($type ne "reconnect") {
-            wait_still_screen(3);
+            assert_screen("keyring_askpass_remember");
             type_very_safely($pass);
-            assert_and_click("nautilus_remember_password");
-            assert_and_click("nautilus_unlock");
+            click_lastmatch;
+            assert_and_click("keyring_askpass_confirm");
         }
         # When the connection has been established,
         # a new connection icon will appear.
@@ -83,9 +83,9 @@ sub connect_localhost {
             # Then similarly to Gnome, the password dialogue will appear
             # and we type in the password. Also, we click on Remember
             # and confirm with the OK button.
-            assert_screen("keyring_askpass_password");
+            assert_screen("keyring_askpass_remember");
             type_very_safely("$pass");
-            assert_and_click("keyring_askpass_remember");
+            click_lastmatch;
             assert_and_click("keyring_askpass_confirm");
         }
         # Check that we have logged in and exit the application.
@@ -154,7 +154,7 @@ sub run {
     # Boot to login screen and type in the password.
     boot_to_login_screen();
     dm_perform_login($desktop, $pass);
-    check_desktop;
+    check_desktop(timeout => 120);
 
     # Repeat the connection procedure, but skip the password
     # handling process as this will be done by the keyring.
diff --git a/tests/applications/keyring/keyring_passwordless.pm b/tests/applications/keyring/keyring_passwordless.pm
index d2dfcf5c..f09f9ab5 100644
--- a/tests/applications/keyring/keyring_passwordless.pm
+++ b/tests/applications/keyring/keyring_passwordless.pm
@@ -46,25 +46,16 @@ sub connect_localhost {
     # the SSH key.
     my $command = "sftp $user" . '@localhost';
     enter_cmd($command);
-    sleep 2;
 
     # When connecting for the first time, we will remember
     # the key password and store it in the keyring.
     if ($type ne "reconnect") {
-        if ($desktop eq "gnome") {
-            type_very_safely("yes\n");
-            wait_still_screen(2);
-            type_very_safely("sshpassword");
-            assert_and_click("nautilus_autounlock_password");
-            assert_and_click("nautilus_unlock");
-        }
-        else {
-            type_very_safely("yes\n");
-            wait_still_screen(2);
-            type_very_safely("sshpassword");
-            assert_and_click("keyring_askpass_remember");
-            assert_and_click("keyring_askpass_confirm");
-        }
+        assert_screen("keyring_askpass_yesno");
+        type_very_safely("yes\n");
+        assert_screen("keyring_askpass_remember");
+        type_very_safely("sshpassword");
+        click_lastmatch;
+        assert_and_click("keyring_askpass_confirm");
     }
 
     # The connection should have been established if everything has worked
@@ -105,7 +96,7 @@ sub run {
     # Log in.
     boot_to_login_screen();
     dm_perform_login($desktop, $pass);
-    check_desktop;
+    check_desktop(timeout => 120);
 
     # Reconnect without using password. We still should be
     # able to log in.