diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue
index b7c417f..89d561e 100644
--- a/src/components/AppHeader/AppHeader.vue
+++ b/src/components/AppHeader/AppHeader.vue
@@ -137,6 +137,7 @@
       default: 0,
     },
   },
+  emits: ['refresh'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/components/Global/FormFile.vue b/src/components/Global/FormFile.vue
index fc9dd32..c337bf1 100644
--- a/src/components/Global/FormFile.vue
+++ b/src/components/Global/FormFile.vue
@@ -69,6 +69,7 @@
       default: 'secondary',
     },
   },
+  emits: ['input'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/components/Global/Search.vue b/src/components/Global/Search.vue
index 65da87b..dcc1ca0 100644
--- a/src/components/Global/Search.vue
+++ b/src/components/Global/Search.vue
@@ -53,6 +53,7 @@
       },
     },
   },
+  emits: ['change-search', 'clear-search'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/components/Global/TableDateFilter.vue b/src/components/Global/TableDateFilter.vue
index a712f1c..ca1c852 100644
--- a/src/components/Global/TableDateFilter.vue
+++ b/src/components/Global/TableDateFilter.vue
@@ -109,6 +109,7 @@
 export default {
   components: { IconCalendar },
   mixins: [VuelidateMixin],
+  emits: ['change'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/components/Global/TableFilter.vue b/src/components/Global/TableFilter.vue
index ba77720..690f453 100644
--- a/src/components/Global/TableFilter.vue
+++ b/src/components/Global/TableFilter.vue
@@ -72,6 +72,7 @@
       },
     },
   },
+  emits: ['filter-change'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/components/Global/TableRowAction.vue b/src/components/Global/TableRowAction.vue
index 2129713..e00a380 100644
--- a/src/components/Global/TableRowAction.vue
+++ b/src/components/Global/TableRowAction.vue
@@ -98,6 +98,7 @@
       default: true,
     },
   },
+  emits: ['click-table-action'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/components/Global/TableToolbar.vue b/src/components/Global/TableToolbar.vue
index 0bdb87b..373b90a 100644
--- a/src/components/Global/TableToolbar.vue
+++ b/src/components/Global/TableToolbar.vue
@@ -52,6 +52,7 @@
       },
     },
   },
+  emits: ['batch-action', 'clear-selected'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/views/Logs/Dumps/DumpsModalConfirmation.vue b/src/views/Logs/Dumps/DumpsModalConfirmation.vue
index fd1cb78..77f03b0 100644
--- a/src/views/Logs/Dumps/DumpsModalConfirmation.vue
+++ b/src/views/Logs/Dumps/DumpsModalConfirmation.vue
@@ -52,6 +52,7 @@
       default: false,
     },
   },
+  emits: ['ok'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Operations/FactoryReset/FactoryResetModal.vue b/src/views/Operations/FactoryReset/FactoryResetModal.vue
index 823e6dc..5865bb3 100644
--- a/src/views/Operations/FactoryReset/FactoryResetModal.vue
+++ b/src/views/Operations/FactoryReset/FactoryResetModal.vue
@@ -89,6 +89,7 @@
       default: null,
     },
   },
+  emits: ['okConfirm'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Operations/Firmware/FirmwareFormUpdate.vue b/src/views/Operations/Firmware/FirmwareFormUpdate.vue
index 4346747..2b9a616 100644
--- a/src/views/Operations/Firmware/FirmwareFormUpdate.vue
+++ b/src/views/Operations/Firmware/FirmwareFormUpdate.vue
@@ -3,26 +3,24 @@
     <div class="form-background p-3">
       <b-form @submit.prevent="onSubmitUpload">
         <!-- Workstation Upload -->
-        <template>
-          <b-form-group
-            :label="$t('pageFirmware.form.updateFirmware.imageFile')"
-            label-for="image-file"
+        <b-form-group
+          :label="$t('pageFirmware.form.updateFirmware.imageFile')"
+          label-for="image-file"
+        >
+          <form-file
+            id="image-file"
+            :disabled="isPageDisabled"
+            :state="getValidationState(v$.file)"
+            aria-describedby="image-file-help-block"
+            @input="onFileUpload($event)"
           >
-            <form-file
-              id="image-file"
-              :disabled="isPageDisabled"
-              :state="getValidationState(v$.file)"
-              aria-describedby="image-file-help-block"
-              @input="onFileUpload($event)"
-            >
-              <template #invalid>
-                <b-form-invalid-feedback role="alert">
-                  {{ $t('global.form.required') }}
-                </b-form-invalid-feedback>
-              </template>
-            </form-file>
-          </b-form-group>
-        </template>
+            <template #invalid>
+              <b-form-invalid-feedback role="alert">
+                {{ $t('global.form.required') }}
+              </b-form-invalid-feedback>
+            </template>
+          </form-file>
+        </b-form-group>
 
         <b-btn
           data-test-id="firmware-button-startUpdate"
diff --git a/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue b/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue
index 9af8fb5..a0cbac5 100644
--- a/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue
+++ b/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue
@@ -28,6 +28,7 @@
       required: true,
     },
   },
+  emits: ['ok'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
index 183cab7..c51b362 100644
--- a/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
+++ b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
@@ -30,6 +30,7 @@
 <script>
 import { useI18n } from 'vue-i18n';
 export default {
+  emits: ['ok'],
   data() {
     return {
       $t: useI18n().t,
diff --git a/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue b/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue
index 59df962..682528b 100644
--- a/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue
+++ b/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue
@@ -87,6 +87,7 @@
       },
     },
   },
+  emits: ['ok'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue b/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
index b2f2778..7a40bfb 100644
--- a/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
+++ b/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
@@ -92,6 +92,7 @@
       },
     },
   },
+  emits: ['ok'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue b/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
index d22aa6a..f4dcb82 100644
--- a/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
+++ b/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
@@ -100,6 +100,7 @@
       },
     },
   },
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue b/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue
index e853af3..a181ba7 100644
--- a/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue
+++ b/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue
@@ -141,6 +141,7 @@
       required: true,
     },
   },
+  emits: ['ok'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/SecurityAndAccess/UserManagement/ModalUser.vue b/src/views/SecurityAndAccess/UserManagement/ModalUser.vue
index 3b33487..af8903e 100644
--- a/src/views/SecurityAndAccess/UserManagement/ModalUser.vue
+++ b/src/views/SecurityAndAccess/UserManagement/ModalUser.vue
@@ -256,6 +256,7 @@
       required: true,
     },
   },
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/DateTime/DateTime.vue b/src/views/Settings/DateTime/DateTime.vue
index b723530..0ddea67 100644
--- a/src/views/Settings/DateTime/DateTime.vue
+++ b/src/views/Settings/DateTime/DateTime.vue
@@ -229,6 +229,7 @@
     this.hideLoader();
     next();
   },
+  emits: ['change'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/Network/ModalDefaultGateway.vue b/src/views/Settings/Network/ModalDefaultGateway.vue
index d54ddc2..d1fa60f 100644
--- a/src/views/Settings/Network/ModalDefaultGateway.vue
+++ b/src/views/Settings/Network/ModalDefaultGateway.vue
@@ -68,6 +68,7 @@
       default: '',
     },
   },
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/Network/ModalDns.vue b/src/views/Settings/Network/ModalDns.vue
index 179d831..39308ce 100644
--- a/src/views/Settings/Network/ModalDns.vue
+++ b/src/views/Settings/Network/ModalDns.vue
@@ -51,6 +51,7 @@
 
 export default {
   mixins: [VuelidateMixin],
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/Network/ModalHostname.vue b/src/views/Settings/Network/ModalHostname.vue
index 5eeffb3..eb20f17 100644
--- a/src/views/Settings/Network/ModalHostname.vue
+++ b/src/views/Settings/Network/ModalHostname.vue
@@ -64,6 +64,7 @@
       default: '',
     },
   },
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/Network/ModalIpv4.vue b/src/views/Settings/Network/ModalIpv4.vue
index 7b4c62e..e72179a 100644
--- a/src/views/Settings/Network/ModalIpv4.vue
+++ b/src/views/Settings/Network/ModalIpv4.vue
@@ -103,6 +103,7 @@
       default: '',
     },
   },
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/Network/ModalIpv6.vue b/src/views/Settings/Network/ModalIpv6.vue
index 78f803a..6f844ce 100644
--- a/src/views/Settings/Network/ModalIpv6.vue
+++ b/src/views/Settings/Network/ModalIpv6.vue
@@ -85,6 +85,7 @@
 
 export default {
   mixins: [VuelidateMixin],
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/Network/ModalMacAddress.vue b/src/views/Settings/Network/ModalMacAddress.vue
index 137a359..83c1406 100644
--- a/src/views/Settings/Network/ModalMacAddress.vue
+++ b/src/views/Settings/Network/ModalMacAddress.vue
@@ -63,6 +63,7 @@
       default: '',
     },
   },
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),
diff --git a/src/views/Settings/SnmpAlerts/ModalAddDestination.vue b/src/views/Settings/SnmpAlerts/ModalAddDestination.vue
index e08224d..5eef381 100644
--- a/src/views/Settings/SnmpAlerts/ModalAddDestination.vue
+++ b/src/views/Settings/SnmpAlerts/ModalAddDestination.vue
@@ -89,6 +89,7 @@
 
 export default {
   mixins: [VuelidateMixin],
+  emits: ['ok', 'hidden'],
   setup() {
     return {
       v$: useVuelidate(),