diff --git a/default-logins/hp/hp-switch-default-login.yaml b/default-logins/hp/hp-switch-default-login.yaml
index aa854686cb..beada2b11a 100644
--- a/default-logins/hp/hp-switch-default-login.yaml
+++ b/default-logins/hp/hp-switch-default-login.yaml
@@ -20,15 +20,13 @@ requests:
       username:
         - admin
 
-    attack: sniper
-
     matchers-condition: and
     matchers:
       - type: word
+        condition: and
         words:
           - '"redirect": "/htdocs/pages/main/main.lsp"'
           - '"error": ""'
-        condition: and
 
       - type: status
         status:
diff --git a/default-logins/idemia/idemia-biometrics-default-login.yaml b/default-logins/idemia/idemia-biometrics-default-login.yaml
index 9c7aa9d12a..959da5926b 100644
--- a/default-logins/idemia/idemia-biometrics-default-login.yaml
+++ b/default-logins/idemia/idemia-biometrics-default-login.yaml
@@ -18,22 +18,21 @@ requests:
 
     payloads:
       password:
-        - 12345
-    attack: sniper
+        - "12345"
 
     matchers-condition: and
     matchers:
       - type: word
+        condition: and
         words:
           - "session_id="
           - "resource"
-        condition: and
 
       - type: word
-        words:
-          - "Invalid Password"
         part: body
         negative: true
+        words:
+          - "Invalid Password"
 
       - type: status
         status: