diff --git a/samples/test/cucumber.wdio.conf.ts b/samples/test/cucumber.wdio.conf.ts
index e844ee71d..e306851ec 100644
--- a/samples/test/cucumber.wdio.conf.ts
+++ b/samples/test/cucumber.wdio.conf.ts
@@ -99,7 +99,7 @@ const cucumberOpts: WebdriverIO.CucumberOpts = {
   // tags matching the expression, see
   // https://docs.cucumber.io/tag-expressions/
   // tagExpression: 'not @Pending',
-  tags: 'not @Pending',
+  tags: 'not @Pending and not @quarantined',
   // <boolean> add cucumber tags to feature or scenario name
   // tagsInTitle: false,
   // <number> timeout for step definitions
diff --git a/samples/test/features/identifier-first-auth.feature b/samples/test/features/identifier-first-auth.feature
index bf978abe6..b69150054 100644
--- a/samples/test/features/identifier-first-auth.feature
+++ b/samples/test/features/identifier-first-auth.feature
@@ -14,7 +14,7 @@ Feature: Login with Identifier First
       And a user named "Mary"
       And she has an account with "active" state in the org
 
-  @flaky
+  @quarantined
   Scenario: Mary logs in with Email with an OTP 
     When she clicks the "login" button
     Then she is redirected to the "Login" page
@@ -33,7 +33,7 @@ Feature: Login with Identifier First
       And she sees a table with her profile info
       And the cell for the value of "email" is shown and contains her "email"
 
-  @flaky
+  @quarantined
   Scenario: Mary Logs in with Email Magic Link on the same Browser
     Given the app has Email Verification callback uri defined
     When she clicks the "login" button
diff --git a/samples/test/features/mfa-password-and-email-magic-link.feature b/samples/test/features/mfa-password-and-email-magic-link.feature
index 67501d731..6bc9a7324 100644
--- a/samples/test/features/mfa-password-and-email-magic-link.feature
+++ b/samples/test/features/mfa-password-and-email-magic-link.feature
@@ -8,7 +8,7 @@ Feature: Multi-Factor Authentication with Password and Email Magic Link
       And a user named "Mary"
       And she has an account with "active" state in the org
 
-  @flaky
+  @quarantined
   Scenario: 2FA Login with Email Magic Link on the same browser
     When she clicks the "login" button
     Then she is redirected to the "Login" page
diff --git a/samples/test/features/mfa-password-and-email.feature b/samples/test/features/mfa-password-and-email.feature
index 995e952ec..3ef337d12 100644
--- a/samples/test/features/mfa-password-and-email.feature
+++ b/samples/test/features/mfa-password-and-email.feature
@@ -7,7 +7,7 @@ Feature: Multi-Factor Authentication with Password and Email
       And a user named "Mary"
       And she has an account with "active" state in the org
 
-  @flaky
+  @quarantined
   Scenario: Mary enters a wrong verification code
     When she clicks the "login" button
     Then she is redirected to the "Login" page
@@ -22,7 +22,7 @@ Feature: Multi-Factor Authentication with Password and Email
       And she submits the form
     Then the sample shows an error message "Invalid code. Try again." on the Sample App
 
-  @flaky
+  @quarantined
   Scenario: 2FA Login with Email
     When she clicks the "login" button
     Then she is redirected to the "Login" page
diff --git a/samples/test/features/self-service-password-recovery.feature b/samples/test/features/self-service-password-recovery.feature
index d8e23610a..35f304cdf 100644
--- a/samples/test/features/self-service-password-recovery.feature
+++ b/samples/test/features/self-service-password-recovery.feature
@@ -7,7 +7,7 @@ Background:
     And a user named "Mary"
     And she has an account with "active" state in the org
 
-  @flaky
+  @quarantined
   Scenario: Mary resets her password
     When she clicks the "login" button
     Then she is redirected to the "Login" page