diff --git a/mon-pix/app/components/account-recovery/backup-email-confirmation-form.hbs b/mon-pix/app/components/account-recovery/backup-email-confirmation-form.hbs
index 9481138a187..94d5807e830 100644
--- a/mon-pix/app/components/account-recovery/backup-email-confirmation-form.hbs
+++ b/mon-pix/app/components/account-recovery/backup-email-confirmation-form.hbs
@@ -24,18 +24,19 @@
   {{/if}}
 
   <form onSubmit={{this.submitBackupEmailConfirmationForm}}>
-    <FormTextfield
-      @label={{t "pages.account-recovery.find-sco-record.backup-email-confirmation.form.email"}}
-      @textfieldName="email"
-      @inputBindingValue={{this.email}}
-      @onValidate={{this.validateEmail}}
+    <PixInput
+      @id="email"
+      @value={{this.email}}
+      {{on "focusout" this.validateEmail}}
+      {{on "input" this.handleInputChange}}
+      @requiredLabel={{true}}
       @validationStatus={{this.emailValidation.status}}
-      @validationMessage={{this.emailValidation.message}}
-      @autocomplete="off"
-      @require={{true}}
-      @hideRequired={{true}}
-      @aria-describedby="backup-email-confirmation-already-use-error-message backup-email-confirmation-already-associated-error-message"
-    />
+      @errorMessage={{this.emailValidation.message}}
+      autocomplete="off"
+      type="text"
+    >
+      <:label>{{t "pages.account-recovery.find-sco-record.backup-email-confirmation.form.email"}}</:label>
+    </PixInput>
 
     {{#if @showAlreadyRegisteredEmailError}}
       <PixNotificationAlert
diff --git a/mon-pix/app/components/account-recovery/backup-email-confirmation-form.js b/mon-pix/app/components/account-recovery/backup-email-confirmation-form.js
index c23df06b8e9..9d81e7f377e 100644
--- a/mon-pix/app/components/account-recovery/backup-email-confirmation-form.js
+++ b/mon-pix/app/components/account-recovery/backup-email-confirmation-form.js
@@ -55,6 +55,11 @@ export default class BackupEmailConfirmationFormComponent extends Component {
     this.emailValidation.message = null;
   }
 
+  @action
+  handleInputChange(event) {
+    this.email = event.target.value;
+  }
+
   @action
   async submitBackupEmailConfirmationForm(event) {
     event.preventDefault();
diff --git a/mon-pix/app/components/account-recovery/student-information-form.hbs b/mon-pix/app/components/account-recovery/student-information-form.hbs
index e3d178ebf60..7429b89dba8 100644
--- a/mon-pix/app/components/account-recovery/student-information-form.hbs
+++ b/mon-pix/app/components/account-recovery/student-information-form.hbs
@@ -15,108 +15,110 @@
     {{t "pages.account-recovery.find-sco-record.student-information.mandatory-all-fields"}}
   </p>
 
-  <form {{on "submit" this.submit}} class="account-recovery__content--form">
-    <div class="account-recovery__content--form-fields">
-      <div class="student-information-form__tooltip">
-        <PixTooltip
-          @position="top-left"
-          @isLight={{true}}
-          @isWide={{true}}
-          aria-label={{t "pages.account-recovery.find-sco-record.student-information.form.tooltip" htmlSafe=true}}
-        >
-          <:triggerElement>
-            <PixIcon @name="help" @plainIcon={{true}} @ariaHidden={{true}} tabindex="0" />
-          </:triggerElement>
-          <:tooltip>
-            {{t "pages.account-recovery.find-sco-record.student-information.form.tooltip" htmlSafe=true}}
-          </:tooltip>
-        </PixTooltip>
-      </div>
-      <FormTextfield
-        @label={{t "pages.account-recovery.find-sco-record.student-information.form.ine-ina"}}
-        @textfieldName="ineIna"
-        @inputBindingValue={{this.ineIna}}
-        @onValidate={{this.validateIneIna}}
-        @validationStatus={{this.ineInaValidation.status}}
-        @validationMessage={{this.ineInaValidation.message}}
-        @autocomplete="off"
-        @require={{true}}
-        @hideRequired="true"
-        @placeholder="123456789XX"
-        @aria-describedby="student-information-error-message"
-      />
+  <form {{on "submit" this.submit}} class="account-recovery__form">
+    <PixInput
+      @id="ineIna"
+      type="text"
+      placeholder="123456789XX"
+      @value={{this.ineIna}}
+      {{on "focusout" this.validateIneIna}}
+      {{on "input" this.handleIneInaInput}}
+      @validationStatus={{this.ineInaValidation.status}}
+      @errorMessage={{this.ineInaValidation.message}}
+      autocomplete="off"
+    >
+      <:label>
+        {{t "pages.account-recovery.find-sco-record.student-information.form.ine-ina"}}
+
+        <div class="student-information-form__tooltip">
+          <PixTooltip
+            @position="top-left"
+            @isLight={{true}}
+            @isWide={{true}}
+            aria-label={{t "pages.account-recovery.find-sco-record.student-information.form.tooltip" htmlSafe=true}}
+          >
+            <:triggerElement>
+              <PixIcon @name="help" @plainIcon={{true}} @ariaHidden={{true}} tabindex="0" />
+            </:triggerElement>
+            <:tooltip>
+              {{t "pages.account-recovery.find-sco-record.student-information.form.tooltip" htmlSafe=true}}
+            </:tooltip>
+          </PixTooltip>
+        </div>
+      </:label>
+    </PixInput>
 
-      <FormTextfield
-        @label={{t "pages.account-recovery.find-sco-record.student-information.form.first-name"}}
-        @textfieldName="firstName"
-        @inputBindingValue={{this.firstName}}
-        @onValidate={{this.validateFirstName}}
-        @validationStatus={{this.firstNameValidation.status}}
-        @validationMessage={{this.firstNameValidation.message}}
-        @autocomplete="off"
-        @require={{true}}
-        @hideRequired="true"
-        @aria-describedby="student-information-error-message"
-      />
+    <PixInput
+      @id="firstName"
+      @value={{this.firstName}}
+      {{on "focusout" this.validateFirstName}}
+      {{on "input" this.handleFirstNameInput}}
+      @validationStatus={{this.firstNameValidation.status}}
+      @errorMessage={{this.firstNameValidation.message}}
+      autocomplete="off"
+      type="text"
+    >
+      <:label>{{t "pages.account-recovery.find-sco-record.student-information.form.first-name"}}</:label>
+    </PixInput>
 
-      <FormTextfield
-        @label={{t "pages.account-recovery.find-sco-record.student-information.form.last-name"}}
-        @textfieldName="lastName"
-        @inputBindingValue={{this.lastName}}
-        @onValidate={{this.validateLastName}}
-        @validationStatus={{this.lastNameValidation.status}}
-        @validationMessage={{this.lastNameValidation.message}}
-        @autocomplete="off"
-        @require={{true}}
-        @hideRequired="true"
-        @aria-describedby="student-information-error-message"
-      />
+    <PixInput
+      @id="lastName"
+      @value={{this.lastName}}
+      {{on "focusout" this.validateLastName}}
+      {{on "input" this.handleLastNameInput}}
+      @validationStatus={{this.lastNameValidation.status}}
+      @errorMessage={{this.lastNameValidation.message}}
+      autocomplete="off"
+      type="text"
+    >
+      <:label>{{t "pages.account-recovery.find-sco-record.student-information.form.last-name"}}</:label>
+    </PixInput>
 
-      <div class="form-textfield">
-        <p class="form-textfield__label student-information-form__birthdate-label">
-          {{t "pages.account-recovery.find-sco-record.student-information.form.birthdate"}}
-        </p>
-        <div class="student-information-form__birthdate-fields">
-          <div class="form-textfield__input-field-container">
-            <Input
-              min="1"
-              max="31"
-              @type="number"
-              @value={{this.dayOfBirth}}
-              placeholder={{t "pages.account-recovery.find-sco-record.student-information.form.placeholder.birth-day"}}
-              id="dayOfBirth"
-              {{on "input" this.handleDayInputChange}}
-              aria-label={{t "pages.account-recovery.find-sco-record.student-information.form.label.birth-day"}}
-              autocomplete="off"
-            />
-          </div>
-          <div class="form-textfield__input-field-container">
-            <Input
-              min="1"
-              max="12"
-              @type="number"
-              @value={{this.monthOfBirth}}
-              placeholder={{t
-                "pages.account-recovery.find-sco-record.student-information.form.placeholder.birth-month"
-              }}
-              id="monthOfBirth"
-              {{on "input" this.handleMonthInputChange}}
-              aria-label={{t "pages.account-recovery.find-sco-record.student-information.form.label.birth-month"}}
-              autocomplete="off"
-            />
-          </div>
-          <div class="form-textfield__input-field-container">
-            <Input
-              min="1900"
-              @type="number"
-              @value={{this.yearOfBirth}}
-              placeholder={{t "pages.account-recovery.find-sco-record.student-information.form.placeholder.birth-year"}}
-              id="yearOfBirth"
-              aria-label={{t "pages.account-recovery.find-sco-record.student-information.form.label.birth-year"}}
-              autocomplete="off"
-            />
-          </div>
-        </div>
+    <div class="form-textfield">
+      <p class="form-textfield__label student-information-form__birthdate-label">
+        {{t "pages.account-recovery.find-sco-record.student-information.form.birthdate"}}
+      </p>
+      <div class="student-information-form__birthdate-fields">
+        <PixInput
+          min="1"
+          max="31"
+          type="number"
+          @value={{this.dayOfBirth}}
+          placeholder={{t "pages.account-recovery.find-sco-record.student-information.form.placeholder.birth-day"}}
+          @id="dayOfBirth"
+          {{on "input" this.handleDayInput}}
+          autocomplete="off"
+          @screenReaderOnly={{true}}
+        >
+          <:label>{{t "pages.account-recovery.find-sco-record.student-information.form.label.birth-day"}}</:label>
+        </PixInput>
+
+        <PixInput
+          min="1"
+          max="12"
+          type="number"
+          @value={{this.monthOfBirth}}
+          placeholder={{t "pages.account-recovery.find-sco-record.student-information.form.placeholder.birth-month"}}
+          @id="monthOfBirth"
+          {{on "input" this.handleMonthInput}}
+          autocomplete="off"
+          @screenReaderOnly={{true}}
+        >
+          <:label>{{t "pages.account-recovery.find-sco-record.student-information.form.label.birth-month"}}</:label>
+        </PixInput>
+
+        <PixInput
+          min="1900"
+          type="number"
+          @value={{this.yearOfBirth}}
+          placeholder={{t "pages.account-recovery.find-sco-record.student-information.form.placeholder.birth-year"}}
+          @id="yearOfBirth"
+          autocomplete="off"
+          {{on "input" this.handleYearInput}}
+          @screenReaderOnly={{true}}
+        >
+          <:label>{{t "pages.account-recovery.find-sco-record.student-information.form.label.birth-year"}}</:label>
+        </PixInput>
       </div>
     </div>
 
@@ -137,10 +139,8 @@
       </PixNotificationAlert>
     {{/if}}
 
-    <div class="account-recovery__content--actions">
-      <PixButton @type="submit" @isDisabled={{not this.isFormValid}}>
-        {{t "pages.account-recovery.find-sco-record.student-information.form.submit"}}
-      </PixButton>
-    </div>
+    <PixButton @type="submit" @isDisabled={{not this.isFormValid}}>
+      {{t "pages.account-recovery.find-sco-record.student-information.form.submit"}}
+    </PixButton>
   </form>
 </div>
\ No newline at end of file
diff --git a/mon-pix/app/components/account-recovery/student-information-form.js b/mon-pix/app/components/account-recovery/student-information-form.js
index 535b39b0f3e..a2c51beb730 100644
--- a/mon-pix/app/components/account-recovery/student-information-form.js
+++ b/mon-pix/app/components/account-recovery/student-information-form.js
@@ -145,20 +145,41 @@ export default class StudentInformationFormComponent extends Component {
   }
 
   @action
-  handleDayInputChange(event) {
-    const { value } = event.target;
+  handleIneInaInput(event) {
+    this.ineIna = event.target.value;
+  }
+
+  @action
+  handleFirstNameInput(event) {
+    this.firstName = event.target.value;
+  }
+
+  @action
+  handleLastNameInput(event) {
+    this.lastName = event.target.value;
+  }
 
+  @action
+  handleDayInput(event) {
+    const { value } = event.target;
+    this.dayOfBirth = value;
     if (value.length === 2) {
       document.getElementById('monthOfBirth').focus();
     }
   }
 
   @action
-  handleMonthInputChange(event) {
+  handleMonthInput(event) {
     const { value } = event.target;
-
+    this.monthOfBirth = value;
     if (value.length === 2) {
       document.getElementById('yearOfBirth').focus();
     }
   }
+
+  @action
+  handleYearInput(event) {
+    const { value } = event.target;
+    this.yearOfBirth = value;
+  }
 }
diff --git a/mon-pix/app/components/account-recovery/update-sco-record-form.hbs b/mon-pix/app/components/account-recovery/update-sco-record-form.hbs
index cdc9204900e..fdab5810c06 100644
--- a/mon-pix/app/components/account-recovery/update-sco-record-form.hbs
+++ b/mon-pix/app/components/account-recovery/update-sco-record-form.hbs
@@ -8,24 +8,22 @@
 
 <form onSubmit={{this.submitUpdate}} class="account-recovery__content--form">
   <div class="account-recovery__content--form-fields">
-    <FormTextfield
-      @label={{t "pages.account-recovery.update-sco-record.form.email-label"}}
-      @textfieldName="email"
-      @inputBindingValue={{@email}}
-      @disabled={{true}}
-    />
+    <PixInput @id="email" @value={{@email}} @disabled={{true}}>
+      <:label>{{t "pages.account-recovery.update-sco-record.form.email-label"}}</:label>
+    </PixInput>
 
-    <FormTextfield
-      @label={{t "pages.account-recovery.update-sco-record.form.password-label"}}
-      @textfieldName="password"
-      @inputBindingValue={{this.password}}
-      @onValidate={{this.validatePassword}}
+    <PixInputPassword
+      @id="password"
+      @value={{this.password}}
+      autocomplete="off"
+      {{on "focusout" this.validatePassword}}
+      {{on "input" this.handlePasswordInput}}
       @validationStatus={{this.passwordValidation.status}}
-      @validationMessage={{this.passwordValidation.message}}
-      @autocomplete="off"
-      @require={{true}}
-      @hideRequired={{true}}
-    />
+      @errorMessage={{this.passwordValidation.message}}
+      @requiredLabel={{true}}
+    >
+      <:label>{{t "pages.account-recovery.update-sco-record.form.password-label"}}</:label>
+    </PixInputPassword>
 
     <div class="update-sco-record-form__cgu-container">
       <PixCheckbox {{on "change" this.onChange}}>
diff --git a/mon-pix/app/components/account-recovery/update-sco-record-form.js b/mon-pix/app/components/account-recovery/update-sco-record-form.js
index 8da2555e06e..fd58848bb39 100644
--- a/mon-pix/app/components/account-recovery/update-sco-record-form.js
+++ b/mon-pix/app/components/account-recovery/update-sco-record-form.js
@@ -70,6 +70,11 @@ export default class UpdateScoRecordFormComponent extends Component {
     this.passwordValidation.message = null;
   }
 
+  @action
+  handlePasswordInput(event) {
+    this.password = event.target.value;
+  }
+
   @action
   async submitUpdate(event) {
     event.preventDefault();
diff --git a/mon-pix/app/components/campaign-start-block.hbs b/mon-pix/app/components/campaign-start-block.hbs
index cbed519b454..e0f474e063a 100644
--- a/mon-pix/app/components/campaign-start-block.hbs
+++ b/mon-pix/app/components/campaign-start-block.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-action no-triple-curlies }}
 <div class="rounded-panel campaign-landing-page__container__start">
   <div class="campaign-landing-page__start__image__container">
     <div class="campaign-landing-page__pix-logo">
@@ -19,7 +18,7 @@
     <div class="campaign-landing-page-start">
       <h1 class="campaign-landing-page-start__title">{{this.titleText}}</h1>
       {{#unless this.session.isAuthenticated}}
-        <h2 class="campaign-landing-page-start__subtitle">{{{this.announcementText}}}</h2>
+        <h2 class="campaign-landing-page-start__subtitle">{{this.announcementText}}</h2>
       {{/unless}}
       <PixButton
         @type="submit"
diff --git a/mon-pix/app/components/campaigns/assessment/results/evaluation-results-hero/index.gjs b/mon-pix/app/components/campaigns/assessment/results/evaluation-results-hero/index.gjs
index 30476105cf2..3706948c358 100644
--- a/mon-pix/app/components/campaigns/assessment/results/evaluation-results-hero/index.gjs
+++ b/mon-pix/app/components/campaigns/assessment/results/evaluation-results-hero/index.gjs
@@ -180,7 +180,7 @@ export default class EvaluationResultsHero extends Component {
         {{/if}}
 
         {{#if this.displayQuestResult}}
-          <AttestationResult @results={{@questResults}} @onError={{(fn this.setGlobalError true)}} />
+          <AttestationResult @results={{@questResults}} @onError={{fn this.setGlobalError true}} />
         {{/if}}
 
       </div>
diff --git a/mon-pix/app/components/certification-starter.hbs b/mon-pix/app/components/certification-starter.hbs
index 97e72af62b8..6372c4989eb 100644
--- a/mon-pix/app/components/certification-starter.hbs
+++ b/mon-pix/app/components/certification-starter.hbs
@@ -57,13 +57,14 @@
   </label>
   <form autocomplete="off">
     <div class="certification-start-page__session-code-input">
-      <Input
+      <PixInput
         required={{true}}
         id="certificationStarterSessionCode"
         @type="text"
         @value={{this.inputAccessCode}}
         maxlength="6"
         spellcheck={{false}}
+        {{on "input" this.handleAccessCodeInput}}
       />
       {{#if this.errorMessage}}
         <div class="certification-start-page__information">
diff --git a/mon-pix/app/components/certification-starter.js b/mon-pix/app/components/certification-starter.js
index 81b69bc6c20..dde13fe5d29 100644
--- a/mon-pix/app/components/certification-starter.js
+++ b/mon-pix/app/components/certification-starter.js
@@ -36,6 +36,11 @@ export default class CertificationStarter extends Component {
     return this.intl.t(`pages.certification-start.${intlSuffix}`);
   }
 
+  @action
+  handleAccessCodeInput(event) {
+    this.inputAccessCode = event.target.value;
+  }
+
   @action
   async submit(e) {
     e.preventDefault();
diff --git a/mon-pix/app/components/challenge-embed-simulator.hbs b/mon-pix/app/components/challenge-embed-simulator.hbs
index 0ad8a20100a..e032a9546a9 100644
--- a/mon-pix/app/components/challenge-embed-simulator.hbs
+++ b/mon-pix/app/components/challenge-embed-simulator.hbs
@@ -26,8 +26,7 @@
         class="embed__iframe"
         src="{{@embedDocument.url}}"
         title="{{@embedDocument.title}}"
-        {{did-insert this.configureIframe @embedDocument.url this}}
-        {{did-update this.configureIframe @embedDocument.url this}}
+        {{modifier-did-insert this.configureIframe @embedDocument.url this}}
         frameBorder="0"
         style="{{this.embedDocumentHeightStyle}}"
       ></iframe>
diff --git a/mon-pix/app/components/challenge-embed-simulator.js b/mon-pix/app/components/challenge-embed-simulator.js
index 4f3f0b0ea28..96f06f7dfe7 100644
--- a/mon-pix/app/components/challenge-embed-simulator.js
+++ b/mon-pix/app/components/challenge-embed-simulator.js
@@ -31,10 +31,7 @@ export default class ChallengeEmbedSimulator extends Component {
     return '';
   }
 
-  configureIframe(iframe, params) {
-    const embedUrl = params[0];
-    const thisComponent = params[1];
-
+  configureIframe = (iframe, embedUrl, thisComponent) => {
     thisComponent.isLoadingEmbed = true;
     thisComponent.isSimulatorLaunched = false;
 
@@ -63,7 +60,7 @@ export default class ChallengeEmbedSimulator extends Component {
     };
 
     window.addEventListener('message', thisComponent._embedMessageListener);
-  }
+  };
 
   @action
   launchSimulator() {
diff --git a/mon-pix/app/components/challenge-item/challenge-item-qroc.hbs b/mon-pix/app/components/challenge-item/challenge-item-qroc.hbs
index 51d018ac381..c2bc1a20086 100644
--- a/mon-pix/app/components/challenge-item/challenge-item-qroc.hbs
+++ b/mon-pix/app/components/challenge-item/challenge-item-qroc.hbs
@@ -1,4 +1,4 @@
-<form {{will-destroy this.removeEmbedAutoEventListener}} {{on "submit" this.validateAnswer}}>
+<form {{on "submit" this.validateAnswer}}>
   {{#if this.showProposal}}
     <div class="rounded-panel__row challenge-response {{if @answer 'challenge-response--locked'}}">
       <h2 class="sr-only">{{t "pages.challenge.parts.answer-input"}}</h2>
diff --git a/mon-pix/app/components/challenge-item/challenge-item-qroc.js b/mon-pix/app/components/challenge-item/challenge-item-qroc.js
index fc24888973a..84d0ddc3268 100644
--- a/mon-pix/app/components/challenge-item/challenge-item-qroc.js
+++ b/mon-pix/app/components/challenge-item/challenge-item-qroc.js
@@ -107,11 +107,6 @@ export default class ChallengeItemQroc extends ChallengeItemGeneric {
     this.qrocProposalAnswerValue = value;
   }
 
-  @action
-  removeEmbedAutoEventListener() {
-    window.removeEventListener('message', this.postMessageHandler);
-  }
-
   get _blocks() {
     return proposalsAsBlocks(this.args.challenge.proposals).map((block) => {
       block.randomName = generateRandomString(block.input);
@@ -131,6 +126,10 @@ export default class ChallengeItemQroc extends ChallengeItemGeneric {
     const inputBlock = this._blocks.find((block) => block.input != null);
     return inputBlock?.defaultValue ?? '';
   }
+  willDestroy() {
+    super.willDestroy(...arguments);
+    window.removeEventListener('message', this.postMessageHandler);
+  }
 }
 
 function _wasSkipped(answer) {
diff --git a/mon-pix/app/components/challenge/item.hbs b/mon-pix/app/components/challenge/item.hbs
index 7dae2ec380f..eed21b98c0a 100644
--- a/mon-pix/app/components/challenge/item.hbs
+++ b/mon-pix/app/components/challenge/item.hbs
@@ -1,6 +1,5 @@
 <article
   class="rounded-panel rounded-panel--no-margin-bottom challenge-item"
-  {{will-destroy this.clearFocusOutEventListener}}
   data-challenge-id="{{@challenge.id}}"
   role="article"
 >
diff --git a/mon-pix/app/components/challenge/item.js b/mon-pix/app/components/challenge/item.js
index e75425f56e2..4b346c1be15 100644
--- a/mon-pix/app/components/challenge/item.js
+++ b/mon-pix/app/components/challenge/item.js
@@ -44,7 +44,6 @@ export default class Item extends Component {
 
   _setFocusOutEventListener() {
     document.addEventListener(FOCUSEDOUT_EVENT_NAME, this._focusedoutListener);
-
     this._hadFocus = document.hasFocus();
     this._pollHasFocusInterval = setInterval(this._pollHasFocus, FOCUSEDOUT_INTERVAL);
   }
@@ -132,4 +131,9 @@ export default class Item extends Component {
   resumeAssessment(assessment) {
     this.router.transitionTo('assessments.resume', assessment.get('id'));
   }
+
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.clearFocusOutEventListener();
+  }
 }
diff --git a/mon-pix/app/components/form-textfield-date.hbs b/mon-pix/app/components/form-textfield-date.hbs
index 17502aae81c..7963fca9d53 100644
--- a/mon-pix/app/components/form-textfield-date.hbs
+++ b/mon-pix/app/components/form-textfield-date.hbs
@@ -1,124 +1,61 @@
 {{! template-lint-disable require-input-label no-unknown-arguments-for-builtin-components no-bare-strings }}
 <div class="form-textfield">
   <label class="form-textfield__label">
-    {{#if @require}}<abbr title="{{t 'common.form.mandatory'}}" class="mandatory-mark">*</abbr> {{/if}}
     {{@label}}
+    {{#if @require}}<abbr title="{{t 'common.form.mandatory'}}" class="mandatory-mark">*</abbr> {{/if}}
     <br />
   </label>
 
   <div class="form-textfield__date">
-    <div
-      class="form-textfield__input-field-container
-        {{if @disabled 'form-textfield__input-container--disabled' this.dayInputContainerStatusClass}}"
-    >
-      <Input
-        min="1"
-        max="31"
-        id={{@dayTextfieldName}}
-        @type="number"
-        @value={{@dayInputBindingValue}}
-        name={{@dayTextfieldName}}
-        {{on "focusout" (fn @onValidateDay @dayTextfieldName @dayInputBindingValue)}}
-        class="form-textfield__input {{this.dayInputValidationStatus}}"
-        aria-describedby={{@aria-describedby}}
-        required={{@require}}
-        disabled={{@disabled}}
-        aria-label={{t "pages.login-or-register.register-form.fields.birthdate.day.label"}}
-        placeholder={{t "pages.login-or-register.register-form.fields.birthdate.day.placeholder"}}
-      />
-      <div class="form-textfield__icon">
-        {{#if this.dayHasIcon}}
-          {{#if (eq @dayValidationStatus "error")}}
-            <img
-              src="/images/icons/icon-error.svg"
-              class="form-textfield-icon__state form-textfield-icon__state--error"
-              alt={{t "common.form.error"}}
-            />
-          {{else}}
-            <img
-              src="/images/icons/icon-success.svg"
-              class="form-textfield-icon__state form-textfield-icon__state--success"
-              alt={{t "common.form.success"}}
-            />
-          {{/if}}
-        {{/if}}
-      </div>
-    </div>
+    <PixInput
+      min="1"
+      max="31"
+      id={{@dayTextfieldName}}
+      type="number"
+      @value={{@dayValue}}
+      name={{@dayTextfieldName}}
+      {{on "focusout" (fn @onValidateDay @dayTextfieldName @dayValue)}}
+      {{on "input" @onDayInput}}
+      aria-describedby={{@aria-describedby}}
+      @validationStatus={{@dayValidationStatus}}
+      required={{@require}}
+      disabled={{@disabled}}
+      aria-label={{t "pages.login-or-register.register-form.fields.birthdate.day.label"}}
+      placeholder={{t "pages.login-or-register.register-form.fields.birthdate.day.placeholder"}}
+    />
 
-    <div
-      class="form-textfield__input-field-container
-        {{if @disabled 'form-textfield__input-container--disabled' this.monthInputContainerStatusClass}}"
-    >
-      <Input
-        min="1"
-        max="12"
-        id={{@monthTextfieldName}}
-        @type="number"
-        @value={{@monthInputBindingValue}}
-        name={{@monthTextfieldName}}
-        {{on "focusout" (fn @onValidateMonth @monthTextfieldName @monthInputBindingValue)}}
-        class="form-textfield__input {{this.monthInputValidationStatus}}"
-        aria-describedby={{@aria-describedby}}
-        required={{@require}}
-        disabled={{@disabled}}
-        aria-label={{t "pages.login-or-register.register-form.fields.birthdate.month.label"}}
-        placeholder={{t "pages.login-or-register.register-form.fields.birthdate.month.placeholder"}}
-      />
-      <div class="form-textfield__icon">
-        {{#if this.monthHasIcon}}
-          {{#if (eq @monthValidationStatus "error")}}
-            <img
-              src="/images/icons/icon-error.svg"
-              class="form-textfield-icon__state form-textfield-icon__state--error"
-              alt={{t "common.form.error"}}
-            />
-          {{else}}
-            <img
-              src="/images/icons/icon-success.svg"
-              class="form-textfield-icon__state form-textfield-icon__state--success"
-              alt={{t "common.form.success"}}
-            />
-          {{/if}}
-        {{/if}}
-      </div>
-    </div>
+    <PixInput
+      min="1"
+      max="12"
+      id={{@monthTextfieldName}}
+      type="number"
+      @value={{@monthValue}}
+      name={{@monthTextfieldName}}
+      {{on "focusout" (fn @onValidateMonth @monthTextfieldName @monthValue)}}
+      {{on "input" @onMonthInput}}
+      aria-describedby={{@aria-describedby}}
+      @validationStatus={{@monthValidationStatus}}
+      required={{@require}}
+      disabled={{@disabled}}
+      aria-label={{t "pages.login-or-register.register-form.fields.birthdate.month.label"}}
+      placeholder={{t "pages.login-or-register.register-form.fields.birthdate.month.placeholder"}}
+    />
 
-    <div
-      class="form-textfield__input-field-container
-        {{if @disabled 'form-textfield__input-container--disabled' this.yearInputContainerStatusClass}}"
-    >
-      <Input
-        min="1900"
-        id={{@yearTextfieldName}}
-        @type="number"
-        @value={{@yearInputBindingValue}}
-        name={{@yearTextfieldName}}
-        {{on "focusout" (fn @onValidateYear @yearTextfieldName @yearInputBindingValue)}}
-        class="form-textfield__input {{this.yearInputValidationStatus}}"
-        aria-describedby={{@aria-describedby}}
-        required={{@require}}
-        disabled={{@disabled}}
-        aria-label={{t "pages.login-or-register.register-form.fields.birthdate.year.label"}}
-        placeholder={{t "pages.login-or-register.register-form.fields.birthdate.year.placeholder"}}
-      />
-      <div class="form-textfield__icon">
-        {{#if this.yearHasIcon}}
-          {{#if (eq @yearValidationStatus "error")}}
-            <img
-              src="/images/icons/icon-error.svg"
-              class="form-textfield-icon__state form-textfield-icon__state--error"
-              alt={{t "common.form.error"}}
-            />
-          {{else}}
-            <img
-              src="/images/icons/icon-success.svg"
-              class="form-textfield-icon__state form-textfield-icon__state--success"
-              alt={{t "common.form.success"}}
-            />
-          {{/if}}
-        {{/if}}
-      </div>
-    </div>
+    <PixInput
+      min="1900"
+      id={{@yearTextfieldName}}
+      type="number"
+      @value={{@yearValue}}
+      name={{@yearTextfieldName}}
+      {{on "focusout" (fn @onValidateYear @yearTextfieldName @yearValue)}}
+      {{on "input" @onYearInput}}
+      @validationStatus={{@yearValidationStatus}}
+      aria-describedby={{@aria-describedby}}
+      required={{@require}}
+      disabled={{@disabled}}
+      aria-label={{t "pages.login-or-register.register-form.fields.birthdate.year.label"}}
+      placeholder={{t "pages.login-or-register.register-form.fields.birthdate.year.placeholder"}}
+    />
   </div>
 
   {{#if @dayValidationMessage}}
diff --git a/mon-pix/app/components/form-textfield.hbs b/mon-pix/app/components/form-textfield.hbs
deleted file mode 100644
index 34e9dfdf44b..00000000000
--- a/mon-pix/app/components/form-textfield.hbs
+++ /dev/null
@@ -1,77 +0,0 @@
-{{! DEPRECATED COMPONENT: DON’T USE IT! USE COMPONENTS OF THE DESIGN SYSTEM INSTEAD!! }}
-
-{{! template-lint-disable require-input-label no-unknown-arguments-for-builtin-components }}
-<div class="form-textfield">
-  <label for="{{@textfieldName}}" class="form-textfield__label">
-    {{#unless @hideRequired}}{{#if @require}}<abbr title="{{t 'common.form.mandatory'}}" class="mandatory-mark">*</abbr>
-      {{/if}}{{/unless}}
-    {{@label}}
-    <br /><span class="form-textfield__help">{{@help}}</span>
-  </label>
-
-  <div
-    class="form-textfield__input-field-container
-      {{if @disabled 'form-textfield__input-container--disabled' this.inputContainerStatusClass}}
-      {{if this.isPassword 'form-textfield__input-container--password'}}"
-  >
-    <Input
-      id={{@textfieldName}}
-      @type={{this.textfieldType}}
-      @value={{@inputBindingValue}}
-      name={{@textfieldName}}
-      {{on "focusout" (fn this.onValidate @textfieldName @inputBindingValue)}}
-      class="form-textfield__input {{this.inputValidationStatus}}"
-      autocomplete={{@autocomplete}}
-      aria-describedby="{{@aria-describedby}} validationMessage-{{@textfieldName}}"
-      required={{@require}}
-      disabled={{@disabled}}
-      placeholder={{@placeholder}}
-    />
-    <div class="form-textfield__icon">
-      {{#if this.isPassword}}
-        {{#if this.isPasswordVisible}}
-          <button
-            type="button"
-            aria-label={{t "common.form.invisible-password"}}
-            class="form-textfield-icon__button"
-            {{on "click" this.togglePasswordVisibility}}
-          >
-            <PixIcon @name="eye" @plainIcon={{true}} @ariaHidden={{true}} class="form-textfield-icon-button__eye" />
-          </button>
-        {{else}}
-          <button
-            type="button"
-            aria-label={{t "common.form.visible-password"}}
-            class="form-textfield-icon__button"
-            {{on "click" this.togglePasswordVisibility}}
-          >
-            <PixIcon @name="eyeOff" @plainIcon={{true}} @ariaHidden={{true}} class="form-textfield-icon-button__eye" />
-          </button>
-        {{/if}}
-      {{/if}}
-
-      {{#if this.hasIcon}}
-        {{#if (eq @validationStatus "error")}}
-          <img
-            src="/images/icons/icon-error.svg"
-            class="form-textfield-icon__state form-textfield-icon__state--error"
-            alt={{t "common.form.error"}}
-          />
-        {{else}}
-          <img
-            src="/images/icons/icon-success.svg"
-            class="form-textfield-icon__state form-textfield-icon__state--success"
-            alt={{t "common.form.success"}}
-          />
-        {{/if}}
-      {{/if}}
-    </div>
-  </div>
-
-  <div
-    id="validationMessage-{{@textfieldName}}"
-    class="form-textfield__message {{this.validationMessageClass}} form-textfield__message-{{this.textfieldType}}"
-    aria-live="polite"
-    role="alert"
-  >{{#if this.displayMessage}}{{@validationMessage}}{{/if}}</div>
-</div>
\ No newline at end of file
diff --git a/mon-pix/app/components/form-textfield.js b/mon-pix/app/components/form-textfield.js
deleted file mode 100644
index ed66e0eda99..00000000000
--- a/mon-pix/app/components/form-textfield.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// DEPRECATED COMPONENT: DON’T USE IT! USE COMPONENTS OF THE DESIGN SYSTEM INSTEAD!
-
-import { action } from '@ember/object';
-import { isEmpty } from '@ember/utils';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-
-const INPUT_VALIDATION_STATUS_MAP = {
-  default: 'form-textfield__input--default',
-  error: 'form-textfield__input--error',
-  success: 'form-textfield__input--success',
-};
-
-const ICON_TYPE_STATUS_MAP = {
-  default: '',
-  error: 'error',
-  success: 'success',
-};
-
-const MESSAGE_VALIDATION_STATUS_MAP = {
-  default: 'form-textfield__message--default',
-  error: 'form-textfield__message--error',
-  success: 'form-textfield__message--success',
-};
-
-const INPUT_CONTAINER_VALIDATION_STATUS_MAP = {
-  default: 'form-textfield__input-container--default',
-  error: 'form-textfield__input-container--error',
-  success: 'form-textfield__input-container--success',
-};
-
-export default class FormTextfield extends Component {
-  @tracked isPasswordVisible = false;
-
-  onValidate;
-
-  constructor() {
-    super(...arguments);
-    this.onValidate = this.args.onValidate || (() => {});
-  }
-
-  get isPassword() {
-    return this.args.textfieldName === 'password';
-  }
-
-  get isEmail() {
-    return this.args.textfieldName === 'email';
-  }
-
-  get textfieldType() {
-    switch (this.args.textfieldName) {
-      case 'password':
-        return this.isPasswordVisible ? 'text' : 'password';
-      case 'email':
-        return 'email';
-      default:
-        return 'text';
-    }
-  }
-
-  get hasIcon() {
-    return this._isValidationStatusNotDefault() && !this.args.disabled;
-  }
-
-  _isValidationStatusNotDefault() {
-    return this.args.validationStatus !== 'default';
-  }
-
-  get displayMessage() {
-    return !isEmpty(this.args.validationMessage) || this.hasIcon;
-  }
-
-  get inputContainerStatusClass() {
-    return INPUT_CONTAINER_VALIDATION_STATUS_MAP[this.args.validationStatus] || null;
-  }
-
-  get iconType() {
-    return ICON_TYPE_STATUS_MAP[this.args.validationStatus] || '';
-  }
-
-  get inputValidationStatus() {
-    return INPUT_VALIDATION_STATUS_MAP[this.args.validationStatus] || '';
-  }
-
-  get validationMessageClass() {
-    return MESSAGE_VALIDATION_STATUS_MAP[this.args.validationStatus] || '';
-  }
-
-  @action
-  togglePasswordVisibility() {
-    this.isPasswordVisible = !this.isPasswordVisible;
-    const InputElement = document.getElementById('password');
-    if (InputElement) {
-      InputElement.focus();
-    }
-  }
-}
diff --git a/mon-pix/app/components/levelup-notif.hbs b/mon-pix/app/components/levelup-notif.hbs
index 9ccd881d698..94503d2b701 100644
--- a/mon-pix/app/components/levelup-notif.hbs
+++ b/mon-pix/app/components/levelup-notif.hbs
@@ -1,4 +1,4 @@
-<div {{did-update this.resetLevelUp}}>
+<div {{modifier-did-insert this.resetLevelUp @level @competenceName}}>
   {{#unless this.closeLevelup}}
     <div class="levelup">
       <img src="/images/levelup.svg" alt="" />
diff --git a/mon-pix/app/components/levelup-notif.js b/mon-pix/app/components/levelup-notif.js
index 8f7e9fa2013..d61d82a8157 100644
--- a/mon-pix/app/components/levelup-notif.js
+++ b/mon-pix/app/components/levelup-notif.js
@@ -5,9 +5,9 @@ import { tracked } from '@glimmer/tracking';
 export default class LevelupNotif extends Component {
   @tracked closeLevelup = false;
 
-  resetLevelUp() {
+  resetLevelUp = () => {
     this.closeLevelup = false;
-  }
+  };
 
   @action
   close() {
diff --git a/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.hbs b/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.hbs
index 72794895f6a..2cfdb5e0296 100644
--- a/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.hbs
+++ b/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.hbs
@@ -1,103 +1,114 @@
-<div class="join-restricted-campaign__title">{{t "pages.join.sup.title" organizationName=@organizationName}}</div>
-<div class="join-restricted-campaign__subtitle">{{t "pages.join.sup.message" organizationName=@organizationName}}</div>
-<form>
-  <div class="join-restricted-campaign__row">
-    <label for="studentNumber" class="join-restricted-campaign__label">
-      {{t "pages.join.sup.fields.student-number.label"}}
-    </label>
-    <Input
-      id="studentNumber"
-      @type="text"
-      @value={{this.studentNumber}}
-      placeholder={{t "pages.join.sup.fields.student-number.label"}}
-      class={{if this.errors.studentNumber "input--error"}}
-      {{on "focusout" (fn this.triggerInputStringValidation "studentNumber" this.studentNumber)}}
-    />
-    {{#if this.errors.studentNumber}}
-      <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.studentNumber}}</div>
-    {{/if}}
-  </div>
-
-  <div class="join-restricted-campaign__row">
-    <label for="firstName" class="join-restricted-campaign__label">
-      {{t "pages.join.fields.firstname.label"}}
-    </label>
-    <Input
-      id="firstName"
-      @type="text"
-      @value={{this.firstName}}
-      placeholder={{t "pages.join.fields.firstname.label"}}
-      class={{if this.errors.firstName "input--error"}}
-      {{on "focusout" (fn this.triggerInputStringValidation "firstName" this.firstName)}}
-    />
-    {{#if this.errors.firstName}}
-      <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.firstName}}</div>
-    {{/if}}
-  </div>
-
-  <div class="join-restricted-campaign__row">
-    <label for="lastName" class="join-restricted-campaign__label">
-      {{t "pages.join.fields.lastname.label"}}
-    </label>
-    <Input
-      id="lastName"
-      @type="text"
-      @value={{this.lastName}}
-      placeholder={{t "pages.join.fields.lastname.label"}}
-      class={{if this.errors.lastName "input--error"}}
-      {{on "focusout" (fn this.triggerInputStringValidation "lastName" this.lastName)}}
-    />
-    {{#if this.errors.lastName}}
-      <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.lastName}}</div>
-    {{/if}}
-  </div>
-
-  <div class="join-restricted-campaign__row">
-    <label class="join-restricted-campaign__label">
-      {{t "pages.join.fields.birthdate.label"}}
-    </label>
-    <div class="join-restricted-campaign__birthdate">
-      <Input
-        @type="text"
-        @value={{this.dayOfBirth}}
-        placeholder={{t "pages.join.fields.birthdate.day-format"}}
-        aria-label={{t "pages.join.fields.birthdate.day-label"}}
-        class={{if this.errors.dayOfBirth "input--error"}}
-        {{on "focusout" (fn this.triggerInputDayValidation "dayOfBirth" this.dayOfBirth)}}
+<PixBlock>
+  <div class="join-restricted-campaign__title">{{t "pages.join.sup.title" organizationName=@organizationName}}</div>
+  <div class="join-restricted-campaign__subtitle">{{t
+      "pages.join.sup.message"
+      organizationName=@organizationName
+    }}</div>
+  <form>
+    <div class="join-restricted-campaign__row">
+      <label for="studentNumber" class="join-restricted-campaign__label">
+        {{t "pages.join.sup.fields.student-number.label"}}
+      </label>
+      <PixInput
+        id="studentNumber"
+        type="text"
+        @value={{this.studentNumber}}
+        placeholder={{t "pages.join.sup.fields.student-number.label"}}
+        class={{if this.errors.studentNumber "input--error"}}
+        {{on "focusout" (fn this.triggerInputStringValidation "studentNumber" this.studentNumber)}}
+        {{on "input" this.handleStudentNumberInput}}
       />
-      <Input
-        @type="text"
-        @value={{this.monthOfBirth}}
-        placeholder={{t "pages.join.fields.birthdate.month-format"}}
-        aria-label={{t "pages.join.fields.birthdate.month-label"}}
-        class={{if this.errors.monthOfBirth "input--error"}}
-        {{on "focusout" (fn this.triggerInputMonthValidation "monthOfBirth" this.monthOfBirth)}}
+      {{#if this.errors.studentNumber}}
+        <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.studentNumber}}</div>
+      {{/if}}
+    </div>
+
+    <div class="join-restricted-campaign__row">
+      <label for="firstName" class="join-restricted-campaign__label">
+        {{t "pages.join.fields.firstname.label"}}
+      </label>
+      <PixInput
+        id="firstName"
+        type="text"
+        @value={{this.firstName}}
+        placeholder={{t "pages.join.fields.firstname.label"}}
+        class={{if this.errors.firstName "input--error"}}
+        {{on "focusout" (fn this.triggerInputStringValidation "firstName" this.firstName)}}
+        {{on "input" this.handleFirstNameInput}}
       />
-      <Input
-        @type="text"
-        @value={{this.yearOfBirth}}
-        placeholder={{t "pages.join.fields.birthdate.year-format"}}
-        aria-label={{t "pages.join.fields.birthdate.year-label"}}
-        class={{if this.errors.yearOfBirth "input--error"}}
-        {{on "focusout" (fn this.triggerInputYearValidation "yearOfBirth" this.yearOfBirth)}}
+      {{#if this.errors.firstName}}
+        <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.firstName}}</div>
+      {{/if}}
+    </div>
+
+    <div class="join-restricted-campaign__row">
+      <label for="lastName" class="join-restricted-campaign__label">
+        {{t "pages.join.fields.lastname.label"}}
+      </label>
+      <PixInput
+        id="lastName"
+        type="text"
+        @value={{this.lastName}}
+        placeholder={{t "pages.join.fields.lastname.label"}}
+        class={{if this.errors.lastName "input--error"}}
+        {{on "focusout" (fn this.triggerInputStringValidation "lastName" this.lastName)}}
+        {{on "input" this.handleLastNameInput}}
       />
+      {{#if this.errors.lastName}}
+        <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.lastName}}</div>
+      {{/if}}
+    </div>
+
+    <div class="join-restricted-campaign__row">
+      <label class="join-restricted-campaign__label">
+        {{t "pages.join.fields.birthdate.label"}}
+      </label>
+      <div class="join-restricted-campaign__birthdate">
+        <PixInput
+          type="text"
+          @value={{this.dayOfBirth}}
+          placeholder={{t "pages.join.fields.birthdate.day-format"}}
+          aria-label={{t "pages.join.fields.birthdate.day-label"}}
+          class={{if this.errors.dayOfBirth "input--error"}}
+          {{on "focusout" (fn this.triggerInputDayValidation "dayOfBirth" this.dayOfBirth)}}
+          {{on "input" this.handleDayOfBirthInput}}
+        />
+        <PixInput
+          type="text"
+          @value={{this.monthOfBirth}}
+          placeholder={{t "pages.join.fields.birthdate.month-format"}}
+          aria-label={{t "pages.join.fields.birthdate.month-label"}}
+          class={{if this.errors.monthOfBirth "input--error"}}
+          {{on "focusout" (fn this.triggerInputMonthValidation "monthOfBirth" this.monthOfBirth)}}
+          {{on "input" this.handleMonthOfBirthInput}}
+        />
+        <PixInput
+          type="text"
+          @value={{this.yearOfBirth}}
+          placeholder={{t "pages.join.fields.birthdate.year-format"}}
+          aria-label={{t "pages.join.fields.birthdate.year-label"}}
+          class={{if this.errors.yearOfBirth "input--error"}}
+          {{on "focusout" (fn this.triggerInputYearValidation "yearOfBirth" this.yearOfBirth)}}
+          {{on "input" this.handleYearOfBirthInput}}
+        />
+      </div>
+      {{#if this.errors.dayOfBirth}}
+        <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.dayOfBirth}}</div>
+      {{/if}}
+      {{#if this.errors.monthOfBirth}}
+        <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.monthOfBirth}}</div>
+      {{/if}}
+      {{#if this.errors.yearOfBirth}}
+        <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.yearOfBirth}}</div>
+      {{/if}}
     </div>
-    {{#if this.errors.dayOfBirth}}
-      <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.dayOfBirth}}</div>
-    {{/if}}
-    {{#if this.errors.monthOfBirth}}
-      <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.monthOfBirth}}</div>
-    {{/if}}
-    {{#if this.errors.yearOfBirth}}
-      <div class="join-restricted-campaign__field-error" role="alert">{{this.errors.yearOfBirth}}</div>
-    {{/if}}
-  </div>
 
-  {{#if this.errors.global}}
-    <div class="join-restricted-campaign__error" aria-live="polite">{{this.errors.global}}</div>
-  {{/if}}
+    {{#if this.errors.global}}
+      <div class="join-restricted-campaign__error" aria-live="polite">{{this.errors.global}}</div>
+    {{/if}}
 
-  <PixButton @type="submit" @triggerAction={{this.submit}} class="join-restricted-campaign__button">
-    {{t "pages.join.button"}}
-  </PixButton>
-</form>
\ No newline at end of file
+    <PixButton @type="submit" @triggerAction={{this.submit}} class="join-restricted-campaign__button">
+      {{t "pages.join.button"}}
+    </PixButton>
+  </form>
+</PixBlock>
\ No newline at end of file
diff --git a/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.js b/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.js
index 2ed3c8228ff..375793865c6 100644
--- a/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.js
+++ b/mon-pix/app/components/routes/campaigns/invited/associate-sup-student-form.js
@@ -95,6 +95,36 @@ export default class AssociateSupStudentForm extends Component {
     this._validateInputYear(key, value);
   }
 
+  @action
+  handleStudentNumberInput(event) {
+    this.studentNumber = event.target.value;
+  }
+
+  @action
+  handleFirstNameInput(event) {
+    this.firstName = event.target.value;
+  }
+
+  @action
+  handleLastNameInput(event) {
+    this.lastName = event.target.value;
+  }
+
+  @action
+  handleDayOfBirthInput(event) {
+    this.dayOfBirth = event.target.value;
+  }
+
+  @action
+  handleMonthOfBirthInput(event) {
+    this.monthOfBirth = event.target.value;
+  }
+
+  @action
+  handleYearOfBirthInput(event) {
+    this.yearOfBirth = event.target.value;
+  }
+
   @action
   async submit(event) {
     event.preventDefault();
diff --git a/mon-pix/app/components/routes/campaigns/invited/fill-in-participant-external-id.gjs b/mon-pix/app/components/routes/campaigns/invited/fill-in-participant-external-id.gjs
index b5e78abf0de..76403583e0e 100644
--- a/mon-pix/app/components/routes/campaigns/invited/fill-in-participant-external-id.gjs
+++ b/mon-pix/app/components/routes/campaigns/invited/fill-in-participant-external-id.gjs
@@ -88,7 +88,6 @@ export default class FillInParticipantExternalId extends Component {
   }
 
   <template>
-    {{! template-lint-disable no-action require-input-label no-unknown-arguments-for-builtin-components }}
     <main role="main">
       <PixBackgroundHeader>
         <PixBlock class="fill-in-participant-external-id">
diff --git a/mon-pix/app/components/routes/campaigns/sco-form.hbs b/mon-pix/app/components/routes/campaigns/sco-form.hbs
index 8d160a64eca..e1a26896e52 100644
--- a/mon-pix/app/components/routes/campaigns/sco-form.hbs
+++ b/mon-pix/app/components/routes/campaigns/sco-form.hbs
@@ -5,70 +5,73 @@
   }}</h1>
 <div class="join-restricted-campaign__subtitle">{{t "pages.join.sco.subtitle"}}</div>
 <form onSubmit={{this.validateForm}}>
-  <div class="join-restricted-campaign__row">
-    <label for="firstName" class="join-restricted-campaign__label">{{t "pages.join.fields.firstname.label"}}</label>
-    <Input
-      id="firstName"
-      @type="text"
-      @value={{this.firstName}}
-      placeholder={{t "pages.join.fields.firstname.label"}}
-      readonly={{@areNamesDisabled}}
-      disabled={{@areNamesDisabled}}
-      class={{if this.validation.firstName "input--error"}}
-      {{on "focusout" (fn this.triggerInputStringValidation "firstName" this.firstName)}}
-    />
-    <div class={{if this.validation.firstName "join-restricted-campaign__field-error"}} role="alert">
-      {{this.validation.firstName}}
-    </div>
-  </div>
+  <PixInput
+    @id="firstName"
+    type="text"
+    @value={{this.firstName}}
+    placeholder={{t "pages.join.fields.firstname.label"}}
+    readonly={{@areNamesDisabled}}
+    @validationStatus={{if this.validation.firstName "error" "default"}}
+    @errorMessage={{this.validation.firstName}}
+    {{on "focusout" (fn this.triggerInputStringValidation "firstName" this.firstName)}}
+    {{on "input" this.handleFirstNameInput}}
+  >
+    <:label>{{t "pages.join.fields.firstname.label"}}</:label>
+  </PixInput>
 
-  <div class="join-restricted-campaign__row">
-    <label for="lastName" class="join-restricted-campaign__label">{{t "pages.join.fields.lastname.label"}}</label>
-    <Input
-      id="lastName"
-      @type="text"
-      @value={{this.lastName}}
-      placeholder={{t "pages.join.fields.lastname.label"}}
-      readonly={{@areNamesDisabled}}
-      disabled={{@areNamesDisabled}}
-      class={{if this.validation.lastName "input--error"}}
-      {{on "focusout" (fn this.triggerInputStringValidation "lastName" this.lastName)}}
-    />
-    <div class={{if this.validation.lastName "join-restricted-campaign__field-error"}} role="alert">
-      {{this.validation.lastName}}
-    </div>
-  </div>
+  <PixInput
+    @id="lastName"
+    type="text"
+    @value={{this.lastName}}
+    placeholder={{t "pages.join.fields.lastname.label"}}
+    readonly={{@areNamesDisabled}}
+    @validationStatus={{if this.validation.lastName "error" "default"}}
+    @errorMessage={{this.validation.lastName}}
+    {{on "focusout" (fn this.triggerInputStringValidation "lastName" this.lastName)}}
+    {{on "input" this.handleLastNameInput}}
+  >
+    <:label>{{t "pages.join.fields.lastname.label"}}</:label>
+  </PixInput>
 
-  <div class="join-restricted-campaign__row">
+  <div>
     <p class="join-restricted-campaign__label">{{t "pages.join.fields.birthdate.label"}}</p>
     <div class="join-restricted-campaign__birthdate">
-      <Input
-        id="dayOfBirth"
-        @type="text"
-        @value={{this.dayOfBirth}}
+      <PixInput
+        @id="dayOfBirth"
+        type="text"
         placeholder={{t "pages.join.fields.birthdate.day-format"}}
-        class={{if this.validation.dayOfBirth "input--error"}}
-        aria-label={{t "pages.join.fields.birthdate.day-label"}}
+        @value={{this.dayOfBirth}}
+        @validationStatus={{if this.validation.dayOfBirth "error" "default"}}
+        @screenReaderOnly={{true}}
         {{on "focusout" (fn this.triggerInputDayValidation "dayOfBirth" this.dayOfBirth)}}
-      />
-      <Input
-        id="monthOfBirth"
-        @type="text"
-        @value={{this.monthOfBirth}}
+        {{on "input" this.handleDayOfBirthInput}}
+      >
+        <:label>{{t "pages.join.fields.birthdate.day-label"}}</:label>
+      </PixInput>
+      <PixInput
+        @id="monthOfBirth"
+        type="text"
         placeholder={{t "pages.join.fields.birthdate.month-format"}}
-        class={{if this.validation.monthOfBirth "input--error"}}
+        @value={{this.monthOfBirth}}
+        @validationStatus={{if this.validation.monthOfBirth "error" "default"}}
+        @screenReaderOnly={{true}}
         {{on "focusout" (fn this.triggerInputMonthValidation "monthOfBirth" this.monthOfBirth)}}
-        aria-label={{t "pages.join.fields.birthdate.month-label"}}
-      />
-      <Input
-        id="yearOfBirth"
-        @type="text"
-        @value={{this.yearOfBirth}}
+        {{on "input" this.handleMonthOfBirthInput}}
+      >
+        <:label>{{t "pages.join.fields.birthdate.month-label"}}</:label>
+      </PixInput>
+      <PixInput
+        @id="yearOfBirth"
+        type="text"
         placeholder={{t "pages.join.fields.birthdate.year-format"}}
-        class={{if this.validation.yearOfBirth "input--error"}}
+        @value={{this.yearOfBirth}}
+        @validationStatus={{if this.validation.yearOfBirth "error" "default"}}
+        @screenReaderOnly={{true}}
         {{on "focusout" (fn this.triggerInputYearValidation "yearOfBirth" this.yearOfBirth)}}
-        aria-label={{t "pages.join.fields.birthdate.year-label"}}
-      />
+        {{on "input" this.handleYearOfBirthInput}}
+      >
+        <:label>{{t "pages.join.fields.birthdate.year-label"}}</:label>
+      </PixInput>
     </div>
     <div class={{if this.validation.dayOfBirth "join-restricted-campaign__field-error"}} role="alert">
       {{this.validation.dayOfBirth}}
diff --git a/mon-pix/app/components/routes/campaigns/sco-form.js b/mon-pix/app/components/routes/campaigns/sco-form.js
index deea4931f49..a8764df3f49 100644
--- a/mon-pix/app/components/routes/campaigns/sco-form.js
+++ b/mon-pix/app/components/routes/campaigns/sco-form.js
@@ -103,6 +103,27 @@ export default class ScoForm extends Component {
     this._validateInputYear(key, value);
   }
 
+  @action
+  handleFirstNameInput(event) {
+    this.firstName = event.target.value;
+  }
+  @action
+  handleLastNameInput(event) {
+    this.lastName = event.target.value;
+  }
+  @action
+  handleDayOfBirthInput(event) {
+    this.dayOfBirth = event.target.value;
+  }
+  @action
+  handleMonthOfBirthInput(event) {
+    this.monthOfBirth = event.target.value;
+  }
+  @action
+  handleYearOfBirthInput(event) {
+    this.yearOfBirth = event.target.value;
+  }
+
   _validateForm() {
     this._validateInputName('firstName', this.firstName);
     this._validateInputName('lastName', this.lastName);
diff --git a/mon-pix/app/components/routes/login-form.hbs b/mon-pix/app/components/routes/login-form.hbs
index a50a24f3fe7..aba8ff50c5d 100644
--- a/mon-pix/app/components/routes/login-form.hbs
+++ b/mon-pix/app/components/routes/login-form.hbs
@@ -1,59 +1,50 @@
-{{! template-lint-disable no-unknown-arguments-for-builtin-components }}
+<form {{on "submit" this.authenticate}} class="login-form">
+  <PixInput
+    @id="login"
+    @value={{this.login}}
+    {{on "input" this.handleLoginInput}}
+    @requiredLabel={{true}}
+    type="text"
+    autocomplete="username"
+  >
+    <:label>{{t "pages.login-or-register.login-form.fields.login.label"}}</:label>
+  </PixInput>
+
+  <PixInputPassword
+    @id="password"
+    @value={{this.password}}
+    {{on "input" this.handlePasswordInput}}
+    autocomplete="current-password"
+    @requiredLabel={{true}}
+  >
+    <:label>{{t "pages.login-or-register.login-form.fields.password.label"}}</:label>
+  </PixInputPassword>
+
+  <PixButton id="submit-connexion" @type="submit" @isLoading={{this.isLoading}}>
+    {{t "pages.login-or-register.login-form.button"}}
+  </PixButton>
 
-<div class="login-form">
   {{#if this.errorMessage}}
     <div id="update-form-error-message" class="login-form__error-message error-message">{{this.errorMessage}}</div>
   {{/if}}
+</form>
 
-  <form {{on "submit" this.authenticate}}>
-
-    <div id="login-email-container">
-      <FormTextfield
-        @label={{t "pages.login-or-register.login-form.fields.login.label"}}
-        @textfieldName="login"
-        @validationStatus="default"
-        @inputBindingValue={{this.login}}
-        @autocomplete="username"
-        @aria-describedby="login-error-message update-form-error-message"
-      />
-    </div>
-
-    <div id="login-password-container">
-      <FormTextfield
-        @label={{t "pages.login-or-register.login-form.fields.password.label"}}
-        @textfieldName="password"
-        @validationStatus="default"
-        @inputBindingValue={{this.password}}
-        @autocomplete="current-password"
-        @aria-describedby="login-error-message update-form-error-message"
-      />
-    </div>
-
-    <div class="login-button-container pix-form__actions">
-      <PixButton id="submit-connexion" @type="submit" @isLoading={{this.isLoading}}>
-        {{t "pages.login-or-register.login-form.button"}}
-      </PixButton>
-    </div>
-
-  </form>
-
-  <div class="login-form__forgotten-password">
-    <span>{{t "pages.login-or-register.login-form.forgotten-password.instruction"}}</span>
-    <ul>
-      <li>{{t "pages.login-or-register.login-form.forgotten-password.email"}}
-        <LinkTo
-          id="link_password-reset-demand"
-          @route="password-reset-demand"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="link"
-        >
-          {{t "pages.login-or-register.login-form.forgotten-password.reset-link"}}
-        </LinkTo>
-      </li>
-      <li>
-        {{t "pages.login-or-register.login-form.forgotten-password.other-identity"}}
-      </li>
-    </ul>
-  </div>
+<div class="login-form__forgotten-password">
+  <span>{{t "pages.login-or-register.login-form.forgotten-password.instruction"}}</span>
+  <ul>
+    <li>{{t "pages.login-or-register.login-form.forgotten-password.email"}}
+      <LinkTo
+        id="link_password-reset-demand"
+        @route="password-reset-demand"
+        target="_blank"
+        rel="noopener noreferrer"
+        class="link"
+      >
+        {{t "pages.login-or-register.login-form.forgotten-password.reset-link"}}
+      </LinkTo>
+    </li>
+    <li>
+      {{t "pages.login-or-register.login-form.forgotten-password.other-identity"}}
+    </li>
+  </ul>
 </div>
\ No newline at end of file
diff --git a/mon-pix/app/components/routes/login-form.js b/mon-pix/app/components/routes/login-form.js
index cb44f294ece..83e266e67a5 100644
--- a/mon-pix/app/components/routes/login-form.js
+++ b/mon-pix/app/components/routes/login-form.js
@@ -20,6 +20,16 @@ export default class LoginForm extends Component {
   externalUserToken;
   expectedUserId;
 
+  @action
+  handleLoginInput(event) {
+    this.login = event.target.value;
+  }
+
+  @action
+  handlePasswordInput(event) {
+    this.password = event.target.value;
+  }
+
   @action
   async authenticate(event) {
     event && event.preventDefault();
diff --git a/mon-pix/app/components/routes/login-or-register.hbs b/mon-pix/app/components/routes/login-or-register.hbs
index b68350eea91..88096ab5485 100644
--- a/mon-pix/app/components/routes/login-or-register.hbs
+++ b/mon-pix/app/components/routes/login-or-register.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-action }}
 <div class="login-or-register">
   <div class="panel login-or-register__panel">
     <div>
diff --git a/mon-pix/app/components/routes/register-form.hbs b/mon-pix/app/components/routes/register-form.hbs
index ec21ea17b16..cd0a13d093b 100644
--- a/mon-pix/app/components/routes/register-form.hbs
+++ b/mon-pix/app/components/routes/register-form.hbs
@@ -1,160 +1,159 @@
 {{! template-lint-disable no-triple-curlies }}
-<div class="register-form">
-  <form {{on "submit" this.searchForMatchingStudent}}>
-    <span class="register-form__required-inputs">{{t "common.form.mandatory-fields" htmlSafe=true}}</span>
+<form {{on "submit" this.searchForMatchingStudent}} class="register-form">
+  <span class="register-form__required-inputs">{{t "common.form.mandatory-fields" htmlSafe=true}}</span>
 
-    <div id="register-firstName-container">
-      <FormTextfield
-        @label={{t "pages.login-or-register.register-form.fields.firstname.label"}}
-        @textfieldName="firstName"
-        @inputBindingValue={{this.firstName}}
-        @onValidate={{this.triggerInputStringValidation}}
-        @validationStatus={{this.validation.firstName.status}}
-        @validationMessage={{this.validation.firstName.message}}
-        @autocomplete="firstname"
-        @disabled={{this.matchingStudentFound}}
-        @require={{true}}
-        @aria-describedby="register-error-message register-display-error-message"
-      />
-    </div>
+  <PixInput
+    @id="firstName"
+    @value={{this.firstName}}
+    {{on "focusout" (fn this.triggerInputStringValidation "firstName" this.firstName)}}
+    {{on "input" this.handleFirstNameInput}}
+    @requiredLabel={{true}}
+    @validationStatus={{this.validation.firstName.status}}
+    @errorMessage={{this.validation.firstName.message}}
+    @disabled={{this.matchingStudentFound}}
+    autocomplete="firstname"
+    type="text"
+  >
+    <:label>{{t "pages.login-or-register.register-form.fields.firstname.label"}}</:label>
+  </PixInput>
 
-    <div id="register-lastName-container">
-      <FormTextfield
-        @label={{t "pages.login-or-register.register-form.fields.lastname.label"}}
-        @textfieldName="lastName"
-        @inputBindingValue={{this.lastName}}
-        @onValidate={{this.triggerInputStringValidation}}
-        @validationStatus={{this.validation.lastName.status}}
-        @validationMessage={{this.validation.lastName.message}}
-        @autocomplete="lastname"
-        @disabled={{this.matchingStudentFound}}
-        @require={{true}}
-        @aria-describedby="register-error-message register-display-error-message"
-      />
-    </div>
+  <PixInput
+    @id="lastName"
+    @value={{this.lastName}}
+    {{on "focusout" (fn this.triggerInputStringValidation "lastName" this.lastName)}}
+    {{on "input" this.handleLastNameInput}}
+    @requiredLabel={{true}}
+    @validationStatus={{this.validation.lastName.status}}
+    @errorMessage={{this.validation.lastName.message}}
+    @disabled={{this.matchingStudentFound}}
+    autocomplete="lastName"
+    type="text"
+  >
+    <:label>{{t "pages.login-or-register.register-form.fields.lastname.label"}}</:label>
+  </PixInput>
 
-    <div id="register-birthdate-container">
-      <FormTextfieldDate
-        @label={{t "pages.login-or-register.register-form.fields.birthdate.label"}}
-        @dayTextfieldName="dayOfBirth"
-        @monthTextfieldName="monthOfBirth"
-        @yearTextfieldName="yearOfBirth"
-        @dayInputBindingValue={{this.dayOfBirth}}
-        @monthInputBindingValue={{this.monthOfBirth}}
-        @yearInputBindingValue={{this.yearOfBirth}}
-        @onValidateDay={{this.triggerInputDayValidation}}
-        @onValidateMonth={{this.triggerInputMonthValidation}}
-        @onValidateYear={{this.triggerInputYearValidation}}
-        @dayValidationStatus={{this.validation.dayOfBirth.status}}
-        @monthValidationStatus={{this.validation.monthOfBirth.status}}
-        @yearValidationStatus={{this.validation.yearOfBirth.status}}
-        @dayValidationMessage={{this.validation.dayOfBirth.message}}
-        @monthValidationMessage={{this.validation.monthOfBirth.message}}
-        @yearValidationMessage={{this.validation.yearOfBirth.message}}
-        @disabled={{this.matchingStudentFound}}
-        @require={{true}}
-        @aria-describedby="register-error-message register-display-error-message"
-      />
-    </div>
+  <FormTextfieldDate
+    @label={{t "pages.login-or-register.register-form.fields.birthdate.label"}}
+    @dayTextfieldName="dayOfBirth"
+    @monthTextfieldName="monthOfBirth"
+    @yearTextfieldName="yearOfBirth"
+    @dayValue={{this.dayOfBirth}}
+    @monthValue={{this.monthOfBirth}}
+    @yearValue={{this.yearOfBirth}}
+    @onValidateDay={{this.triggerInputDayValidation}}
+    @onValidateMonth={{this.triggerInputMonthValidation}}
+    @onValidateYear={{this.triggerInputYearValidation}}
+    @dayValidationStatus={{this.validation.dayOfBirth.status}}
+    @monthValidationStatus={{this.validation.monthOfBirth.status}}
+    @yearValidationStatus={{this.validation.yearOfBirth.status}}
+    @dayValidationMessage={{this.validation.dayOfBirth.message}}
+    @monthValidationMessage={{this.validation.monthOfBirth.message}}
+    @yearValidationMessage={{this.validation.yearOfBirth.message}}
+    @disabled={{this.matchingStudentFound}}
+    @require={{true}}
+    @onDayInput={{this.handleDayInput}}
+    @onMonthInput={{this.handleMonthInput}}
+    @onYearInput={{this.handleYearInput}}
+    @aria-describedby="register-error-message register-display-error-message"
+  />
 
-    {{#if this.errorMessage}}
-      <div class="register-form__error" aria-live="polite" id="register-error-message">{{{this.errorMessage}}}</div>
-    {{/if}}
+  {{#if this.errorMessage}}
+    <div class="register-form__error" aria-live="polite" id="register-error-message">{{{this.errorMessage}}}</div>
+  {{/if}}
 
-    {{#unless this.matchingStudentFound}}
-      <div class="register-button-container">
-        <PixButton id="submit-search" @type="submit" @isLoading={{this.isLoading}}>
-          {{t "pages.login-or-register.register-form.button-form"}}
-        </PixButton>
-      </div>
-    {{/unless}}
+  {{#unless this.matchingStudentFound}}
+    <div class="register-button-container">
+      <PixButton id="submit-search" @type="submit" @isLoading={{this.isLoading}}>
+        {{t "pages.login-or-register.register-form.button-form"}}
+      </PixButton>
+    </div>
+  {{/unless}}
 
-  </form>
+</form>
 
-  {{#if this.matchingStudentFound}}
-    <hr />
+{{#if this.matchingStudentFound}}
+  <hr />
 
-    <label class="register-form__login-options">{{t "pages.login-or-register.register-form.options.text"}}</label>
-    <div id="login-mode-container">
-      <PixToggleDeprecated
-        @valueFirstLabel={{t "pages.login-or-register.register-form.options.username"}}
-        @valueSecondLabel={{t "pages.login-or-register.register-form.options.email"}}
-        @onToggle={{this.onToggle}}
-      />
-    </div>
+  <label class="register-form__login-options">{{t "pages.login-or-register.register-form.options.text"}}</label>
+  <div id="login-mode-container">
+    <PixToggleDeprecated
+      @valueFirstLabel={{t "pages.login-or-register.register-form.options.username"}}
+      @valueSecondLabel={{t "pages.login-or-register.register-form.options.email"}}
+      @onToggle={{this.onToggle}}
+    />
+  </div>
 
-    <form {{on "submit" this.register}} autocomplete="off">
-      {{#if this.loginWithUsername}}
-        <div id="register-username-container" class="register-form-username-container">
-          <label class="register-form-username-container__label">
-            <abbr title="{{t 'common.form.mandatory'}}" class="mandatory-mark">*</abbr>
-            {{t "pages.login-or-register.register-form.fields.username.label"}}
-          </label>
-          <span class="register-form-username-container__span" data-test-username>{{this.username}}</span>
-        </div>
-      {{else}}
-        <div id="register-email-container">
-          <FormTextfield
-            @label={{t "pages.login-or-register.register-form.fields.email.label"}}
-            @help={{t "pages.login-or-register.register-form.fields.email.help"}}
-            @textfieldName="email"
-            @inputBindingValue={{this.email}}
-            @onValidate={{this.triggerInputEmailValidation}}
-            @validationStatus={{this.validation.email.status}}
-            @validationMessage={{this.validation.email.message}}
-            @require={{true}}
-            @aria-describedby="register-error-message register-display-error-message"
-          />
-        </div>
-      {{/if}}
-      <div id="register-password-container">
-        <FormTextfield
-          @label={{t "pages.login-or-register.register-form.fields.password.label"}}
-          @help={{t "pages.login-or-register.register-form.fields.password.help"}}
-          @textfieldName="password"
-          @inputBindingValue={{this.password}}
-          @onValidate={{this.triggerInputPasswordValidation}}
-          @validationStatus={{this.validation.password.status}}
-          @validationMessage={{this.validation.password.message}}
-          @require={{true}}
-          @aria-describedby="register-error-message register-display-error-message"
-        />
+  <form {{on "submit" this.register}} autocomplete="off">
+    {{#if this.loginWithUsername}}
+      <div id="register-username-container" class="register-form-username-container">
+        <label class="register-form-username-container__label">
+          {{t "pages.login-or-register.register-form.fields.username.label"}}
+          <abbr title="{{t 'common.form.mandatory'}}" class="mandatory-mark">*</abbr>
+        </label>
+        <span class="register-form-username-container__span" data-test-username>{{this.username}}</span>
       </div>
+    {{else}}
+      <PixInput
+        @id="email"
+        @value={{this.email}}
+        {{on "focusout" (fn this.triggerInputEmailValidation "email" this.email)}}
+        {{on "input" this.handleEmailInput}}
+        @requiredLabel={{true}}
+        @validationStatus={{this.validation.email.status}}
+        @errorMessage={{this.validation.email.message}}
+        @disabled={{this.matchingStudentFound}}
+        @subLabel={{t "pages.login-or-register.register-form.fields.email.help"}}
+        autocomplete="firstname"
+        type="email"
+      >
+        <:label>{{t "pages.login-or-register.register-form.fields.email.label"}}</:label>
+      </PixInput>
+    {{/if}}
+    <PixInputPassword
+      @id="password"
+      @value={{this.password}}
+      @subLabel={{t "pages.login-or-register.register-form.fields.password.help"}}
+      {{on "focusout" (fn this.triggerInputPasswordValidation "password" this.email)}}
+      {{on "input" this.handlePasswordInput}}
+      @validationStatus={{this.validation.password.status}}
+      @errorMessage={{this.validation.password.message}}
+      @requiredLabel={{true}}
+    >
+      <:label>{{t "pages.login-or-register.register-form.fields.password.label"}}</:label>
+    </PixInputPassword>
 
-      {{#if this.displayRegisterErrorMessage}}
-        <div class="register-form__error" aria-live="polite" id="register-display-error-message">
-          {{{this.registerErrorMessage}}}
-        </div>
-      {{/if}}
-
-      <div class="register-button-container">
-        <PixButton id="submit-registration" @type="submit" @isLoading={{this.isLoading}}>
-          {{t "pages.login-or-register.register-form.button-form"}}
-        </PixButton>
+    {{#if this.displayRegisterErrorMessage}}
+      <div class="register-form__error" aria-live="polite" id="register-display-error-message">
+        {{{this.registerErrorMessage}}}
       </div>
+    {{/if}}
 
-      <PixButton
-        @triggerAction={{this.resetForm}}
-        @variant="secondary"
-        @iconBefore="arrowLeft"
-        class="register-form__reset-form-button"
-      >
-        {{t "pages.login-or-register.register-form.not-me"}}
+    <div class="register-button-container">
+      <PixButton id="submit-registration" @type="submit" @isLoading={{this.isLoading}}>
+        {{t "pages.login-or-register.register-form.button-form"}}
       </PixButton>
+    </div>
 
-      <p class="legal-notice">
-        {{t "pages.login-or-register.register-form.rgpd-legal-notice"}}
-        <a
-          href="{{t 'pages.login-or-register.register-form.rgpd-legal-notice-url'}}"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="link--underline"
-        >
-          {{t "pages.login-or-register.register-form.rgpd-legal-notice-link"}}
-        </a>
-      </p>
+    <PixButton
+      @triggerAction={{this.resetForm}}
+      @variant="secondary"
+      @iconBefore="arrowLeft"
+      class="register-form__reset-form-button"
+    >
+      {{t "pages.login-or-register.register-form.not-me"}}
+    </PixButton>
 
-    </form>
-  {{/if}}
+    <p class="legal-notice">
+      {{t "pages.login-or-register.register-form.rgpd-legal-notice"}}
+      <a
+        href="{{t 'pages.login-or-register.register-form.rgpd-legal-notice-url'}}"
+        target="_blank"
+        rel="noopener noreferrer"
+        class="link--underline"
+      >
+        {{t "pages.login-or-register.register-form.rgpd-legal-notice-link"}}
+      </a>
+    </p>
 
-</div>
\ No newline at end of file
+  </form>
+{{/if}}
\ No newline at end of file
diff --git a/mon-pix/app/components/routes/register-form.js b/mon-pix/app/components/routes/register-form.js
index a98c704023b..e3a7016f48a 100644
--- a/mon-pix/app/components/routes/register-form.js
+++ b/mon-pix/app/components/routes/register-form.js
@@ -270,6 +270,39 @@ export default class RegisterForm extends Component {
     this._validateInputPassword(key, value);
   }
 
+  @action
+  handleFirstNameInput(event) {
+    this.firstName = event.target.value;
+  }
+
+  @action
+  handleLastNameInput(event) {
+    this.lastName = event.target.value;
+  }
+
+  @action
+  handleEmailInput(event) {
+    this.email = event.target.value;
+  }
+
+  @action
+  handlePasswordInput(event) {
+    this.password = event.target.value;
+  }
+
+  @action
+  handleDayInput(event) {
+    this.dayOfBirth = event.target.value;
+  }
+  @action
+  handleMonthInput(event) {
+    this.monthOfBirth = event.target.value;
+  }
+  @action
+  handleYearInput(event) {
+    this.yearOfBirth = event.target.value;
+  }
+
   @action
   resetForm() {
     if (this.scoOrganizationLearner) this.scoOrganizationLearner.unloadRecord();
diff --git a/mon-pix/app/components/update-expired-password-form.hbs b/mon-pix/app/components/update-expired-password-form.hbs
index 3cbc9f6e1bb..7b2b35bed1d 100644
--- a/mon-pix/app/components/update-expired-password-form.hbs
+++ b/mon-pix/app/components/update-expired-password-form.hbs
@@ -27,20 +27,20 @@
 
   {{#unless this.authenticationHasFailed}}
     <form {{on "submit" this.handleUpdatePasswordAndAuthenticate}} class="update-expired-password-form__body">
-
-      <div class="update-expired-password-form-body__input">
-        <FormTextfield
-          @label={{t "pages.update-expired-password.fields.label"}}
-          @help={{t "pages.update-expired-password.fields.help"}}
-          @textfieldName="password"
-          @inputBindingValue={{this.newPassword}}
-          @onValidate={{this.validatePassword}}
-          @validationStatus={{this.validation.status}}
-          @validationMessage={{this.validationMessage}}
-          @require={{true}}
-          @aria-describedby="update-expired-password-error-message update-expired-password-authentication-failed-message"
-        />
-      </div>
+      <PixInputPassword
+        @id="password"
+        name="password"
+        @value={{this.newPassword}}
+        @subLabel={{t "pages.update-expired-password.fields.help"}}
+        {{on "focusout" this.validatePassword}}
+        {{on "input" this.handleInputChange}}
+        @requiredLabel={{true}}
+        @validationStatus={{this.validation.status}}
+        @errorMessage={{this.validationMessage}}
+        autocomplete="off"
+      >
+        <:label>{{t "pages.update-expired-password.fields.label"}}</:label>
+      </PixInputPassword>
 
       <PixButton @type="submit" @isLoading={{this.isLoading}}>
         {{t "pages.update-expired-password.button"}}
diff --git a/mon-pix/app/components/update-expired-password-form.js b/mon-pix/app/components/update-expired-password-form.js
index f05ca2cacb7..fd7519915a6 100644
--- a/mon-pix/app/components/update-expired-password-form.js
+++ b/mon-pix/app/components/update-expired-password-form.js
@@ -53,6 +53,11 @@ export default class UpdateExpiredPasswordForm extends Component {
     this.validation = VALIDATION_MAP[validationStatus];
   }
 
+  @action
+  handleInputChange(event) {
+    this.newPassword = event.target.value;
+  }
+
   @action
   async handleUpdatePasswordAndAuthenticate(event) {
     event && event.preventDefault();
diff --git a/mon-pix/app/controllers/fill-in-campaign-code.js b/mon-pix/app/controllers/fill-in-campaign-code.js
index 638fa81c24d..451d555d252 100644
--- a/mon-pix/app/controllers/fill-in-campaign-code.js
+++ b/mon-pix/app/controllers/fill-in-campaign-code.js
@@ -58,6 +58,11 @@ export default class FillInCampaignCodeController extends Controller {
     return this.isInternationalDomain && this.isUserNotAuthenticated;
   }
 
+  @action
+  handleCampaignCodeInput(event) {
+    this.campaignCode = event.target.value;
+  }
+
   @action
   async startCampaign(event) {
     event.preventDefault();
diff --git a/mon-pix/app/controllers/fill-in-certificate-verification-code.js b/mon-pix/app/controllers/fill-in-certificate-verification-code.js
index 0c104420d08..9266892040b 100644
--- a/mon-pix/app/controllers/fill-in-certificate-verification-code.js
+++ b/mon-pix/app/controllers/fill-in-certificate-verification-code.js
@@ -18,6 +18,11 @@ export default class FillInCertificateVerificationCode extends Controller {
   @tracked
   showNotFoundCertificationErrorMessage = false;
 
+  @action
+  handleVerificationCodeInput(event) {
+    this.certificateVerificationCode = event.target.value;
+  }
+
   @action
   async checkCertificate(e) {
     e.preventDefault();
diff --git a/mon-pix/app/modifiers/modifier-did-insert.js b/mon-pix/app/modifiers/modifier-did-insert.js
index fae617f84dd..2a8affe0b42 100644
--- a/mon-pix/app/modifiers/modifier-did-insert.js
+++ b/mon-pix/app/modifiers/modifier-did-insert.js
@@ -1,5 +1,5 @@
 import { modifier } from 'ember-modifier';
 
-export default modifier(function didInsert(htmlElement, [action]) {
-  action(htmlElement);
+export default modifier(function didInsert(htmlElement, [action, ...rest]) {
+  action(htmlElement, ...rest);
 });
diff --git a/mon-pix/app/styles/components/_form-textfield.scss b/mon-pix/app/styles/components/_form-textfield.scss
index 02384621988..be38b595cca 100644
--- a/mon-pix/app/styles/components/_form-textfield.scss
+++ b/mon-pix/app/styles/components/_form-textfield.scss
@@ -2,7 +2,6 @@
 
 .form-textfield {
   position: relative;
-  margin-top: 20px;
 }
 
 .form-textfield__label {
@@ -21,14 +20,8 @@
 .form-textfield__date {
   display: flex;
   flex-flow: row nowrap;
+  gap: var(--pix-spacing-2x);
   align-items: center;
-  justify-content: space-between;
-
-  & .form-textfield__input-field-container,
-  input {
-    width: 30%;
-    text-align: center;
-  }
 }
 
 .form-textfield__input-field-container {
diff --git a/mon-pix/app/styles/components/_login-form.scss b/mon-pix/app/styles/components/_login-form.scss
index 51c0fb20f60..57a5f9dece6 100644
--- a/mon-pix/app/styles/components/_login-form.scss
+++ b/mon-pix/app/styles/components/_login-form.scss
@@ -1,9 +1,13 @@
 .login-form {
   display: flex;
   flex-direction: column;
-  align-items: stretch;
+  gap: var(--pix-spacing-4x);
   max-width: 360px;
 
+  >  .pix-input, .pix-input-password {
+    width: 100%;
+  }
+
   &__error-message {
     margin-bottom: 10px;
     color: var(--pix-error-500);
@@ -28,8 +32,4 @@
     color: var(--pix-neutral-800);
     font-size: 0.875rem;
   }
-
-  .login-button-container {
-    margin-top: 25px;
-  }
 }
diff --git a/mon-pix/app/styles/components/_register-form.scss b/mon-pix/app/styles/components/_register-form.scss
index f48fc53e662..7cc2a3e81bc 100644
--- a/mon-pix/app/styles/components/_register-form.scss
+++ b/mon-pix/app/styles/components/_register-form.scss
@@ -1,9 +1,13 @@
 .register-form {
   display: flex;
   flex-direction: column;
+  gap: var(--pix-spacing-4x);
   align-items: stretch;
   max-width: 360px;
-  padding: 4px;
+
+  & .pix-input {
+    width: 100%;
+  }
 
   &__login-options {
     display: inline-block;
@@ -21,27 +25,6 @@
     font-family: $font-roboto;
   }
 
-  &__cgu-container {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    max-width: 449px;
-    margin-top: 10px;
-    margin-bottom: 6px;
-
-    @include device-is('tablet') {
-      margin-top: 15px;
-      margin-bottom: 0;
-      padding: 0;
-    }
-  }
-
-  &__validation-error {
-    color: var(--pix-error-700);
-    font-weight: normal;
-  }
-
   .register-button-container {
     display: flex;
 
diff --git a/mon-pix/app/styles/components/account-recovery/_student-information-form.scss b/mon-pix/app/styles/components/account-recovery/_student-information-form.scss
index 49c87f2bfb9..32beebcba79 100644
--- a/mon-pix/app/styles/components/account-recovery/_student-information-form.scss
+++ b/mon-pix/app/styles/components/account-recovery/_student-information-form.scss
@@ -18,22 +18,15 @@
   }
 
   &__birthdate-label {
-    margin-bottom: 0;
+    margin-bottom: var(--pix-spacing-2x);
   }
 
   &__birthdate-fields {
     display: flex;
+    gap: var(--pix-spacing-4x);
 
-    .form-textfield__input-field-container {
-      display: block;
-      width: calc(80px + 2 * 2px);
-      height: calc(38px + 2 * 2px);
-      margin-right: 8px;
-
-      & > input {
-        width: 80px;
-        height: 38px;
-      }
+    > .pix-input {
+      width: 100%;
     }
   }
 }
diff --git a/mon-pix/app/styles/pages/_account-recovery.scss b/mon-pix/app/styles/pages/_account-recovery.scss
index 3179dfed574..6ef383d05e9 100644
--- a/mon-pix/app/styles/pages/_account-recovery.scss
+++ b/mon-pix/app/styles/pages/_account-recovery.scss
@@ -8,6 +8,16 @@
     padding: 56px 60px;
   }
 
+  &__form {
+    display: flex;
+    flex-direction: column;
+    gap: var(--pix-spacing-4x);
+
+    > .pix-input {
+      width: 100%;
+    }
+  }
+
   &__content {
     position: relative;
     display: flex;
diff --git a/mon-pix/app/styles/pages/_join-restricted-campaign.scss b/mon-pix/app/styles/pages/_join-restricted-campaign.scss
index 20e03fc69f6..715d40e09d8 100644
--- a/mon-pix/app/styles/pages/_join-restricted-campaign.scss
+++ b/mon-pix/app/styles/pages/_join-restricted-campaign.scss
@@ -2,23 +2,13 @@
   form {
     display: flex;
     flex-direction: column;
+    gap: var(--pix-spacing-4x);
     align-items: center;
+    max-width: 380px;
     margin: 0 auto;
-  }
-
-  input[type='text'] {
-    width: 100%;
-    height: 50px;
-    padding-left: 10px;
-    border: 2px solid var(--pix-neutral-100);
-    border-radius: 4px;
 
-    &[disabled] {
-      background-color: var(--pix-neutral-20);
-    }
-
-    &.input--error {
-      border-color: var(--pix-warning-700);
+    > .pix-input {
+      width: 100%;
     }
   }
 
@@ -73,25 +63,12 @@
     }
   }
 
-  &__row {
-    display: flex;
-    flex-flow: column nowrap;
-    width: 280px;
-    margin-bottom: 20px;
-  }
-
   &__birthdate {
     display: flex;
-    flex-flow: row nowrap;
+    flex-flow: row;
+    gap: var(--pix-spacing-4x);
     align-items: center;
     justify-content: space-between;
-
-    & input[type='text'] {
-      width: 30%;
-      margin-bottom: 4px;
-      padding-left: 0;
-      text-align: center;
-    }
   }
 
   &__button {
diff --git a/mon-pix/app/styles/pages/_update-expired-password-form.scss b/mon-pix/app/styles/pages/_update-expired-password-form.scss
index 37cace3a693..3258b6f8cdd 100644
--- a/mon-pix/app/styles/pages/_update-expired-password-form.scss
+++ b/mon-pix/app/styles/pages/_update-expired-password-form.scss
@@ -17,7 +17,7 @@
   &__container {
     display: flex;
     flex-direction: column;
-    gap: 20px;
+    gap: var(--pix-spacing-4x);
     align-items: center;
     justify-content: space-around;
     width: 95%;
diff --git a/mon-pix/app/templates/campaigns/assessment/tutorial.hbs b/mon-pix/app/templates/campaigns/assessment/tutorial.hbs
index 3353a412adf..5d20da6755a 100644
--- a/mon-pix/app/templates/campaigns/assessment/tutorial.hbs
+++ b/mon-pix/app/templates/campaigns/assessment/tutorial.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-action }}
 {{page-title (t "pages.tutorial.title")}}
 
 <div class="campaign-tutorial">
diff --git a/mon-pix/app/templates/campaigns/profiles-collection/send-profile.hbs b/mon-pix/app/templates/campaigns/profiles-collection/send-profile.hbs
index 72d85cc5bdc..afa0663723a 100644
--- a/mon-pix/app/templates/campaigns/profiles-collection/send-profile.hbs
+++ b/mon-pix/app/templates/campaigns/profiles-collection/send-profile.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-action }}
 {{page-title (t "pages.send-profile.title")}}
 
 <div class="background-banner-wrapper">
diff --git a/mon-pix/app/templates/fill-in-campaign-code.hbs b/mon-pix/app/templates/fill-in-campaign-code.hbs
index ae96a85832b..8254b651b50 100644
--- a/mon-pix/app/templates/fill-in-campaign-code.hbs
+++ b/mon-pix/app/templates/fill-in-campaign-code.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-action require-input-label no-invalid-interactive no-unknown-arguments-for-builtin-components }}
 {{page-title (t "pages.fill-in-campaign-code.title")}}
 
 <div class="pix-communication-banner">
@@ -19,15 +18,16 @@
         <form class="fill-in-campaign-code__form" autocomplete="off">
 
           <div class="fill-in-campaign-code__form-field">
-            <Input
+            <PixInput
               required
               aria-describedby="campaign-code-description"
               id="campaign-code"
               class="input-code"
-              @type="text"
+              type="text"
               @value={{this.campaignCode}}
               maxlength="9"
               {{on "keyup" this.clearErrorMessage}}
+              {{on "input" this.handleCampaignCodeInput}}
             />
           </div>
 
@@ -38,11 +38,7 @@
           {{/if}}
 
           <div class="fill-in-campaign-code__actions">
-            <PixButton
-              @type="submit"
-              class="fill-in-campaign-code__start-button"
-              @triggerAction={{action "startCampaign"}}
-            >
+            <PixButton @type="submit" class="fill-in-campaign-code__start-button" @triggerAction={{this.startCampaign}}>
               {{t "pages.fill-in-campaign-code.start"}}
             </PixButton>
           </div>
@@ -51,7 +47,7 @@
         {{#if this.showWarningMessage}}
           <div class="fill-in-campaign-code__warning">
             <span>{{this.warningMessage}}</span>
-            <a href="#" class="link" {{action this.disconnect}}>
+            <a href="#" class="link" {{on "click" this.disconnect}}>
               {{t "pages.fill-in-campaign-code.warning-message-logout"}}
             </a>
           </div>
diff --git a/mon-pix/app/templates/fill-in-certificate-verification-code.hbs b/mon-pix/app/templates/fill-in-certificate-verification-code.hbs
index ec9e129ce48..79af7c282f2 100644
--- a/mon-pix/app/templates/fill-in-certificate-verification-code.hbs
+++ b/mon-pix/app/templates/fill-in-certificate-verification-code.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-action require-input-label no-unknown-arguments-for-builtin-components }}
 {{page-title (t "pages.fill-in-certificate-verification-code.title")}}
 
 <Global::AppLayout>
@@ -18,14 +17,15 @@
             <label for="certificate-verification-code">
               {{t "pages.fill-in-certificate-verification-code.label"}}
             </label>
-            <Input
+            <PixInput
               required
               class="input-code"
-              @type="text"
+              type="text"
               id="certificate-verification-code"
               @value={{this.certificateVerificationCode}}
               maxlength="10"
               {{on "keyup" this.clearErrors}}
+              {{on "input" this.handleVerificationCodeInput}}
             />
           </div>
 
diff --git a/mon-pix/package-lock.json b/mon-pix/package-lock.json
index c00ef62898d..e3bdbd4e691 100644
--- a/mon-pix/package-lock.json
+++ b/mon-pix/package-lock.json
@@ -21,7 +21,6 @@
         "@ember-data/json-api": "^5.3.8",
         "@ember-data/model": "^5.3.8",
         "@ember/optional-features": "^2.0.0",
-        "@ember/render-modifiers": "^2.0.4",
         "@ember/string": "^3.1.1",
         "@ember/test-helpers": "^4.0.0",
         "@embroider/compat": "^3.0.0",
@@ -67,7 +66,7 @@
         "ember-simple-auth": "^7.0.0",
         "ember-source": "^5.9.0",
         "ember-template-imports": "^4.1.1",
-        "ember-template-lint": "^5.13.0",
+        "ember-template-lint": "^6.0.0",
         "ember-template-lint-plugin-prettier": "^5.0.0",
         "ember-test-selectors": "^6.0.0",
         "ember-truth-helpers": "^4.0.0",
@@ -3913,706 +3912,6 @@
         "node": "10.* || 12.* || >= 14"
       }
     },
-    "node_modules/@ember/render-modifiers": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@ember/render-modifiers/-/render-modifiers-2.1.0.tgz",
-      "integrity": "sha512-LruhfoDv2itpk0fA0IC76Sxjcnq/7BC6txpQo40hOko8Dn6OxwQfxkPIbZGV0Cz7df+iX+VJrcYzNIvlc3w2EQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@embroider/macros": "^1.0.0",
-        "ember-cli-babel": "^7.26.11",
-        "ember-modifier-manager-polyfill": "^1.2.0"
-      },
-      "engines": {
-        "node": "12.* || 14.* || >= 16"
-      },
-      "peerDependencies": {
-        "@glint/template": "^1.0.2",
-        "ember-source": "^3.8 || ^4.0.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@glint/template": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
-      "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/@babel/runtime": {
-      "version": "7.12.18",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz",
-      "integrity": "sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/@types/fs-extra": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.1.0.tgz",
-      "integrity": "sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/async-disk-cache": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-1.3.5.tgz",
-      "integrity": "sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^2.1.3",
-        "heimdalljs": "^0.2.3",
-        "istextorbinary": "2.1.0",
-        "mkdirp": "^0.5.0",
-        "rimraf": "^2.5.3",
-        "rsvp": "^3.0.18",
-        "username-sync": "^1.0.2"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/async-disk-cache/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/async-disk-cache/node_modules/rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "0.12.* || 4.* || 6.* || >= 7.*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/babel-plugin-module-resolver": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz",
-      "integrity": "sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-babel-config": "^1.1.0",
-        "glob": "^7.1.2",
-        "pkg-up": "^2.0.0",
-        "reselect": "^3.0.1",
-        "resolve": "^1.4.0"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-babel-transpiler": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.1.tgz",
-      "integrity": "sha512-6IXBgfRt7HZ61g67ssBc6lBb3Smw3DPZ9dEYirgtvXWpRZ2A9M22nxy6opEwJDgDJzlu/bB7ToppW33OFkA1gA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.12.0",
-        "@babel/polyfill": "^7.11.5",
-        "broccoli-funnel": "^2.0.2",
-        "broccoli-merge-trees": "^3.0.2",
-        "broccoli-persistent-filter": "^2.2.1",
-        "clone": "^2.1.2",
-        "hash-for-dep": "^1.4.7",
-        "heimdalljs": "^0.2.1",
-        "heimdalljs-logger": "^0.1.9",
-        "json-stable-stringify": "^1.0.1",
-        "rsvp": "^4.8.4",
-        "workerpool": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-funnel": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz",
-      "integrity": "sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-equal": "^1.0.0",
-        "blank-object": "^1.0.1",
-        "broccoli-plugin": "^1.3.0",
-        "debug": "^2.2.0",
-        "fast-ordered-set": "^1.0.0",
-        "fs-tree-diff": "^0.5.3",
-        "heimdalljs": "^0.2.0",
-        "minimatch": "^3.0.0",
-        "mkdirp": "^0.5.0",
-        "path-posix": "^1.0.0",
-        "rimraf": "^2.4.3",
-        "symlink-or-copy": "^1.0.0",
-        "walk-sync": "^0.3.1"
-      },
-      "engines": {
-        "node": "^4.5 || 6.* || >= 7.*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-funnel/node_modules/fs-tree-diff": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz",
-      "integrity": "sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "heimdalljs-logger": "^0.1.7",
-        "object-assign": "^4.1.0",
-        "path-posix": "^1.0.0",
-        "symlink-or-copy": "^1.1.8"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-funnel/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-merge-trees": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz",
-      "integrity": "sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "broccoli-plugin": "^1.3.0",
-        "merge-trees": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-persistent-filter": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz",
-      "integrity": "sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "async-disk-cache": "^1.2.1",
-        "async-promise-queue": "^1.0.3",
-        "broccoli-plugin": "^1.0.0",
-        "fs-tree-diff": "^2.0.0",
-        "hash-for-dep": "^1.5.0",
-        "heimdalljs": "^0.2.1",
-        "heimdalljs-logger": "^0.1.7",
-        "mkdirp": "^0.5.1",
-        "promise-map-series": "^0.2.1",
-        "rimraf": "^2.6.1",
-        "rsvp": "^4.7.0",
-        "symlink-or-copy": "^1.0.1",
-        "sync-disk-cache": "^1.3.3",
-        "walk-sync": "^1.0.0"
-      },
-      "engines": {
-        "node": "6.* || >= 8.*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-persistent-filter/node_modules/matcher-collection": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.1.2.tgz",
-      "integrity": "sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minimatch": "^3.0.2"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-persistent-filter/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-persistent-filter/node_modules/walk-sync": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-1.1.4.tgz",
-      "integrity": "sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/minimatch": "^3.0.3",
-        "ensure-posix-path": "^1.1.0",
-        "matcher-collection": "^1.1.1"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-plugin": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz",
-      "integrity": "sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "promise-map-series": "^0.2.1",
-        "quick-temp": "^0.1.3",
-        "rimraf": "^2.3.4",
-        "symlink-or-copy": "^1.1.8"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-plugin/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/broccoli-source": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/broccoli-source/-/broccoli-source-2.1.2.tgz",
-      "integrity": "sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/editions": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz",
-      "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/ember-cli-babel": {
-      "version": "7.26.11",
-      "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz",
-      "integrity": "sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.12.0",
-        "@babel/helper-compilation-targets": "^7.12.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.5",
-        "@babel/plugin-proposal-decorators": "^7.13.5",
-        "@babel/plugin-proposal-private-methods": "^7.16.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.5",
-        "@babel/plugin-transform-modules-amd": "^7.13.0",
-        "@babel/plugin-transform-runtime": "^7.13.9",
-        "@babel/plugin-transform-typescript": "^7.13.0",
-        "@babel/polyfill": "^7.11.5",
-        "@babel/preset-env": "^7.16.5",
-        "@babel/runtime": "7.12.18",
-        "amd-name-resolver": "^1.3.1",
-        "babel-plugin-debug-macros": "^0.3.4",
-        "babel-plugin-ember-data-packages-polyfill": "^0.1.2",
-        "babel-plugin-ember-modules-api-polyfill": "^3.5.0",
-        "babel-plugin-module-resolver": "^3.2.0",
-        "broccoli-babel-transpiler": "^7.8.0",
-        "broccoli-debug": "^0.6.4",
-        "broccoli-funnel": "^2.0.2",
-        "broccoli-source": "^2.1.2",
-        "calculate-cache-key-for-tree": "^2.0.0",
-        "clone": "^2.1.2",
-        "ember-cli-babel-plugin-helpers": "^1.1.1",
-        "ember-cli-version-checker": "^4.1.0",
-        "ensure-posix-path": "^1.0.2",
-        "fixturify-project": "^1.10.0",
-        "resolve-package-path": "^3.1.0",
-        "rimraf": "^3.0.1",
-        "semver": "^5.5.0"
-      },
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/ember-cli-babel/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/ember-cli-version-checker": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz",
-      "integrity": "sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "resolve-package-path": "^2.0.0",
-        "semver": "^6.3.0",
-        "silent-error": "^1.1.1"
-      },
-      "engines": {
-        "node": "8.* || 10.* || >= 12.*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/ember-cli-version-checker/node_modules/resolve-package-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-2.0.0.tgz",
-      "integrity": "sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-root": "^0.1.1",
-        "resolve": "^1.13.1"
-      },
-      "engines": {
-        "node": "8.* || 10.* || >= 12"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/find-babel-config": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.2.tgz",
-      "integrity": "sha512-oK59njMyw2y3yxto1BCfVK7MQp/OYf4FleHu0RgosH3riFJ1aOuo/7naLDLAObfrgn3ueFhw5sAT/cp0QuJI3Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json5": "^1.0.2",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/fixturify": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fixturify/-/fixturify-1.3.0.tgz",
-      "integrity": "sha512-tL0svlOy56pIMMUQ4bU1xRe6NZbFSa/ABTWMxW2mH38lFGc9TrNAKWcMBQ7eIjo3wqSS8f2ICabFaatFyFmrVQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/fs-extra": "^5.0.5",
-        "@types/minimatch": "^3.0.3",
-        "@types/rimraf": "^2.0.2",
-        "fs-extra": "^7.0.1",
-        "matcher-collection": "^2.0.0"
-      },
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/fixturify-project": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/fixturify-project/-/fixturify-project-1.10.0.tgz",
-      "integrity": "sha512-L1k9uiBQuN0Yr8tA9Noy2VSQ0dfg0B8qMdvT7Wb5WQKc7f3dn3bzCbSrqlb+etLW+KDV4cBC7R1OvcMg3kcxmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fixturify": "^1.2.0",
-        "tmp": "^0.0.33"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/istextorbinary": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.1.0.tgz",
-      "integrity": "sha512-kT1g2zxZ5Tdabtpp9VSdOzW9lb6LXImyWbzbQeTxoRtHhurC9Ej9Wckngr2+uepPL09ky/mJHmN9jeJPML5t6A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binaryextensions": "1 || 2",
-        "editions": "^1.1.1",
-        "textextensions": "1 || 2"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "license": "MIT",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@ember/render-modifiers/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@ember/render-modifiers/node_modules/reselect": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-      "integrity": "sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@ember/render-modifiers/node_modules/resolve-package-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz",
-      "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-root": "^0.1.1",
-        "resolve": "^1.17.0"
-      },
-      "engines": {
-        "node": "10.* || >= 12"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/sync-disk-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/sync-disk-cache/-/sync-disk-cache-1.3.4.tgz",
-      "integrity": "sha512-GlkGeM81GPPEKz/lH7QUTbvqLq7K/IUTuaKDSMulP9XQ42glqNJIN/RKgSOw4y8vxL1gOVvj+W7ruEO4s36eCw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.1.3",
-        "heimdalljs": "^0.2.3",
-        "mkdirp": "^0.5.0",
-        "rimraf": "^2.2.8",
-        "username-sync": "^1.0.2"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/sync-disk-cache/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/walk-sync": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz",
-      "integrity": "sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ensure-posix-path": "^1.0.0",
-        "matcher-collection": "^1.0.0"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/walk-sync/node_modules/matcher-collection": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.1.2.tgz",
-      "integrity": "sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minimatch": "^3.0.2"
-      }
-    },
-    "node_modules/@ember/render-modifiers/node_modules/workerpool": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-3.1.2.tgz",
-      "integrity": "sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/core": "^7.3.4",
-        "object-assign": "4.1.1",
-        "rsvp": "^4.8.4"
-      }
-    },
     "node_modules/@ember/string": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@ember/string/-/string-3.1.1.tgz",
@@ -11001,6 +10300,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@sinonjs/commons": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
@@ -15672,9 +14984,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz",
+      "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==",
       "dev": true,
       "funding": [
         {
@@ -17143,20 +16455,14 @@
       }
     },
     "node_modules/date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
+      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=0.11"
-      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
       }
     },
     "node_modules/date-time": {
@@ -21090,22 +20396,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/ember-cli/node_modules/ci-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz",
-      "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ember-cli/node_modules/cli-width": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
@@ -29120,24 +28410,24 @@
       "license": "MIT"
     },
     "node_modules/ember-template-lint": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/ember-template-lint/-/ember-template-lint-5.13.0.tgz",
-      "integrity": "sha512-AYxz9S9fVZfHPmTsymc7NwsD7FVmDUZyfC+KYpxDlK0wic7JSQx2FNQNqQSBFRLOuzn7VQ0/+1pX6DGqKDGswg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/ember-template-lint/-/ember-template-lint-6.0.0.tgz",
+      "integrity": "sha512-TWWt/qCd4KoQ50T3We5nCoKcsrAT8Ip79Kmm9eyWjjyL+LAbRFu0z+GxcmW7MR+QCNW/1LQs3kwEdtIcaHEGiA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@lint-todo/utils": "^13.1.1",
         "aria-query": "^5.3.0",
         "chalk": "^5.3.0",
-        "ci-info": "^3.8.0",
-        "date-fns": "^2.30.0",
+        "ci-info": "^4.0.0",
+        "date-fns": "^3.6.0",
         "ember-template-imports": "^3.4.2",
         "ember-template-recast": "^6.1.4",
         "eslint-formatter-kakoune": "^1.0.0",
-        "find-up": "^6.3.0",
-        "fuse.js": "^6.5.3",
+        "find-up": "^7.0.0",
+        "fuse.js": "^7.0.0",
         "get-stdin": "^9.0.0",
-        "globby": "^13.2.2",
+        "globby": "^14.0.1",
         "is-glob": "^4.0.3",
         "language-tags": "^1.0.8",
         "micromatch": "^4.0.5",
@@ -29149,7 +28439,7 @@
         "ember-template-lint": "bin/ember-template-lint.js"
       },
       "engines": {
-        "node": "^14.18.0 || ^16.0.0 || >= 18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/ember-template-lint-plugin-prettier": {
@@ -29181,9 +28471,9 @@
       }
     },
     "node_modules/ember-template-lint/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29215,17 +28505,18 @@
       }
     },
     "node_modules/ember-template-lint/node_modules/find-up": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz",
+      "integrity": "sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "locate-path": "^7.1.0",
-        "path-exists": "^5.0.0"
+        "locate-path": "^7.2.0",
+        "path-exists": "^5.0.0",
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -32568,9 +31859,9 @@
       }
     },
     "node_modules/fuse.js": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
-      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
+      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -32964,29 +32255,30 @@
       "license": "MIT"
     },
     "node_modules/globby": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
+      "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.2",
         "ignore": "^5.2.4",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+    "node_modules/globby/node_modules/path-type": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -32996,6 +32288,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby/node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/globjoin": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
@@ -49858,6 +49163,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unified": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz",
diff --git a/mon-pix/package.json b/mon-pix/package.json
index a722dc33fb9..84b46a7c1f3 100644
--- a/mon-pix/package.json
+++ b/mon-pix/package.json
@@ -54,7 +54,6 @@
     "@ember-data/json-api": "^5.3.8",
     "@ember-data/model": "^5.3.8",
     "@ember/optional-features": "^2.0.0",
-    "@ember/render-modifiers": "^2.0.4",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^4.0.0",
     "@embroider/compat": "^3.0.0",
@@ -100,7 +99,7 @@
     "ember-simple-auth": "^7.0.0",
     "ember-source": "^5.9.0",
     "ember-template-imports": "^4.1.1",
-    "ember-template-lint": "^5.13.0",
+    "ember-template-lint": "^6.0.0",
     "ember-template-lint-plugin-prettier": "^5.0.0",
     "ember-test-selectors": "^6.0.0",
     "ember-truth-helpers": "^4.0.0",
diff --git a/mon-pix/tests/acceptance/account-recovery/update-sco-record-test.js b/mon-pix/tests/acceptance/account-recovery/update-sco-record-test.js
index 78e645615bd..0fa5a3a0841 100644
--- a/mon-pix/tests/acceptance/account-recovery/update-sco-record-test.js
+++ b/mon-pix/tests/acceptance/account-recovery/update-sco-record-test.js
@@ -1,5 +1,5 @@
-import { fillByLabel, visit } from '@1024pix/ember-testing-library';
-import { click, currentURL, settled } from '@ember/test-helpers';
+import { visit } from '@1024pix/ember-testing-library';
+import { click, currentURL, fillIn, settled } from '@ember/test-helpers';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import { t } from 'ember-intl/test-support';
 import { setupApplicationTest } from 'ember-qunit';
@@ -169,7 +169,10 @@ module('Acceptance | account-recovery | UpdateScoRecordRoute', function (hooks)
 
       const screen = await visit(`/recuperer-mon-compte/${temporaryKey}`);
 
-      await fillByLabel(t('pages.account-recovery.update-sco-record.form.password-label'), password);
+      const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+        exact: false,
+      });
+      await fillIn(passwordInput, password);
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
       // when
@@ -201,7 +204,12 @@ module('Acceptance | account-recovery | UpdateScoRecordRoute', function (hooks)
       server.patch('/account-recovery', () => errorsApi);
 
       const screen = await visit(`/recuperer-mon-compte/${temporaryKey}`);
-      await fillByLabel(t('pages.account-recovery.update-sco-record.form.password-label'), newPassword);
+
+      const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+        exact: false,
+      });
+      await fillIn(passwordInput, newPassword);
+
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
       // when
@@ -238,7 +246,11 @@ module('Acceptance | account-recovery | UpdateScoRecordRoute', function (hooks)
       server.patch('/account-recovery', () => errorsApi);
 
       const screen = await visit(`/recuperer-mon-compte/${temporaryKey}`);
-      await fillByLabel(t('pages.account-recovery.update-sco-record.form.password-label'), newPassword);
+
+      const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+        exact: false,
+      });
+      await fillIn(passwordInput, newPassword);
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
       // when
@@ -274,7 +286,10 @@ module('Acceptance | account-recovery | UpdateScoRecordRoute', function (hooks)
       server.patch('/account-recovery', () => errorsApi);
 
       const screen = await visit(`/recuperer-mon-compte/${temporaryKey}`);
-      await fillByLabel(t('pages.account-recovery.update-sco-record.form.password-label'), newPassword);
+      const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+        exact: false,
+      });
+      await fillIn(passwordInput, newPassword);
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
       // when
@@ -311,7 +326,10 @@ module('Acceptance | account-recovery | UpdateScoRecordRoute', function (hooks)
       server.patch('/account-recovery', () => errorsApi);
 
       const screen = await visit(`/recuperer-mon-compte/${temporaryKey}`);
-      await fillByLabel(t('pages.account-recovery.update-sco-record.form.password-label'), newPassword);
+      const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+        exact: false,
+      });
+      await fillIn(passwordInput, newPassword);
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
       // when
@@ -347,7 +365,10 @@ module('Acceptance | account-recovery | UpdateScoRecordRoute', function (hooks)
       server.patch('/account-recovery', () => errorsApi);
 
       const screen = await visit(`/recuperer-mon-compte/${temporaryKey}`);
-      await fillByLabel(t('pages.account-recovery.update-sco-record.form.password-label'), newPassword);
+      const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+        exact: false,
+      });
+      await fillIn(passwordInput, newPassword);
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
       // when
diff --git a/mon-pix/tests/acceptance/start-campaigns-with-type-assessment-test.js b/mon-pix/tests/acceptance/start-campaigns-with-type-assessment-test.js
index 0d507851993..995fe7fa244 100644
--- a/mon-pix/tests/acceptance/start-campaigns-with-type-assessment-test.js
+++ b/mon-pix/tests/acceptance/start-campaigns-with-type-assessment-test.js
@@ -93,15 +93,19 @@ module('Acceptance | Campaigns | Start Campaigns with type Assessment', function
               // when
               await click(screen.getByRole('button', { name: 'Se connecter' }));
 
-              await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-              await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+              await fillIn(
+                screen.getByLabelText('Adresse e-mail ou identifiant', { exact: false }),
+                prescritUser.email,
+              );
+              await fillIn(screen.getByLabelText('Mot de passe', { exact: false }), prescritUser.password);
               await click(screen.getByRole('button', { name: 'Se connecter' }));
 
-              await fillIn(screen.getByRole('textbox', { name: 'Prénom' }), prescritUser.firstName);
-              await fillIn(screen.getByRole('textbox', { name: 'Nom' }), prescritUser.lastName);
-              await fillIn(screen.getByRole('textbox', { name: 'jour de naissance' }), '10');
-              await fillIn(screen.getByRole('textbox', { name: 'mois de naissance' }), '12');
-              await fillIn(screen.getByRole('textbox', { name: 'année de naissance' }), '2000');
+              await fillIn(screen.getByLabelText('Prénom'), prescritUser.firstName);
+              await fillIn(screen.getByLabelText('Nom'), prescritUser.lastName);
+              await fillIn(screen.getByLabelText('jour de naissance'), '10');
+              await fillIn(screen.getByLabelText('mois de naissance'), '12');
+              await fillIn(screen.getByLabelText('année de naissance'), '2000');
+
               await click(screen.getByRole('button', { name: t('pages.join.button') }));
               await click(screen.getByRole('button', { name: t('pages.join.sco.associate') }));
 
diff --git a/mon-pix/tests/acceptance/start-campaigns-with-type-profiles-collection-test.js b/mon-pix/tests/acceptance/start-campaigns-with-type-profiles-collection-test.js
index bbcfc1d869c..1276f0a0bc3 100644
--- a/mon-pix/tests/acceptance/start-campaigns-with-type-profiles-collection-test.js
+++ b/mon-pix/tests/acceptance/start-campaigns-with-type-profiles-collection-test.js
@@ -46,7 +46,7 @@ module('Acceptance | Campaigns | Start Campaigns with type Profiles Collection',
             await fillIn(screen.getByRole('textbox', { name: FIRST_NAME_INPUT_LABEL }), campaignParticipant.firstName);
             await fillIn(screen.getByRole('textbox', { name: LAST_NAME_INPUT_LABEL }), campaignParticipant.lastName);
             await fillIn(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), campaignParticipant.email);
-            await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), campaignParticipant.password);
+            await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), campaignParticipant.password);
             await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
             await click(screen.getByRole('button', { name: "Je m'inscris" }));
 
@@ -75,7 +75,7 @@ module('Acceptance | Campaigns | Start Campaigns with type Profiles Collection',
               );
               await fillIn(screen.getByRole('textbox', { name: LAST_NAME_INPUT_LABEL }), campaignParticipant.lastName);
               await fillIn(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), campaignParticipant.email);
-              await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), campaignParticipant.password);
+              await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), campaignParticipant.password);
               await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
               await click(screen.getByRole('button', { name: "Je m'inscris" }));
 
@@ -100,10 +100,11 @@ module('Acceptance | Campaigns | Start Campaigns with type Profiles Collection',
               // when
               await click(screen.getByRole('button', { name: 'Se connecter' }));
               await fillIn(
-                screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }),
+                screen.getByLabelText('Adresse e-mail ou identifiant', { exact: false }),
                 campaignParticipant.email,
               );
-              await fillIn(screen.getByLabelText('Mot de passe'), campaignParticipant.password);
+              await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), campaignParticipant.password);
+
               await click(screen.getByRole('button', { name: 'Se connecter' }));
               await fillIn(
                 screen.getByRole('textbox', { name: FIRST_NAME_INPUT_LABEL }),
@@ -131,7 +132,7 @@ module('Acceptance | Campaigns | Start Campaigns with type Profiles Collection',
           await fillIn(screen.getByRole('textbox', { name: FIRST_NAME_INPUT_LABEL }), campaignParticipant.firstName);
           await fillIn(screen.getByRole('textbox', { name: LAST_NAME_INPUT_LABEL }), campaignParticipant.lastName);
           await fillIn(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), campaignParticipant.email);
-          await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), campaignParticipant.password);
+          await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), campaignParticipant.password);
           await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
           await click(screen.getByRole('button', { name: "Je m'inscris" }));
 
@@ -148,7 +149,7 @@ module('Acceptance | Campaigns | Start Campaigns with type Profiles Collection',
           await fillIn(screen.getByRole('textbox', { name: FIRST_NAME_INPUT_LABEL }), campaignParticipant.firstName);
           await fillIn(screen.getByRole('textbox', { name: LAST_NAME_INPUT_LABEL }), campaignParticipant.lastName);
           await fillIn(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), campaignParticipant.email);
-          await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), campaignParticipant.password);
+          await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), campaignParticipant.password);
           await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
           // when
diff --git a/mon-pix/tests/acceptance/start-campaigns-workflow-test.js b/mon-pix/tests/acceptance/start-campaigns-workflow-test.js
index 677c3825e82..143cff3ce78 100644
--- a/mon-pix/tests/acceptance/start-campaigns-workflow-test.js
+++ b/mon-pix/tests/acceptance/start-campaigns-workflow-test.js
@@ -21,6 +21,11 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
 
   let campaign;
 
+  async function _loginUser(screen, prescritUser) {
+    await fillIn(screen.getByLabelText('Adresse e-mail ou identifiant', { exact: false }), prescritUser.email);
+    await fillIn(screen.getByLabelText('Mot de passe', { exact: false }), prescritUser.password);
+  }
+
   hooks.beforeEach(function () {
     this.server.schema.users.create({
       mustValidateTermsOfService: true,
@@ -104,8 +109,8 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
               // when
               await fillIn(screen.getByRole('textbox', { name: 'Prénom' }), prescritUser.firstName);
               await fillIn(screen.getByRole('textbox', { name: 'Nom' }), prescritUser.lastName);
-              await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail' }), prescritUser.email);
-              await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+              await fillIn(screen.getByRole('textbox', { name: /Adresse e-mail/ }), prescritUser.email);
+              await fillIn(screen.getByLabelText(/Mot de passe/), prescritUser.password);
               await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
 
               // when
@@ -135,8 +140,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
               await click(screen.getByRole('button', { name: 'Accéder au parcours' }));
               await click(screen.getByRole('button', { name: 'Je commence' }));
               await click(screen.getByRole('button', { name: 'Se connecter' }));
-              await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-              await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+              await _loginUser(screen, prescritUser);
               await click(screen.getByRole('button', { name: 'Se connecter' }));
 
               // then
@@ -162,11 +166,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
                 await click(screen.getByRole('button', { name: 'Accéder au parcours' }));
                 await click(screen.getByRole('button', { name: 'Je commence' }));
                 await click(screen.getByRole('button', { name: 'Se connecter' }));
-                await fillIn(
-                  screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }),
-                  prescritUser.email,
-                );
-                await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+                await _loginUser(screen, prescritUser);
                 await click(screen.getByRole('button', { name: 'Se connecter' }));
 
                 // then
@@ -187,8 +187,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
               await click(screen.getByRole('button', { name: 'Accéder au parcours' }));
               await click(screen.getByRole('button', { name: 'Je commence' }));
               await click(screen.getByRole('button', { name: 'Se connecter' }));
-              await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-              await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+              await _loginUser(screen, prescritUser);
               await click(screen.getByRole('button', { name: 'Se connecter' }));
 
               // when
@@ -257,8 +256,8 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
             await click(screen.getByRole('button', { name: 'Je commence' }));
 
             // when
-            await fillIn(screen.getByRole('textbox', { name: '* Prénom' }), prescritUser.firstName);
-            await fillIn(screen.getByRole('textbox', { name: '* Nom' }), prescritUser.lastName);
+            await fillIn(screen.getByLabelText(/Prénom/), prescritUser.firstName);
+            await fillIn(screen.getByLabelText(/Nom/), prescritUser.lastName);
             await fillIn(screen.getByRole('spinbutton', { name: 'Jour de naissance' }), '10');
             await fillIn(screen.getByRole('spinbutton', { name: 'Mois de naissance' }), '12');
             await fillIn(screen.getByRole('spinbutton', { name: 'Année de naissance' }), '2000');
@@ -267,44 +266,20 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
             //go to email-based authentication window
             await click(screen.getByText('Mon adresse e-mail'));
 
-            await fillIn(
-              screen.getByRole('textbox', { name: '* Adresse e-mail (ex: nom@exemple.fr)' }),
-              prescritUser.email,
-            );
-            await fillIn(
-              screen.getByLabelText(
-                'Mot de passe (8 caractères minimum, dont une majuscule, une minuscule et un chiffre)',
-                { exact: false },
-              ),
-              'pix123',
-            );
+            await fillIn(screen.getByLabelText('Adresse e-mail', { exact: false }), prescritUser.email);
+            await fillIn(screen.getByLabelText('Mot de passe', { exact: false }), 'pix123');
 
             await click(screen.getByRole('button', { name: "Je m'inscris" }));
             // then
             assert.strictEqual(currentURL(), `/campagnes/${campaign.code}/rejoindre/identification`);
-            assert.strictEqual(screen.getByRole('textbox', { name: '* Prénom' }).value, prescritUser.firstName);
-            assert.strictEqual(
-              screen.getByRole('textbox', { name: '* Adresse e-mail (ex: nom@exemple.fr)' }).value,
-              prescritUser.email,
-            );
-            assert.strictEqual(
-              screen.getByLabelText(
-                'Mot de passe (8 caractères minimum, dont une majuscule, une minuscule et un chiffre)',
-                { exact: false },
-              ).value,
-              'pix123',
-            );
+            assert.strictEqual(screen.getByLabelText('Prénom', { exact: false }).value, prescritUser.firstName);
+            assert.strictEqual(screen.getByLabelText('Adresse e-mail', { exact: false }).value, prescritUser.email);
+            assert.strictEqual(screen.getByLabelText('Mot de passe', { exact: false }).value, 'pix123');
 
             //go to username-based authentication window
             await click(screen.getByText('Mon identifiant'));
             assert.dom(screen.getByText('first.last1010')).exists();
-            assert.strictEqual(
-              screen.getByLabelText(
-                'Mot de passe (8 caractères minimum, dont une majuscule, une minuscule et un chiffre)',
-                { exact: false },
-              ).value,
-              'pix123',
-            );
+            assert.strictEqual(screen.getByLabelText('Mot de passe', { exact: false }).value, 'pix123');
           });
 
           test('should redirect to student sco invited page when connection is done', async function (assert) {
@@ -317,8 +292,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
 
             // when
             await click(screen.getByRole('button', { name: 'Se connecter' }));
-            await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-            await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+            await _loginUser(screen, prescritUser);
             await click(screen.getByRole('button', { name: 'Se connecter' }));
 
             // then
@@ -335,8 +309,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
 
             // when
             await click(screen.getByRole('button', { name: 'Se connecter' }));
-            await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-            await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+            await _loginUser(screen, prescritUser);
             await click(screen.getByRole('button', { name: 'Se connecter' }));
 
             // then
@@ -391,8 +364,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
 
             // when
             await click(screen.getByRole('link', { name: 'Se connecter' }));
-            await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-            await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+            await _loginUser(screen, prescritUser);
 
             await click(screen.getByRole('button', { name: 'Je me connecte' }));
 
@@ -965,15 +937,14 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
             await click(screen.getByRole('button', { name: 'Accéder au parcours' }));
             await click(screen.getByRole('button', { name: 'Je commence' }));
 
-            await fillIn(screen.getByRole('textbox', { name: 'jour de naissance' }), '10');
-            await fillIn(screen.getByRole('textbox', { name: 'mois de naissance' }), '12');
-            await fillIn(screen.getByRole('textbox', { name: 'année de naissance' }), '2000');
+            await fillIn(screen.getByLabelText('jour de naissance'), '10');
+            await fillIn(screen.getByLabelText('mois de naissance'), '12');
+            await fillIn(screen.getByLabelText('année de naissance'), '2000');
             await click(screen.getByRole('button', { name: "C'est parti !" }));
             await click(screen.getByRole('button', { name: 'Continuer avec mon compte Pix' }));
 
             // when
-            await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-            await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+            await _loginUser(screen, prescritUser);
             await click(screen.getByRole('button', { name: 'Se connecter' }));
 
             const session = currentSession();
@@ -1006,8 +977,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
             await click(screen.getByRole('button', { name: 'Continuer avec mon compte Pix' }));
 
             // when
-            await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-            await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+            await _loginUser(screen, prescritUser);
             await click(screen.getByRole('button', { name: 'Se connecter' }));
 
             // then
@@ -1045,8 +1015,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
             await click(screen.getByRole('button', { name: 'Continuer avec mon compte Pix' }));
 
             // when
-            await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-            await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+            await _loginUser(screen, prescritUser);
             await click(screen.getByRole('button', { name: 'Se connecter' }));
 
             // then
@@ -1076,8 +1045,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
             await click(screen.getByRole('button', { name: 'Continuer avec mon compte Pix' }));
 
             // when
-            await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), prescritUser.email);
-            await fillIn(screen.getByLabelText('Mot de passe'), prescritUser.password);
+            await _loginUser(screen, prescritUser);
             await click(screen.getByRole('button', { name: 'Se connecter' }));
 
             // then
@@ -1124,6 +1092,7 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
 
               // when
               const screen = await visit(`/campagnes?externalUser=${externalUserToken}`);
+
               await fillIn(
                 screen.getByRole('textbox', { name: t('pages.fill-in-campaign-code.label') }),
                 campaign.code,
@@ -1131,30 +1100,22 @@ module('Acceptance | Campaigns | Start Campaigns workflow', function (hooks) {
               await click(screen.getByRole('button', { name: 'Accéder au parcours' }));
               await click(screen.getByRole('button', { name: 'Je commence' }));
 
-              await fillIn(screen.getByRole('textbox', { name: 'jour de naissance' }), '10');
-              await fillIn(screen.getByRole('textbox', { name: 'mois de naissance' }), '12');
-              await fillIn(screen.getByRole('textbox', { name: 'année de naissance' }), '2000');
+              await fillIn(screen.getByLabelText('jour de naissance'), '10');
+              await fillIn(screen.getByLabelText('mois de naissance'), '12');
+              await fillIn(screen.getByLabelText('année de naissance'), '2000');
               await click(screen.getByRole('button', { name: "C'est parti !" }));
               await click(screen.getByRole('button', { name: 'Continuer avec mon compte Pix' }));
-              await fillIn(
-                screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }),
-                userShouldChangePassword.username,
-              );
-
-              await fillIn(screen.getByLabelText('Mot de passe'), userShouldChangePassword.password);
+              await _loginUser(screen, {
+                email: userShouldChangePassword.username,
+                password: userShouldChangePassword.password,
+              });
               await click(screen.getByRole('button', { name: 'Se connecter' }));
 
               // then
               assert.strictEqual(currentURL(), '/mise-a-jour-mot-de-passe-expire');
 
               // when
-              await fillIn(
-                screen.getByLabelText(
-                  'Mot de passe (8 caractères minimum, dont une majuscule, une minuscule et un chiffre)',
-                  { exact: false },
-                ),
-                'newPass12345!',
-              );
+              await fillIn(screen.getByLabelText('Mot de passe', { exact: false }), 'newPass12345!');
               await click(screen.getByRole('button', { name: 'Réinitialiser' }));
               // eslint-disable-next-line ember/no-settled-after-test-helper
               await settled();
diff --git a/mon-pix/tests/acceptance/update-expired-password-test.js b/mon-pix/tests/acceptance/update-expired-password-test.js
index 40ea7491ec0..a01db94d69a 100644
--- a/mon-pix/tests/acceptance/update-expired-password-test.js
+++ b/mon-pix/tests/acceptance/update-expired-password-test.js
@@ -12,7 +12,7 @@ import setupIntl from '../helpers/setup-intl';
 
 const ApiErrorMessages = ENV.APP.API_ERROR_MESSAGES;
 
-const PASSWORD_INPUT_LABEL = '* Mot de passe (8 caractères minimum, dont une majuscule, une minuscule et un chiffre)';
+const PASSWORD_INPUT_LABEL = /Mot de passe/;
 
 module('Acceptance | Update Expired Password', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/mon-pix/tests/integration/components/account-recovery/backup-email-confirmation-form-test.js b/mon-pix/tests/integration/components/account-recovery/backup-email-confirmation-form-test.js
index 42b0f710c97..32ff012713d 100644
--- a/mon-pix/tests/integration/components/account-recovery/backup-email-confirmation-form-test.js
+++ b/mon-pix/tests/integration/components/account-recovery/backup-email-confirmation-form-test.js
@@ -55,7 +55,7 @@ module('Integration | Component | account-recovery::backup-email-confirmation-fo
       );
       assert.ok(
         screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email'),
+          name: new RegExp(t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email')),
         }),
       );
 
@@ -95,7 +95,7 @@ module('Integration | Component | account-recovery::backup-email-confirmation-fo
       );
       assert.ok(
         screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email'),
+          name: new RegExp(t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email')),
         }),
       );
       assert.notOk(
@@ -129,7 +129,7 @@ module('Integration | Component | account-recovery::backup-email-confirmation-fo
       // when
       await fillIn(
         screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email'),
+          name: new RegExp(t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email')),
         }),
         email,
       );
@@ -153,7 +153,7 @@ module('Integration | Component | account-recovery::backup-email-confirmation-fo
       // when
       await fillIn(
         screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email'),
+          name: new RegExp(t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email')),
         }),
         email,
       );
@@ -178,7 +178,7 @@ module('Integration | Component | account-recovery::backup-email-confirmation-fo
         hbs`<AccountRecovery::BackupEmailConfirmationForm @firstName={{this.firstName}} @resetErrors={{this.resetErrors}} />`,
       );
       const emailInput = screen.getByRole('textbox', {
-        name: t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email'),
+        name: new RegExp(t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email')),
       });
 
       // when
@@ -202,7 +202,7 @@ module('Integration | Component | account-recovery::backup-email-confirmation-fo
       );
 
       const emailInput = screen.getByRole('textbox', {
-        name: t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email'),
+        name: new RegExp(t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email')),
       });
 
       // when
@@ -234,7 +234,7 @@ module('Integration | Component | account-recovery::backup-email-confirmation-fo
       // when
       await fillIn(
         screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email'),
+          name: new RegExp(t('pages.account-recovery.find-sco-record.backup-email-confirmation.form.email')),
         }),
         email,
       );
diff --git a/mon-pix/tests/integration/components/account-recovery/confirmation-email-sent-test.js b/mon-pix/tests/integration/components/account-recovery/confirmation-email-sent-test.js
index 485aff23253..ffeadc29b0f 100644
--- a/mon-pix/tests/integration/components/account-recovery/confirmation-email-sent-test.js
+++ b/mon-pix/tests/integration/components/account-recovery/confirmation-email-sent-test.js
@@ -21,7 +21,11 @@ module('Integration | Component | account-recovery/confirmation-email-sent', fun
       )
       .exists();
     assert
-      .dom(screen.getByText(t('pages.account-recovery.find-sco-record.send-email-confirmation.send-email')))
+      .dom(
+        screen.getByText(t('pages.account-recovery.find-sco-record.send-email-confirmation.send-email'), {
+          exact: false,
+        }),
+      )
       .exists();
     assert
       .dom(screen.getByText(t('pages.account-recovery.find-sco-record.send-email-confirmation.check-spam')))
diff --git a/mon-pix/tests/integration/components/account-recovery/student-information-form-test.js b/mon-pix/tests/integration/components/account-recovery/student-information-form-test.js
index c58cc8326da..51331dcfbaf 100644
--- a/mon-pix/tests/integration/components/account-recovery/student-information-form-test.js
+++ b/mon-pix/tests/integration/components/account-recovery/student-information-form-test.js
@@ -56,21 +56,24 @@ module('Integration | Component | student-information-form', function (hooks) {
 
     // when
     await fillIn(
-      screen.getByRole('textbox', {
-        name: t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
+      screen.getByLabelText(t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'), {
+        exact: false,
       }),
       ine,
     );
     await fillIn(
-      screen.getByRole('textbox', {
-        name: t('pages.account-recovery.find-sco-record.student-information.form.first-name'),
+      screen.getByLabelText(t('pages.account-recovery.find-sco-record.student-information.form.first-name'), {
+        exact: false,
       }),
       firstName,
     );
     await fillIn(
-      screen.getByRole('textbox', {
-        name: t('pages.account-recovery.find-sco-record.student-information.form.last-name'),
-      }),
+      screen.getByLabelText(
+        new RegExp(t('pages.account-recovery.find-sco-record.student-information.form.last-name')),
+        {
+          exact: false,
+        },
+      ),
       lastName,
     );
     await fillIn(
@@ -113,9 +116,10 @@ module('Integration | Component | student-information-form', function (hooks) {
         // given
         const validIna = '1234567890A';
         const screen = await render(hbs`<AccountRecovery::StudentInformationForm />`);
-        const ineInaInput = screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
-        });
+        const ineInaInput = screen.getByLabelText(
+          t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
+          { exact: false },
+        );
 
         // when
         await fillIn(ineInaInput, validIna);
@@ -133,9 +137,10 @@ module('Integration | Component | student-information-form', function (hooks) {
         // given
         const validIna = '  1234567890A  ';
         const screen = await render(hbs`<AccountRecovery::StudentInformationForm />`);
-        const ineInaInput = screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
-        });
+        const ineInaInput = screen.getByLabelText(
+          t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
+          { exact: false },
+        );
 
         // when
         await fillIn(ineInaInput, validIna);
@@ -155,9 +160,10 @@ module('Integration | Component | student-information-form', function (hooks) {
         // given
         const invalidIneIna = '123ABCDEF';
         const screen = await render(hbs`<AccountRecovery::StudentInformationForm />`);
-        const ineInaInput = screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
-        });
+        const ineInaInput = screen.getByLabelText(
+          t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
+          { exact: false },
+        );
 
         // when
         await fillIn(ineInaInput, invalidIneIna);
@@ -175,9 +181,10 @@ module('Integration | Component | student-information-form', function (hooks) {
         // given
         const emptyIneIna = '     ';
         const screen = await render(hbs`<AccountRecovery::StudentInformationForm />`);
-        const ineInaInput = screen.getByRole('textbox', {
-          name: t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
-        });
+        const ineInaInput = screen.getByLabelText(
+          t('pages.account-recovery.find-sco-record.student-information.form.ine-ina'),
+          { exact: false },
+        );
 
         // when
         await fillIn(ineInaInput, emptyIneIna);
@@ -196,9 +203,10 @@ module('Integration | Component | student-information-form', function (hooks) {
       // given
       const emptyLastName = '     ';
       const screen = await render(hbs`<AccountRecovery::StudentInformationForm />`);
-      const lastNameInput = screen.getByRole('textbox', {
-        name: t('pages.account-recovery.find-sco-record.student-information.form.last-name'),
-      });
+      const lastNameInput = screen.getByLabelText(
+        new RegExp(t('pages.account-recovery.find-sco-record.student-information.form.last-name')),
+        { exact: false },
+      );
 
       // when
       await fillIn(lastNameInput, emptyLastName);
@@ -216,9 +224,10 @@ module('Integration | Component | student-information-form', function (hooks) {
       // given
       const emptyFirstName = '     ';
       const screen = await render(hbs`<AccountRecovery::StudentInformationForm />`);
-      const firstNameInput = screen.getByRole('textbox', {
-        name: t('pages.account-recovery.find-sco-record.student-information.form.first-name'),
-      });
+      const firstNameInput = screen.getByLabelText(
+        t('pages.account-recovery.find-sco-record.student-information.form.first-name'),
+        { exact: false },
+      );
 
       // when
       await fillIn(firstNameInput, emptyFirstName);
diff --git a/mon-pix/tests/integration/components/account-recovery/update-sco-record-form-test.js b/mon-pix/tests/integration/components/account-recovery/update-sco-record-form-test.js
index a007e10ae60..eea9a617df5 100644
--- a/mon-pix/tests/integration/components/account-recovery/update-sco-record-form-test.js
+++ b/mon-pix/tests/integration/components/account-recovery/update-sco-record-form-test.js
@@ -15,7 +15,6 @@ module('Integration | Component | account-recovery | update-sco-record', functio
     const firstName = 'Philippe';
     this.set('firstName', firstName);
     this.set('email', newEmail);
-
     // when
     const screen = await render(
       hbs`<AccountRecovery::UpdateScoRecordForm @firstName={{this.firstName}} @email={{this.email}} />`,
@@ -27,9 +26,16 @@ module('Integration | Component | account-recovery | update-sco-record', functio
         name: t('pages.account-recovery.update-sco-record.welcome-message', { firstName }),
       }),
     );
-    assert.ok(screen.getByText(t('pages.account-recovery.update-sco-record.fill-password')));
-    assert.ok(screen.getByRole('textbox', { name: t('pages.account-recovery.update-sco-record.form.email-label') }));
-    assert.ok(screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label')));
+    assert.ok(screen.getByText(t('pages.account-recovery.update-sco-record.fill-password'), { exact: false }));
+    assert.ok(
+      screen.getByRole('textbox', {
+        name: t('pages.account-recovery.update-sco-record.form.email-label'),
+        exact: false,
+      }),
+    );
+    assert.ok(
+      screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), { exact: false }),
+    );
 
     const submitButton = screen.getByRole('button', {
       name: t('pages.account-recovery.update-sco-record.form.login-button'),
@@ -48,7 +54,10 @@ module('Integration | Component | account-recovery | update-sco-record', functio
       const screen = await render(hbs`<AccountRecovery::UpdateScoRecordForm />`);
 
       // when
-      await fillIn(screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label')), 'pass');
+      await fillIn(
+        screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), { exact: false }),
+        'pass',
+      );
 
       // then
       const submitButton = screen.getByRole('button', {
@@ -63,7 +72,7 @@ module('Integration | Component | account-recovery | update-sco-record', functio
 
       // when
       await fillIn(
-        screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label')),
+        screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), { exact: false }),
         'pix123A*',
       );
 
@@ -80,7 +89,7 @@ module('Integration | Component | account-recovery | update-sco-record', functio
 
       // when
       await fillIn(
-        screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label')),
+        screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), { exact: false }),
         'pix123A*',
       );
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
@@ -98,7 +107,7 @@ module('Integration | Component | account-recovery | update-sco-record', functio
 
       // when
       await fillIn(
-        screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label')),
+        screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), { exact: false }),
         'pix123A*',
       );
       await click(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
@@ -117,7 +126,9 @@ module('Integration | Component | account-recovery | update-sco-record', functio
         // given
         const validPassword = 'pix123A*';
         const screen = await render(hbs`<AccountRecovery::UpdateScoRecordForm />`);
-        const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'));
+        const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+          exact: false,
+        });
 
         // when
         await fillIn(passwordInput, validPassword);
@@ -140,7 +151,9 @@ module('Integration | Component | account-recovery | update-sco-record', functio
         const screen = await render(
           hbs`<AccountRecovery::UpdateScoRecordForm @firstName={{this.firstName}} @email={{this.email}} />`,
         );
-        const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'));
+        const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+          exact: false,
+        });
 
         // when
         await fillIn(passwordInput, invalidPassword);
@@ -154,7 +167,9 @@ module('Integration | Component | account-recovery | update-sco-record', functio
         // given
         const password = '';
         const screen = await render(hbs`<AccountRecovery::UpdateScoRecordForm />`);
-        const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'));
+        const passwordInput = screen.getByLabelText(t('pages.account-recovery.update-sco-record.form.password-label'), {
+          exact: false,
+        });
 
         // when
         await fillIn(passwordInput, password);
diff --git a/mon-pix/tests/integration/components/campaign/invited/learner-reconciliation-test.js b/mon-pix/tests/integration/components/campaign/invited/learner-reconciliation-test.js
index 1fbc7841ae2..629c8849e9e 100644
--- a/mon-pix/tests/integration/components/campaign/invited/learner-reconciliation-test.js
+++ b/mon-pix/tests/integration/components/campaign/invited/learner-reconciliation-test.js
@@ -199,7 +199,7 @@ module('Integration | Component | Campaign | Invited | learner-reconciliation',
         hbs`<Campaigns::Invited::LearnerReconciliation
   @reconciliationFields={{this.reconciliationFields}}
   @organizationName={{this.organizationName}}
-  @reconciliationError={{'Une erreur!!!'}}
+  @reconciliationError='Une erreur!!!'
   @mappingFields={{this.mappingFields}}
   @onSubmit={{this.onSubmit}}
 />`,
diff --git a/mon-pix/tests/integration/components/form-textfield-date-test.js b/mon-pix/tests/integration/components/form-textfield-date-test.js
index 4643b174e9c..d2bad8c1e35 100644
--- a/mon-pix/tests/integration/components/form-textfield-date-test.js
+++ b/mon-pix/tests/integration/components/form-textfield-date-test.js
@@ -13,13 +13,6 @@ module('Integration | Component | form textfield date', function (hooks) {
   const LABEL_TEXT = 'date';
 
   const MESSAGE = '.form-textfield__message';
-  const MESSAGE_ERROR_STATUS = 'form-textfield__message--error';
-  const MESSAGE_SUCCESS_STATUS = 'form-textfield__message--success';
-
-  const INPUT = '.form-textfield__input';
-  const INPUT_DEFAULT_CLASS = 'form-textfield__input--default';
-  const INPUT_SUCCESS_CLASS = 'form-textfield__input--success';
-  const INPUT_ERROR_CLASS = 'form-textfield__input--error';
 
   module('#Component rendering', function (hooks) {
     hooks.beforeEach(async function () {
@@ -34,7 +27,7 @@ module('Integration | Component | form textfield date', function (hooks) {
       this.set('monthValidationMessage', 'month message');
       this.set('yearValidationMessage', 'year message');
       this.set('validateStub', () => {});
-
+      this.set('handleInputStub', () => {});
       // When
       await render(hbs`<FormTextfieldDate
   @label={{this.label}}
@@ -50,21 +43,12 @@ module('Integration | Component | form textfield date', function (hooks) {
   @onValidateDay={{this.validateStub}}
   @onValidateMonth={{this.validateStub}}
   @onValidateYear={{this.validateStub}}
+  @onDayInput={{this.handleInputStub}}
+  @onMonthInput={{this.handleInputStub}}
+  @onYearInput={{this.handleInputStub}}
 />`);
     });
 
-    [
-      { expectedRendering: 'label', item: LABEL, expectedLength: 1 },
-      { expectedRendering: 'div', item: MESSAGE, expectedLength: 3 },
-      { expectedRendering: 'input', item: INPUT, expectedLength: 3 },
-    ].forEach(function ({ expectedRendering, item, expectedLength }) {
-      test(`Should render a ${expectedRendering}`, function (assert) {
-        // Then
-        assert.dom(item).exists({ count: expectedLength });
-        assert.strictEqual(find(item).nodeName, expectedRendering.toUpperCase());
-      });
-    });
-
     [
       { item: LABEL, expectedRendering: 'label', expectedText: LABEL_TEXT },
       { item: `${MESSAGE}#dayValidationMessage`, expectedRendering: 'div.message', expectedText: 'day message' },
@@ -100,12 +84,21 @@ module('Integration | Component | form textfield date', function (hooks) {
       this.set('dayOfBirth', inputValueToValidate['day']);
       this.set('monthOfBirth', inputValueToValidate['month']);
       this.set('yearOfBirth', inputValueToValidate['year']);
+      this.set('handleDayInput', (event) => {
+        this.set('dayOfBirth', event.target.value);
+      });
+      this.set('handleMonthInput', (event) => {
+        this.set('monthOfBirth', event.target.value);
+      });
+      this.set('handleYearInput', (event) => {
+        this.set('yearOfBirth', event.target.value);
+      });
 
       await render(hbs`<FormTextfieldDate
   @label={{this.label}}
-  @dayInputBindingValue={{this.dayOfBirth}}
-  @monthInputBindingValue={{this.monthOfBirth}}
-  @yearInputBindingValue={{this.yearOfBirth}}
+  @dayValue={{this.dayOfBirth}}
+  @monthValue={{this.monthOfBirth}}
+  @yearValue={{this.yearOfBirth}}
   @dayValidationStatus={{this.dayValidationStatus}}
   @monthValidationStatus={{this.monthValidationStatus}}
   @yearValidationStatus={{this.yearValidationStatus}}
@@ -118,6 +111,9 @@ module('Integration | Component | form textfield date', function (hooks) {
   @onValidateDay={{this.validateStub}}
   @onValidateMonth={{this.validateStub}}
   @onValidateYear={{this.validateStub}}
+  @onDayInput={{this.handleDayInput}}
+  @onMonthInput={{this.handleMonthInput}}
+  @onYearInput={{this.handleYearInput}}
 />`);
 
       // when
@@ -136,152 +132,5 @@ module('Integration | Component | form textfield date', function (hooks) {
       assert.true(isActionValidateHandled.year);
       assert.deepEqual(inputValueToValidate, expectedInputValue);
     });
-
-    module('#When validationStatus gets "default", Component should ', function (hooks) {
-      hooks.beforeEach(async function () {
-        this.set('label', 'date');
-        this.set('dayValidationStatus', 'default');
-        this.set('monthValidationStatus', 'default');
-        this.set('yearValidationStatus', 'default');
-        this.set('dayTextfieldName', 'day');
-        this.set('monthTextfieldName', 'month');
-        this.set('yearTextfieldName', 'year');
-        this.set('dayValidationMessage', '');
-        this.set('monthValidationMessage', '');
-        this.set('yearValidationMessage', '');
-        this.set('validateStub', () => {});
-
-        // When
-        await render(hbs`<FormTextfieldDate
-  @label={{this.label}}
-  @dayValidationStatus={{this.dayValidationStatus}}
-  @monthValidationStatus={{this.monthValidationStatus}}
-  @yearValidationStatus={{this.yearValidationStatus}}
-  @dayValidationMessage={{this.dayValidationMessage}}
-  @monthValidationMessage={{this.monthValidationMessage}}
-  @yearValidationMessage={{this.yearValidationMessage}}
-  @dayTextfieldName={{this.dayTextfieldName}}
-  @monthTextfieldName={{this.monthTextfieldName}}
-  @yearTextfieldName={{this.yearTextfieldName}}
-  @onValidateDay={{this.validateStub}}
-  @onValidateMonth={{this.validateStub}}
-  @onValidateYear={{this.validateStub}}
-/>`);
-      });
-
-      test("return true if any svg doesn't exist", function (assert) {
-        // then
-        assert.dom('img').doesNotExist();
-      });
-
-      test(`contain an input with an additional class ${INPUT_DEFAULT_CLASS}`, function (assert) {
-        const input = find(INPUT);
-        // then
-        assert.ok(input.getAttribute('class').includes(INPUT_DEFAULT_CLASS));
-        assert.ok(input.value.includes(''));
-      });
-
-      test('should not show a div for message validation status when validationStatus is default', function (assert) {
-        // then
-        assert.dom(MESSAGE).doesNotExist();
-      });
-    });
-
-    module('#When validationStatus gets "error", Component should ', function (hooks) {
-      hooks.beforeEach(async function () {
-        this.set('label', 'date');
-        this.set('dayValidationStatus', 'error');
-        this.set('monthValidationStatus', 'error');
-        this.set('yearValidationStatus', 'error');
-        this.set('dayTextfieldName', 'day');
-        this.set('monthTextfieldName', 'month');
-        this.set('yearTextfieldName', 'year');
-        this.set('dayValidationMessage', 'day message');
-        this.set('monthValidationMessage', 'month message');
-        this.set('yearValidationMessage', 'year message');
-        this.set('validateStub', () => {});
-
-        // When
-        await render(hbs`<FormTextfieldDate
-  @label={{this.label}}
-  @dayValidationStatus={{this.dayValidationStatus}}
-  @monthValidationStatus={{this.monthValidationStatus}}
-  @yearValidationStatus={{this.yearValidationStatus}}
-  @dayValidationMessage={{this.dayValidationMessage}}
-  @monthValidationMessage={{this.monthValidationMessage}}
-  @yearValidationMessage={{this.yearValidationMessage}}
-  @dayTextfieldName={{this.dayTextfieldName}}
-  @monthTextfieldName={{this.monthTextfieldName}}
-  @yearTextfieldName={{this.yearTextfieldName}}
-  @onValidateDay={{this.validateStub}}
-  @onValidateMonth={{this.validateStub}}
-  @onValidateYear={{this.validateStub}}
-/>`);
-      });
-
-      test('return true if any img does exist', function (assert) {
-        // then
-        assert.dom('img').exists({ count: 3 });
-        assert.ok(find('img').getAttribute('class').includes('form-textfield-icon__state--error'));
-      });
-
-      [
-        { item: 'Input', itemSelector: INPUT, expectedClass: INPUT_ERROR_CLASS },
-        { item: 'Div for message validation status', itemSelector: MESSAGE, expectedClass: MESSAGE_ERROR_STATUS },
-      ].forEach(({ item, itemSelector, expectedClass }) => {
-        test(`contain an ${item} with an additional class ${expectedClass}`, function (assert) {
-          // then
-          assert.ok(find(itemSelector).getAttribute('class').includes(expectedClass));
-        });
-      });
-    });
-
-    module('#When validationStatus gets "success", Component should ', function (hooks) {
-      hooks.beforeEach(async function () {
-        this.set('label', 'date');
-        this.set('dayValidationStatus', 'success');
-        this.set('monthValidationStatus', 'success');
-        this.set('yearValidationStatus', 'success');
-        this.set('dayTextfieldName', 'day');
-        this.set('monthTextfieldName', 'month');
-        this.set('dayValidationMessage', 'day message');
-        this.set('monthValidationMessage', 'month message');
-        this.set('yearValidationMessage', 'year message');
-        this.set('validateStub', () => {});
-
-        // When
-        await render(hbs`<FormTextfieldDate
-  @label={{this.label}}
-  @dayValidationStatus={{this.dayValidationStatus}}
-  @monthValidationStatus={{this.monthValidationStatus}}
-  @yearValidationStatus={{this.yearValidationStatus}}
-  @dayValidationMessage={{this.dayValidationMessage}}
-  @monthValidationMessage={{this.monthValidationMessage}}
-  @yearValidationMessage={{this.yearValidationMessage}}
-  @dayTextfieldName={{this.dayTextfieldName}}
-  @monthTextfieldName={{this.monthTextfieldName}}
-  @yearTextfieldName={{this.yearTextfieldName}}
-  @onValidateDay={{this.validateStub}}
-  @onValidateMonth={{this.validateStub}}
-  @onValidateYear={{this.validateStub}}
-/>`);
-      });
-
-      test('return true if any img does exist', function (assert) {
-        // then
-        assert.dom('img').exists({ count: 3 });
-        assert.ok(find('img').getAttribute('class').includes('form-textfield-icon__state--success'));
-      });
-
-      [
-        { item: 'Input', itemSelector: INPUT, expectedClass: INPUT_SUCCESS_CLASS },
-        { item: 'Div for message validation status', itemSelector: MESSAGE, expectedClass: MESSAGE_SUCCESS_STATUS },
-      ].forEach(({ item, itemSelector, expectedClass }) => {
-        test(`contain an ${item} with an additional class ${expectedClass}`, function (assert) {
-          // then
-          assert.ok(find(itemSelector).getAttribute('class').includes(expectedClass));
-        });
-      });
-    });
   });
 });
diff --git a/mon-pix/tests/integration/components/form-textfield-test.js b/mon-pix/tests/integration/components/form-textfield-test.js
deleted file mode 100644
index 8346ba9dd4c..00000000000
--- a/mon-pix/tests/integration/components/form-textfield-test.js
+++ /dev/null
@@ -1,260 +0,0 @@
-import { render } from '@1024pix/ember-testing-library';
-// eslint-disable-next-line no-restricted-imports
-import { click, fillIn, find, triggerEvent } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { t } from 'ember-intl/test-support';
-import { module, test } from 'qunit';
-
-import setupIntlRenderingTest from '../../helpers/setup-intl-rendering';
-
-module('Integration | Component | form textfield', function (hooks) {
-  setupIntlRenderingTest(hooks);
-
-  const LABEL = '.form-textfield__label';
-  const LABEL_TEXT = 'NOM';
-
-  const MESSAGE = '.form-textfield__message';
-  const MESSAGE_ERROR_STATUS = 'form-textfield__message--error';
-  const MESSAGE_SUCCESS_STATUS = 'form-textfield__message--success';
-  const MESSAGE_TEXT = 'MESSAGE';
-
-  const INPUT = '.form-textfield__input';
-  const INPUT_DEFAULT_CLASS = 'form-textfield__input--default';
-  const INPUT_SUCCESS_CLASS = 'form-textfield__input--success';
-  const INPUT_ERROR_CLASS = 'form-textfield__input--error';
-
-  module('#Component rendering', function (hooks) {
-    hooks.beforeEach(async function () {
-      this.set('label', 'nom');
-      this.set('validationStatus', '');
-      this.set('validationMessage', MESSAGE_TEXT);
-      this.set('textfieldName', 'firstname');
-
-      // When
-      await render(
-        hbs`<FormTextfield
-  @label={{this.label}}
-  @validationStatus={{this.validationStatus}}
-  @validationMessage={{this.validationMessage}}
-  @textfieldName={{this.textfieldName}}
-/>`,
-      );
-    });
-
-    [
-      { expectedRendering: 'label', item: LABEL, expectedLength: 1 },
-      { expectedRendering: 'div', item: MESSAGE, expectedLength: 1 },
-      { expectedRendering: 'input', item: INPUT, expectedLength: 1 },
-    ].forEach(function ({ expectedRendering, item, expectedLength }) {
-      test(`should render a ${expectedRendering}`, function (assert) {
-        // Then
-        assert.dom(item).exists({ count: expectedLength });
-        assert.strictEqual(find(item).nodeName, expectedRendering.toUpperCase());
-      });
-    });
-
-    [
-      { item: LABEL, expectedRendering: 'label', expectedText: LABEL_TEXT },
-      { item: MESSAGE, expectedRendering: 'div.message', expectedText: MESSAGE_TEXT },
-    ].forEach(function ({ item, expectedRendering, expectedText }) {
-      test(`should render a ${expectedRendering}`, function (assert) {
-        // Then
-        assert.ok(find(item).textContent.toUpperCase().includes(expectedText));
-      });
-    });
-  });
-
-  module('#Component Interactions', function () {
-    test('should handle action <validate> when input lost focus', async function (assert) {
-      // given
-      let isActionValidateHandled = false;
-      let inputValueToValidate;
-      const expectedInputValue = 'firstname';
-
-      this.set('validate', function (arg) {
-        isActionValidateHandled = true;
-        inputValueToValidate = arg;
-      });
-
-      this.set('label', 'nom');
-      this.set('validationStatus', '');
-      this.set('validationMessage', 'message');
-      this.set('textfieldName', 'firstname');
-
-      await render(
-        hbs`<FormTextfield
-  @label={{this.label}}
-  @validationStatus={{this.validationStatus}}
-  @validationMessage={{this.validationMessage}}
-  @textfieldName={{this.textfieldName}}
-  @onValidate={{this.validate}}
-/>`,
-      );
-
-      // when
-      await fillIn(INPUT, 'pix');
-      await triggerEvent(INPUT, 'focusout');
-
-      // then
-      assert.true(isActionValidateHandled);
-      assert.deepEqual(inputValueToValidate, expectedInputValue);
-    });
-
-    module('#When validationStatus gets "default", Component should ', function (hooks) {
-      hooks.beforeEach(async function () {
-        this.set('label', 'nom');
-        this.set('validationStatus', 'default');
-        this.set('textfieldName', 'firstname');
-        this.set('validationMessage', 'message');
-
-        // When
-        await render(
-          hbs`<FormTextfield
-  @label={{this.label}}
-  @validationStatus={{this.validationStatus}}
-  @validationMessage={{this.validationMessage}}
-  @textfieldName={{this.textfieldName}}
-/>`,
-        );
-      });
-
-      test("return true if any svg doesn't exist", function (assert) {
-        // then
-        assert.dom('img').doesNotExist();
-      });
-
-      test(`contain an input with an additional class ${INPUT_DEFAULT_CLASS}`, function (assert) {
-        const input = find(INPUT);
-        // then
-        assert.ok(input.getAttribute('class').includes(INPUT_DEFAULT_CLASS));
-        assert.ok(input.value.includes(''));
-      });
-    });
-
-    module('#When validationStatus gets "error", Component should ', function (hooks) {
-      hooks.beforeEach(async function () {
-        this.set('label', 'nom');
-        this.set('validationStatus', 'error');
-        this.set('textfieldName', 'firstname');
-        this.set('validationMessage', 'message');
-
-        // When
-        await render(
-          hbs`<FormTextfield
-  @label={{this.label}}
-  @validationStatus={{this.validationStatus}}
-  @validationMessage={{this.validationMessage}}
-  @textfieldName={{this.textfieldName}}
-/>`,
-        );
-      });
-
-      test('return true if any img does exist', function (assert) {
-        // then
-        assert.dom('img').exists({ count: 1 });
-        assert.ok(find('img').getAttribute('class').includes('form-textfield-icon__state--error'));
-      });
-
-      [
-        { item: 'Input', itemSelector: INPUT, expectedClass: INPUT_ERROR_CLASS },
-        { item: 'Div for message validation status', itemSelector: MESSAGE, expectedClass: MESSAGE_ERROR_STATUS },
-      ].forEach(({ item, itemSelector, expectedClass }) => {
-        test(`contain an ${item} with an additional class ${expectedClass}`, function (assert) {
-          // then
-          assert.ok(find(itemSelector).getAttribute('class').includes(expectedClass));
-        });
-      });
-    });
-
-    module('#When validationStatus gets "success", Component should ', function (hooks) {
-      hooks.beforeEach(async function () {
-        this.set('label', 'nom');
-        this.set('validationStatus', 'success');
-        this.set('validationMessage', 'message');
-        this.set('textfieldName', 'firstname');
-
-        // When
-        await render(
-          hbs`<FormTextfield
-  @label={{this.label}}
-  @validationStatus={{this.validationStatus}}
-  @validationMessage={{this.validationMessage}}
-  @textfieldName={{this.textfieldName}}
-/>`,
-        );
-      });
-
-      test('return true if any img does exist', function (assert) {
-        // then
-        assert.dom('img').exists({ count: 1 });
-        assert.ok(find('img').getAttribute('class').includes('form-textfield-icon__state--success'));
-      });
-
-      [
-        { item: 'Input', itemSelector: INPUT, expectedClass: INPUT_SUCCESS_CLASS },
-        { item: 'Div for message validation status', itemSelector: MESSAGE, expectedClass: MESSAGE_SUCCESS_STATUS },
-      ].forEach(({ item, itemSelector, expectedClass }) => {
-        test(`contain an ${item} with an additional class ${expectedClass}`, function (assert) {
-          // then
-          assert.ok(find(itemSelector).getAttribute('class').includes(expectedClass));
-        });
-      });
-    });
-
-    module('#When password is hidden', function () {
-      test('should change type when user click on eye icon', async function (assert) {
-        // given
-        this.set('label', 'Mot de passe');
-        this.set('validationStatus', 'default');
-        this.set('validationMessage', 'message');
-        this.set('textfieldName', 'password');
-
-        // given
-        const screen = await render(
-          hbs`<FormTextfield
-  @label={{this.label}}
-  @validationStatus={{this.validationStatus}}
-  @validationMessage={{this.validationMessage}}
-  @textfieldName={{this.textfieldName}}
-  @inputValue={{this.inputValue}}
-/>`,
-        );
-
-        // when
-        await click(screen.getByRole('button', { name: t('common.form.visible-password') }));
-
-        // then
-        assert.strictEqual(find('input').getAttribute('type'), 'text');
-      });
-
-      test('should change icon when user click on it', async function (assert) {
-        // given
-        this.set('label', 'Mot de passe');
-        this.set('validationStatus', 'default');
-        this.set('validationMessage', 'message');
-        this.set('textfieldName', 'password');
-
-        // given
-        const screen = await render(
-          hbs`<FormTextfield
-  @label={{this.label}}
-  @validationStatus={{this.validationStatus}}
-  @validationMessage={{this.validationMessage}}
-  @textfieldName={{this.textfieldName}}
-  @inputValue={{this.inputValue}}
-/>`,
-        );
-
-        // when
-        const displayPasswordButton = screen.getByRole('button', { name: t('common.form.visible-password') });
-        await click(displayPasswordButton);
-
-        // then
-        const hidePasswordButton = screen.getByRole('button', {
-          name: t('common.form.invisible-password'),
-        });
-        assert.dom(hidePasswordButton).exists();
-      });
-    });
-  });
-});
diff --git a/mon-pix/tests/integration/components/levelup-notif-test.js b/mon-pix/tests/integration/components/levelup-notif-test.js
index e298cbd2479..74e7d2221ee 100644
--- a/mon-pix/tests/integration/components/levelup-notif-test.js
+++ b/mon-pix/tests/integration/components/levelup-notif-test.js
@@ -20,6 +20,8 @@ module('Integration | Component | levelup-notif', function (hooks) {
 
   test('displays the new reached level and associated competence name', async function (assert) {
     // given
+    await render(hbs`<LevelupNotif />`);
+
     this.set('newLevel', 2);
     this.set('model', {
       title: "Mener une recherche et une veille d'information",
diff --git a/mon-pix/tests/integration/components/routes/login-form-test.js b/mon-pix/tests/integration/components/routes/login-form-test.js
index cb1c6602c92..15196db9454 100644
--- a/mon-pix/tests/integration/components/routes/login-form-test.js
+++ b/mon-pix/tests/integration/components/routes/login-form-test.js
@@ -1,4 +1,4 @@
-import { fillByLabel, render } from '@1024pix/ember-testing-library';
+import { render } from '@1024pix/ember-testing-library';
 import Service from '@ember/service';
 import { click, fillIn } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
@@ -17,8 +17,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
     const screen = await render(hbs`<Routes::LoginForm />`);
 
     // then
-    assert.dom(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' })).exists();
-    assert.dom(screen.getByLabelText('Mot de passe')).exists();
+    assert.dom(screen.getByRole('textbox', { name: /Adresse e-mail ou identifiant/ })).exists();
+    assert.dom(screen.getByLabelText(/Mot de passe/)).exists();
   });
 
   test('should display an error message when authentication fails', async function (assert) {
@@ -34,8 +34,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
     sessionStub.authenticate.rejects(errorResponse);
 
     const screen = await render(hbs`<Routes::LoginForm />`);
-    await fillByLabel('Adresse e-mail ou identifiant', 'pix@example.net');
-    await fillByLabel('Mot de passe', 'Mauvais mot de passe');
+    await fillIn(screen.getByLabelText(/Adresse e-mail ou identifiant/), 'pix@example.net');
+    await fillIn(screen.getByLabelText(/Mot de passe/), 'Mauvais mot de passe');
 
     //  when
     await click(screen.getByRole('button', { name: t('pages.login-or-register.login-form.button') }));
@@ -47,7 +47,7 @@ module('Integration | Component | routes/login-form', function (hooks) {
   test('should display password when user click', async function (assert) {
     // given
     const screen = await render(hbs`<Routes::LoginForm />`);
-    const passwordInput = screen.getByLabelText('Mot de passe');
+    const passwordInput = screen.getByLabelText(/Mot de passe/);
     await fillIn(passwordInput, 'pix123');
 
     // when
@@ -65,8 +65,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
 
       // when
       const screen = await render(hbs`<Routes::LoginForm />`);
-      await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), 'pix@example.net');
-      await fillIn(screen.getByLabelText('Mot de passe'), 'JeMeLoggue1024');
+      await fillIn(screen.getByRole('textbox', { name: /Adresse e-mail ou identifiant/ }), 'pix@example.net');
+      await fillIn(screen.getByLabelText(/Mot de passe/), 'JeMeLoggue1024');
       await click(screen.getByRole('button', { name: t('pages.login-or-register.login-form.button') }));
 
       // then
@@ -87,8 +87,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
 
       //  when
       const screen = await render(hbs`<Routes::LoginForm />`);
-      await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), 'pix@example.net');
-      await fillIn(screen.getByLabelText('Mot de passe'), 'JeMeLoggue1024');
+      await fillIn(screen.getByRole('textbox', { name: /Adresse e-mail ou identifiant/ }), 'pix@example.net');
+      await fillIn(screen.getByLabelText(/Mot de passe/), 'JeMeLoggue1024');
       await click(screen.getByRole('button', { name: t('pages.login-or-register.login-form.button') }));
 
       // then
@@ -128,8 +128,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
 
       // when
       const screen = await render(hbs`<Routes::LoginForm />`);
-      await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), 'pix@example.net');
-      await fillIn(screen.getByLabelText('Mot de passe'), 'Mauvais mot de passe');
+      await fillIn(screen.getByRole('textbox', { name: /Adresse e-mail ou identifiant/ }), 'pix@example.net');
+      await fillIn(screen.getByLabelText(/Mot de passe/), 'Mauvais mot de passe');
       await click(screen.getByRole('button', { name: t('pages.login-or-register.login-form.button') }));
 
       // then
@@ -178,8 +178,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
         hbs`<Routes::LoginForm @addGarAuthenticationMethodToUser={{this.addGarAuthenticationMethodToUser}} />`,
       );
 
-      await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), 'pix@example.net');
-      await fillIn(screen.getByLabelText('Mot de passe'), 'JeMeLoggue1024');
+      await fillIn(screen.getByRole('textbox', { name: /Adresse e-mail ou identifiant/ }), 'pix@example.net');
+      await fillIn(screen.getByLabelText(/Mot de passe/), 'JeMeLoggue1024');
 
       // when
       await click(screen.getByRole('button', { name: t('pages.login-or-register.login-form.button') }));
@@ -208,8 +208,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
         hbs`<Routes::LoginForm @addGarAuthenticationMethodToUser={{this.addGarAuthenticationMethodToUser}} />`,
       );
 
-      await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), 'pix@example.net');
-      await fillIn(screen.getByLabelText('Mot de passe'), 'JeMeLoggue1024');
+      await fillIn(screen.getByRole('textbox', { name: /Adresse e-mail ou identifiant/ }), 'pix@example.net');
+      await fillIn(screen.getByLabelText(/Mot de passe/), 'JeMeLoggue1024');
 
       // when
       await click(screen.getByRole('button', { name: t('pages.login-or-register.login-form.button') }));
@@ -242,8 +242,8 @@ module('Integration | Component | routes/login-form', function (hooks) {
         hbs`<Routes::LoginForm @addGarAuthenticationMethodToUser={{this.addGarAuthenticationMethodToUser}} />`,
       );
 
-      await fillIn(screen.getByRole('textbox', { name: 'Adresse e-mail ou identifiant' }), 'pix@example.net');
-      await fillIn(screen.getByLabelText('Mot de passe'), 'JeMeLoggue1024');
+      await fillIn(screen.getByRole('textbox', { name: /Adresse e-mail ou identifiant/ }), 'pix@example.net');
+      await fillIn(screen.getByLabelText(/Mot de passe/), 'JeMeLoggue1024');
 
       // when
       await click(screen.getByRole('button', { name: t('pages.login-or-register.login-form.button') }));
diff --git a/mon-pix/tests/integration/components/routes/register-form-test.js b/mon-pix/tests/integration/components/routes/register-form-test.js
index f32f98ed1d1..71ed316a4b4 100644
--- a/mon-pix/tests/integration/components/routes/register-form-test.js
+++ b/mon-pix/tests/integration/components/routes/register-form-test.js
@@ -10,8 +10,8 @@ import ENV from '../../../../config/environment';
 import { stubSessionService } from '../../../helpers/service-stubs.js';
 import setupIntlRenderingTest from '../../../helpers/setup-intl-rendering';
 
-const EMAIL_INPUT_LABEL = '* Adresse e-mail (ex: nom@exemple.fr)';
-const PASSWORD_INPUT_LABEL = '* Mot de passe (8 caractères minimum, dont une majuscule, une minuscule et un chiffre)';
+const EMAIL_INPUT_LABEL = 'Adresse e-mail';
+const PASSWORD_INPUT_LABEL = 'Mot de passe';
 
 const EMPTY_FIRSTNAME_ERROR_MESSAGE = 'Votre prénom n’est pas renseigné.';
 const EMPTY_LASTNAME_ERROR_MESSAGE = 'Votre nom n’est pas renseigné.';
@@ -77,8 +77,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
 
       await click(screen.getByText('Mon adresse e-mail'));
 
-      await fillIn(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), 'shi@fu.me');
-      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'Mypassword1');
+      await fillIn(screen.getByLabelText(EMAIL_INPUT_LABEL, { exact: false }), 'shi@fu.me');
+      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'Mypassword1');
 
       // when
       await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
@@ -98,7 +98,7 @@ module('Integration | Component | routes/register-form', function (hooks) {
 
       await fillInputReconciliationForm({ screen, t });
       await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
-      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'Mypassword1');
+      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'Mypassword1');
 
       // when
       await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
@@ -134,8 +134,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
           const screen = await render(hbs`<Routes::RegisterForm />`);
 
           // when
-          await fillIn(screen.getByRole('textbox', { name: '* Prénom' }), stringFilledIn);
-          await triggerEvent(screen.getByRole('textbox', { name: '* Prénom' }), 'focusout');
+          await fillIn(screen.getByLabelText(/Prénom/, { exact: false }), stringFilledIn);
+          await triggerEvent(screen.getByLabelText(/Prénom/, { exact: false }), 'focusout');
 
           // then
           assert.dom(screen.getByText(EMPTY_FIRSTNAME_ERROR_MESSAGE)).exists();
@@ -148,8 +148,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
           const screen = await render(hbs`<Routes::RegisterForm />`);
 
           // when
-          await fillIn(screen.getByRole('textbox', { name: '* Nom' }), stringFilledIn);
-          await triggerEvent(screen.getByRole('textbox', { name: '* Nom' }), 'focusout');
+          await fillIn(screen.getByLabelText(/Nom/, { exact: false }), stringFilledIn);
+          await triggerEvent(screen.getByLabelText(/Nom/, { exact: false }), 'focusout');
 
           // then
           assert.dom(screen.getByText(EMPTY_LASTNAME_ERROR_MESSAGE)).exists();
@@ -216,8 +216,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
 
           // when
           await click(screen.getByText('Mon adresse e-mail'));
-          await fillIn(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), stringFilledIn);
-          await triggerEvent(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), 'focusout');
+          await fillIn(screen.getByLabelText(EMAIL_INPUT_LABEL, { exact: false }), stringFilledIn);
+          await triggerEvent(screen.getByLabelText(EMAIL_INPUT_LABEL, { exact: false }), 'focusout');
 
           // then
           assert.dom(screen.getByText(EMPTY_EMAIL_ERROR_MESSAGE)).exists();
@@ -239,8 +239,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
           await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
           // when
-          await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), stringFilledIn);
-          await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'focusout');
+          await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), stringFilledIn);
+          await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'focusout');
 
           // then
           assert.dom(screen.getByText(INCORRECT_PASSWORD_FORMAT_ERROR_MESSAGE)).exists();
@@ -257,8 +257,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
 
       // when
       await click(screen.getByText('Mon adresse e-mail'));
-      await fillIn(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), 'shi.fu');
-      await triggerEvent(screen.getByRole('textbox', { name: EMAIL_INPUT_LABEL }), 'focusout');
+      await fillIn(screen.getByLabelText(EMAIL_INPUT_LABEL, { exact: false }), 'shi.fu');
+      await triggerEvent(screen.getByLabelText(EMAIL_INPUT_LABEL, { exact: false }), 'focusout');
       await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
       // then
@@ -278,7 +278,7 @@ module('Integration | Component | routes/register-form', function (hooks) {
         await fillInputReconciliationForm({ screen, t });
         await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
-        await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'Mypassword1');
+        await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'Mypassword1');
         await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
         // then
@@ -307,7 +307,7 @@ module('Integration | Component | routes/register-form', function (hooks) {
         await fillInputReconciliationForm({ screen, t });
         await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
-        await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'Mypassword1');
+        await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'Mypassword1');
         await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
         // then
@@ -323,8 +323,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
       await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
       // when
-      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'toto');
-      await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'focusout');
+      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'toto');
+      await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'focusout');
       await click(screen.getByRole('button', { name: t('pages.login-or-register.register-form.button-form') }));
 
       // then
@@ -748,8 +748,8 @@ module('Integration | Component | routes/register-form', function (hooks) {
 });
 
 async function fillInputReconciliationForm({ screen, t }) {
-  await fillIn(screen.getByRole('textbox', { name: '* Prénom' }), 'Legolas');
-  await fillIn(screen.getByRole('textbox', { name: '* Nom' }), 'Vertefeuille');
+  await fillIn(screen.getByLabelText(/Prénom/, { exact: false }), 'Legolas');
+  await fillIn(screen.getByLabelText(/Nom/, { exact: false }), 'Vertefeuille');
   await fillIn(
     screen.getByRole('spinbutton', {
       name: t('pages.login-or-register.register-form.fields.birthdate.day.label'),
diff --git a/mon-pix/tests/integration/components/update-expired-password-form-test.js b/mon-pix/tests/integration/components/update-expired-password-form-test.js
index 61ff86b12f2..a735864e1cf 100644
--- a/mon-pix/tests/integration/components/update-expired-password-form-test.js
+++ b/mon-pix/tests/integration/components/update-expired-password-form-test.js
@@ -11,7 +11,7 @@ import setupIntlRenderingTest from '../../helpers/setup-intl-rendering';
 
 const ApiErrorMessages = ENV.APP.API_ERROR_MESSAGES;
 
-const PASSWORD_INPUT_LABEL = '* Mot de passe (8 caractères minimum, dont une majuscule, une minuscule et un chiffre)';
+const PASSWORD_INPUT_LABEL = 'Mot de passe';
 
 module('Integration | Component | update-expired-password-form', function (hooks) {
   setupIntlRenderingTest(hooks);
@@ -23,7 +23,7 @@ module('Integration | Component | update-expired-password-form', function (hooks
     //then
     assert.dom(screen.getByRole('heading', { name: 'Réinitialiser le mot de passe' })).exists();
     assert.dom(screen.getByRole('button', { name: 'Réinitialiser' })).exists();
-    assert.dom(screen.getByLabelText(PASSWORD_INPUT_LABEL)).exists();
+    assert.dom(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false })).exists();
   });
 
   module('successful cases', function () {
@@ -43,13 +43,13 @@ module('Integration | Component | update-expired-password-form', function (hooks
       );
 
       // when
-      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), newPassword);
-      await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'change');
+      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), newPassword);
+      await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'change');
 
       await click(screen.getByRole('button', { name: 'Réinitialiser' }));
 
       // then
-      assert.dom(screen.queryByLabelText(PASSWORD_INPUT_LABEL)).doesNotExist();
+      assert.dom(screen.queryByLabelText(PASSWORD_INPUT_LABEL, { exact: false })).doesNotExist();
       assert.dom(screen.getByText('Votre mot de passe a été mis à jour.')).exists();
     });
   });
@@ -71,8 +71,8 @@ module('Integration | Component | update-expired-password-form', function (hooks
       );
 
       // when
-      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL), newPassword);
-      await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL), 'change');
+      await fillIn(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), newPassword);
+      await triggerEvent(screen.getByLabelText(PASSWORD_INPUT_LABEL, { exact: false }), 'change');
 
       await click(screen.getByRole('button', { name: 'Réinitialiser' }));
 
diff --git a/mon-pix/tests/unit/components/form-textfield-test.js b/mon-pix/tests/unit/components/form-textfield-test.js
deleted file mode 100644
index 12de814088a..00000000000
--- a/mon-pix/tests/unit/components/form-textfield-test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { setupTest } from 'ember-qunit';
-import createGlimmerComponent from 'mon-pix/tests/helpers/create-glimmer-component';
-import { module, test } from 'qunit';
-
-module('Unit | Component | form-textfield', function (hooks) {
-  setupTest(hooks);
-
-  let component;
-  hooks.beforeEach(function () {
-    component = createGlimmerComponent('form-textfield');
-  });
-
-  module('#textfieldType', function () {
-    [
-      { type: 'text', inputId: 'shi' },
-      { type: 'text', inputId: '' },
-      { type: 'email', inputId: 'email' },
-      { type: 'password', inputId: 'password' },
-    ].forEach((data) => {
-      test(`should return ${data.type} when input id is ${data.inputId}`, function (assert) {
-        // given
-        component.args.textfieldName = data.inputId;
-        // when
-        const inputType = component.textfieldType;
-        // then
-        assert.strictEqual(inputType, data.type);
-      });
-    });
-  });
-
-  module('#validationStatus', function () {
-    test('should return default values when validationStatus is "default"', function (assert) {
-      // When
-      component.args.validationStatus = 'default';
-
-      // Then
-      assert.false(component.hasIcon);
-      assert.strictEqual(component.iconType, '');
-      assert.strictEqual(component.inputValidationStatus, 'form-textfield__input--default');
-      assert.strictEqual(component.inputContainerStatusClass, 'form-textfield__input-container--default');
-      assert.strictEqual(component.validationMessageClass, 'form-textfield__message--default');
-    });
-
-    test('should return error values when validationStatus is "error"', function (assert) {
-      // When
-      component.args.validationStatus = 'error';
-
-      // Then
-      assert.true(component.hasIcon);
-      assert.strictEqual(component.iconType, 'error');
-      assert.strictEqual(component.inputValidationStatus, 'form-textfield__input--error');
-      assert.strictEqual(component.inputContainerStatusClass, 'form-textfield__input-container--error');
-      assert.strictEqual(component.validationMessageClass, 'form-textfield__message--error');
-    });
-
-    test('should return success values when validationStatus is "success"', function (assert) {
-      // When
-      component.args.validationStatus = 'success';
-
-      // Then
-      assert.true(component.hasIcon);
-      assert.strictEqual(component.iconType, 'success');
-      assert.strictEqual(component.inputValidationStatus, 'form-textfield__input--success');
-      assert.strictEqual(component.inputContainerStatusClass, 'form-textfield__input-container--success');
-      assert.strictEqual(component.validationMessageClass, 'form-textfield__message--success');
-    });
-  });
-});