diff --git a/apps/web/src/services/alert-manager/components/AlertDetailInfoTableProject.vue b/apps/web/src/services/alert-manager/components/AlertDetailInfoTableProject.vue
index bb07443c7b..982f0fd812 100644
--- a/apps/web/src/services/alert-manager/components/AlertDetailInfoTableProject.vue
+++ b/apps/web/src/services/alert-manager/components/AlertDetailInfoTableProject.vue
@@ -30,7 +30,6 @@
         >
             <project-select-dropdown :selected-project-ids="dataForUpdate ? [dataForUpdate] : []"
                                      project-selectable
-                                     class="dropdown"
                                      @select="onSelectProject"
             />
             <div class="button-group ml-2">
diff --git a/apps/web/src/services/project/components/ProjectAlertEventRuleForm.vue b/apps/web/src/services/project/components/ProjectAlertEventRuleForm.vue
index 20aad30cb5..90487b1ab1 100644
--- a/apps/web/src/services/project/components/ProjectAlertEventRuleForm.vue
+++ b/apps/web/src/services/project/components/ProjectAlertEventRuleForm.vue
@@ -15,8 +15,8 @@ import { showSuccessMessage } from '@/lib/helper/notice-alert-helper';
 
 import ErrorHandler from '@/common/composables/error/errorHandler';
 
-import EventRuleActionForm from '@/services/project/components/ProjectAlertEventRuleActionForm.vue';
-import EventRuleConditionForm from '@/services/project/components/ProjectAlertEventRuleConditionForm.vue';
+import ProjectAlertEventRuleActionForm from '@/services/project/components/ProjectAlertEventRuleActionForm.vue';
+import ProjectAlertEventRuleConditionForm from '@/services/project/components/ProjectAlertEventRuleConditionForm.vue';
 
 
 const CONDITIONS_POLICY = Object.freeze({
@@ -163,12 +163,12 @@ watch(() => state.conditions, (conditions) => {
 
 <template>
     <div class="event-rule-form">
-        <event-rule-condition-form
+        <project-alert-event-rule-condition-form
             class="event-rule-condition-form"
             :conditions-policy.sync="state.conditionsPolicy"
             :conditions.sync="state.conditions"
         />
-        <event-rule-action-form
+        <project-alert-event-rule-action-form
             class="event-rule-action-form"
             :actions.sync="state.actions"
             :options.sync="state.options"
diff --git a/apps/web/src/services/project/components/ProjectAlertSettingsAutoRecoveryUpdateModal.vue b/apps/web/src/services/project/components/ProjectAlertSettingsAutoRecoveryUpdateModal.vue
index bedb543505..09122c314f 100644
--- a/apps/web/src/services/project/components/ProjectAlertSettingsAutoRecoveryUpdateModal.vue
+++ b/apps/web/src/services/project/components/ProjectAlertSettingsAutoRecoveryUpdateModal.vue
@@ -88,7 +88,7 @@ watch([() => props.selectedOption, () => props.visible], ([selectedOption]) => {
                 <div class="select-card-wrapper">
                     <p-select-card v-for="(option, index) in state.selectOptions"
                                    :key="option.name"
-                                   v-model="recoveryMode"
+                                   v-model="state.recoveryMode"
                                    :tab-index="index"
                                    :value="option.name"
                                    :label="option.label"
diff --git a/apps/web/src/services/project/pages/ProjectAlertEventRulePage.vue b/apps/web/src/services/project/pages/ProjectAlertEventRulePage.vue
index 01d91ab9e0..cbfebd8092 100644
--- a/apps/web/src/services/project/pages/ProjectAlertEventRulePage.vue
+++ b/apps/web/src/services/project/pages/ProjectAlertEventRulePage.vue
@@ -18,8 +18,8 @@ import DeleteModal from '@/common/components/modals/DeleteModal.vue';
 import ErrorHandler from '@/common/composables/error/errorHandler';
 import GeneralPageLayout from '@/common/modules/page-layouts/GeneralPageLayout.vue';
 
-import EventRuleContent from '@/services/project/components/ProjectAlertEventRuleContent.vue';
-import EventRuleForm from '@/services/project/components/ProjectAlertEventRuleForm.vue';
+import ProjectAlertEventRuleContent from '@/services/project/components/ProjectAlertEventRuleContent.vue';
+import ProjectAlertEventRuleForm from '@/services/project/components/ProjectAlertEventRuleForm.vue';
 
 const EDIT_MODE = Object.freeze({
     CREATE: 'CREATE',
@@ -174,7 +174,7 @@ const onClickFormCancel = () => {
 </script>
 
 <template>
-    <general-page-layout class="add-service-account-container">
+    <general-page-layout>
         <p-breadcrumbs class="flex-grow"
                        :routes="routeState.routes"
         />
@@ -257,15 +257,17 @@ const onClickFormCancel = () => {
                         </div>
                     </template>
                 </template>
-                <event-rule-form v-if="state.isEditMode && (state.selectedOrder === data.order)"
-                                 :project-id="props.projectId"
-                                 :event-rule-id="data.event_rule_id"
-                                 :mode="EDIT_MODE.UPDATE"
-                                 @confirm="onClickFormConfirm"
-                                 @cancel="onClickFormCancel"
+                <project-alert-event-rule-form
+                    v-if="state.isEditMode && (state.selectedOrder === data.order)"
+                    :project-id="props.projectId"
+                    :event-rule-id="data.event_rule_id"
+                    :mode="EDIT_MODE.UPDATE"
+                    @confirm="onClickFormConfirm"
+                    @cancel="onClickFormCancel"
                 />
-                <event-rule-content v-else
-                                    :data="data"
+                <project-alert-event-rule-content
+                    v-else
+                    :data="data"
                 />
             </p-card>
         </div>
@@ -273,10 +275,11 @@ const onClickFormCancel = () => {
                 style-type="indigo400"
                 :header="$t('PROJECT.EVENT_RULE.ADD_EVENT_RULE')"
         >
-            <event-rule-form :project-id="props.projectId"
-                             :mode="EDIT_MODE.CREATE"
-                             @confirm="onClickFormConfirm"
-                             @cancel="onClickFormCancel"
+            <project-alert-event-rule-form
+                :project-id="props.projectId"
+                :mode="EDIT_MODE.CREATE"
+                @confirm="onClickFormConfirm"
+                @cancel="onClickFormCancel"
             />
         </p-card>
         <p-button v-if="state.cardData.length"