diff --git a/src/components/common/VnAccountNumber.vue b/src/components/common/VnAccountNumber.vue
index c4fa78674..b12e944c9 100644
--- a/src/components/common/VnAccountNumber.vue
+++ b/src/components/common/VnAccountNumber.vue
@@ -79,5 +79,5 @@ function accountShortToStandard() {
 </script>
 
 <template>
-    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
+    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" v-data-cy />
 </template>
diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index 79784f3c5..93473385a 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -64,6 +64,7 @@ defineExpose({ show: () => changePassDialog.value.show() });
                             size="xs"
                             style="flex: 0"
                             v-close-popup
+                            v-data-cy
                         />
                     </VnRow>
                 </slot>
@@ -113,6 +114,7 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         flat
                         type="reset"
                         v-close-popup
+                        data-cy
                     />
                     <QBtn
                         :disabled="isLoading"
@@ -120,6 +122,7 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         :label="t('globals.confirm')"
                         color="primary"
                         @click="validate"
+                        data-cy
                     />
                 </slot>
             </QCardActions>
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index 35308c2c4..20acd8cf0 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -157,6 +157,7 @@ function addDefaultData(data) {
                     />
                 </VnRow>
                 <QInput
+                    v-data-cy
                     :label="t('globals.description')"
                     v-model="dms.description"
                     type="textarea"
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 19b1f15d6..9ad767764 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -108,7 +108,7 @@ const manageDate = (date) => {
             :clearable="false"
             @click="isPopupOpen = true"
             hide-bottom-space
-            data-cy="date"
+            v-data-cy
         >
             <template #append>
                 <QIcon
@@ -125,6 +125,7 @@ const manageDate = (date) => {
                         model = null;
                         isPopupOpen = false;
                     "
+                    v-data-cy
                 />
                 <QIcon
                     v-if="showEvent"
@@ -132,6 +133,7 @@ const manageDate = (date) => {
                     class="cursor-pointer"
                     @click="isPopupOpen = !isPopupOpen"
                     :title="t('Open date')"
+                    v-data-cy
                 />
             </template>
             <QMenu
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index d19b12abf..e7d514422 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -313,7 +313,7 @@ function handleKeyDown(event) {
         :input-debounce="useURL ? '300' : '0'"
         :loading="isLoading"
         @virtual-scroll="onScroll"
-        data-cy
+        v-data-cy
     >
         <template #append>
             <QIcon
diff --git a/src/components/common/vnDiscount.vue b/src/components/common/vnDiscount.vue
index b82923ad2..137a5afc0 100644
--- a/src/components/common/vnDiscount.vue
+++ b/src/components/common/vnDiscount.vue
@@ -98,6 +98,7 @@ function cancel({ cancel }) {
             {{ t('Mana') }} {{ toCurrency(props.mana) }}
         </QBanner>
         <QInput
+            v-data-cy
             v-model="scope.value"
             type="number"
             dense
@@ -117,6 +118,7 @@ function cancel({ cancel }) {
         <QCardActions class="q-px-none q-mt-sm" align="right">
             <QBtn :label="t('Cancel')" color="primary" flat @click="cancel(scope)" />
             <QBtn
+                data-cy
                 :label="t('Update')"
                 color="primary"
                 :loading="isLoading"