diff --git a/bootstrap/sql/migrations/native/1.6.0/mysql/postDataMigrationSQLScript.sql b/bootstrap/sql/migrations/native/1.6.0/mysql/postDataMigrationSQLScript.sql
index 0ac744e4c47..00c9ccbb089 100644
--- a/bootstrap/sql/migrations/native/1.6.0/mysql/postDataMigrationSQLScript.sql
+++ b/bootstrap/sql/migrations/native/1.6.0/mysql/postDataMigrationSQLScript.sql
@@ -54,4 +54,6 @@ set json = JSON_SET(json, '$.connection.config.supportsSystemProfile', true)
 where serviceType in ('Snowflake', 'Redshift', 'BigQuery');
 
 -- Update all rows in the consumers_dlq table to set the source column to 'publisher'
-UPDATE consumers_dlq SET source = 'publisher';
\ No newline at end of file
+UPDATE consumers_dlq SET source = 'publisher';
+
+DELETE from event_subscription_entity where name = "ActivityFeedAlert";
\ No newline at end of file
diff --git a/bootstrap/sql/migrations/native/1.6.0/postgres/postDataMigrationSQLScript.sql b/bootstrap/sql/migrations/native/1.6.0/postgres/postDataMigrationSQLScript.sql
index 141a4e6ce91..807d1e95706 100644
--- a/bootstrap/sql/migrations/native/1.6.0/postgres/postDataMigrationSQLScript.sql
+++ b/bootstrap/sql/migrations/native/1.6.0/postgres/postDataMigrationSQLScript.sql
@@ -70,4 +70,6 @@ SET json = jsonb_set(json::jsonb, '{connection,config,supportsSystemProfile}', '
 WHERE serviceType IN ('Snowflake', 'Redshift', 'BigQuery');
 
 -- Update all rows in the consumers_dlq table to set the source column to 'publisher'
-UPDATE consumers_dlq SET source = 'publisher';
\ No newline at end of file
+UPDATE consumers_dlq SET source = 'publisher';
+
+DELETE from event_subscription_entity where name = 'ActivityFeedAlert';
\ No newline at end of file
diff --git a/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json b/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json
index 65f4fed71a6..ecdaeba28b4 100644
--- a/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json
+++ b/openmetadata-service/src/main/resources/json/data/eventsubscription/ActivityFeedEvents.json
@@ -10,26 +10,20 @@
       {
         "name": "matchAnyEventType",
         "effect": "include",
-        "condition": "matchAnyEventType({'entityCreated', 'entityDeleted', 'entitySoftDeleted'}) && !matchUpdatedBy({'ingestion-bot'}) && !matchAnySource({'user', 'ingestionPipeline', 'workflow'})",
+        "condition": "matchAnyEventType({'entityCreated', 'entityDeleted', 'entitySoftDeleted'}) && !matchUpdatedBy({'ingestion-bot'}) && !matchAnySource({'user', 'team', 'owners', 'databaseService', 'messagingService', 'dashboardService', 'pipelineService', 'storageService', 'mlmodelService', 'metadataService', 'searchService', 'apiService', 'ingestionPipeline', 'workflow'})",
         "prefixCondition": "AND"
       },
       {
         "name": "matchAnyFieldChange",
         "effect": "include",
-        "condition": "matchAnyFieldChange({'testCaseResult'})",
-        "prefixCondition": "OR"
-      },
-      {
-        "name": "matchAnyFieldChange",
-        "effect": "include",
-        "condition": "matchAnyFieldChange({'description', 'domain', 'owners', 'tags', 'followers', 'extension','parameterValues', 'assets'})",
+        "condition": "matchAnyFieldChange({'description', 'domain', 'owners', 'tags', 'followers','parameterValues', 'assets'})",
         "prefixCondition": "OR"
       },
       {
         "name": "matchAnySource",
         "effect": "include",
         "prefixCondition": "AND",
-        "condition": "matchAnySource({'chart','container','dashboard','dashboardDataModel','database','databaseSchema','glossary','glossaryTerm','mlmodel','pipeline','query','report','searchIndex','storedProcedure','table','topic','testSuite','testCase', 'domain', 'dataProduct'})"
+        "condition": "matchAnySource({'chart','container','dashboard','dashboardDataModel','database','databaseSchema','glossary','glossaryTerm','mlmodel','pipeline','query','report','searchIndex','storedProcedure','table','topic', 'domain', 'dataProduct', 'metric'})"
       },
       {
         "name": "matchUpdatedBy",
@@ -76,9 +70,7 @@
               "owners",
               "tags",
               "followers",
-              "extension",
               "parameterValues",
-              "testCaseResult",
               "pipelineStatus"
             ]
           }
@@ -108,8 +100,6 @@
               "storedProcedure",
               "table",
               "topic",
-              "testSuite",
-              "testCase",
               "domain",
               "dataProduct"
             ]
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx
index 7c081a7393c..499cc9830ca 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx
@@ -29,17 +29,14 @@ import {
 import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils';
 import entityUtilClassBase from '../../../../utils/EntityUtilClassBase';
 import {
-  entityDisplayName,
   getEntityFQN,
   getEntityType,
   getFrontEndFormat,
   MarkdownToHTMLConverter,
 } from '../../../../utils/FeedUtils';
 import ExploreSearchCard from '../../../ExploreV1/ExploreSearchCard/ExploreSearchCard';
-import CustomPropertyFeed from '../../ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.component';
 import DescriptionFeed from '../../ActivityFeedCardV2/FeedCardBody/DescriptionFeed/DescriptionFeed';
 import TagsFeed from '../../ActivityFeedCardV2/FeedCardBody/TagsFeed/TagsFeed';
-import TestCaseFeed from '../../ActivityFeedCardV2/FeedCardBody/TestCaseFeed/TestCaseFeed';
 import './feed-card-body-v1.less';
 import { FeedCardBodyV1Props } from './FeedCardBodyV1.interface';
 
@@ -83,15 +80,6 @@ const FeedCardBodyV1 = ({
         return <TagsFeed feed={feed} />;
       }
 
-      if (cardStyle === CardStyle.TestCaseResult) {
-        return (
-          <TestCaseFeed
-            entitySpecificInfo={feed.feedInfo?.entitySpecificInfo}
-            testCaseName={entityDisplayName(entityType, entityFQN) ?? ''}
-          />
-        );
-      }
-
       if (ASSET_CARD_STYLES.includes(cardStyle as CardStyle)) {
         const entityInfo = feed.feedInfo?.entitySpecificInfo?.entity;
         const isExecutableTestSuite =
@@ -127,10 +115,6 @@ const FeedCardBodyV1 = ({
           </Link>
         );
       }
-
-      if (cardStyle === CardStyle.CustomProperties) {
-        return <CustomPropertyFeed feed={feed} />;
-      }
     }
 
     return (