diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java
index ffee1aa42f2..b47cd096414 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java
@@ -71,8 +71,6 @@ public class ChartRepository extends EntityRepository<Chart> {
   public void storeRelationships(Chart chart) {
     EntityReference service = chart.getService();
     addRelationship(service.getId(), chart.getId(), service.getType(), Entity.CHART, Relationship.CONTAINS);
-    storeOwner(chart, chart.getOwner());
-    applyTags(chart);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java
index cfc6f94ebd6..bac1a64b666 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java
@@ -68,7 +68,7 @@ public class ClassificationRepository extends EntityRepository<Classification> {
 
   @Override
   public void storeRelationships(Classification entity) {
-    /* No Relationships */
+    // No relationships to store beyond what is stored in the super class
   }
 
   private int getTermCount(Classification category) {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java
index 0cdf4d7f35d..4c0f336241c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java
@@ -166,7 +166,6 @@ public class ContainerRepository extends EntityRepository<Container> {
 
   @Override
   public void storeRelationships(Container container) {
-
     // store each relationship separately in the entity_relationship table
     EntityReference service = container.getService();
     addRelationship(service.getId(), container.getId(), service.getType(), CONTAINER, Relationship.CONTAINS);
@@ -176,8 +175,6 @@ public class ContainerRepository extends EntityRepository<Container> {
     if (parentReference != null) {
       addRelationship(parentReference.getId(), container.getId(), CONTAINER, CONTAINER, Relationship.CONTAINS);
     }
-    storeOwner(container, container.getOwner());
-    applyTags(container);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java
index 91231bf7bf7..a53871fc64c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java
@@ -138,8 +138,6 @@ public class DashboardDataModelRepository extends EntityRepository<DashboardData
         service.getType(),
         Entity.DASHBOARD_DATA_MODEL,
         Relationship.CONTAINS);
-    storeOwner(dashboardDataModel, dashboardDataModel.getOwner());
-    applyTags(dashboardDataModel);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java
index 416d9172a16..30d6b38d120 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java
@@ -157,12 +157,6 @@ public class DashboardRepository extends EntityRepository<Dashboard> {
             dashboard.getId(), dataModel.getId(), Entity.DASHBOARD, Entity.DASHBOARD_DATA_MODEL, Relationship.HAS);
       }
     }
-
-    // Add owner relationship
-    storeOwner(dashboard, dashboard.getOwner());
-
-    // Add tag to dashboard relationship
-    applyTags(dashboard);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataInsightChartRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataInsightChartRepository.java
index 4df14da3f74..6f22842b32e 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataInsightChartRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataInsightChartRepository.java
@@ -88,6 +88,6 @@ public class DataInsightChartRepository extends EntityRepository<DataInsightChar
 
   @Override
   public void storeRelationships(DataInsightChart entity) {
-    storeOwner(entity, entity.getOwner());
+    // No relationships to store beyond what is stored in the super class
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java
index 95075791a90..55f31b9d086 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java
@@ -70,9 +70,6 @@ public class DatabaseRepository extends EntityRepository<Database> {
   public void storeRelationships(Database database) {
     EntityReference service = database.getService();
     addRelationship(service.getId(), database.getId(), service.getType(), Entity.DATABASE, Relationship.CONTAINS);
-    storeOwner(database, database.getOwner());
-    // Add tag to database relationship
-    applyTags(database);
   }
 
   private List<EntityReference> getSchemas(Database database) throws IOException {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java
index ab038c1a0ba..378c06d6210 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java
@@ -79,9 +79,6 @@ public class DatabaseSchemaRepository extends EntityRepository<DatabaseSchema> {
     EntityReference database = schema.getDatabase();
     addRelationship(
         database.getId(), schema.getId(), database.getType(), Entity.DATABASE_SCHEMA, Relationship.CONTAINS);
-    storeOwner(schema, schema.getOwner());
-    // Add tag to databaseSchema relationship
-    applyTags(schema);
   }
 
   private List<EntityReference> getTables(DatabaseSchema schema) throws IOException {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
index 61534369f34..a835665c81b 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
@@ -549,6 +549,12 @@ public abstract class EntityRepository<T extends EntityInterface> {
     validateExtension(entity);
   }
 
+  public void storeRelationshipsInternal(T entity) throws IOException {
+    storeOwner(entity, entity.getOwner());
+    applyTags(entity);
+    storeRelationships(entity);
+  }
+
   T setFieldsInternal(T entity, Fields fields) throws IOException {
     entity.setOwner(fields.contains(FIELD_OWNER) ? getOwner(entity) : null);
     entity.setTags(fields.contains(FIELD_TAGS) ? getTags(entity.getFullyQualifiedName()) : null);
@@ -877,7 +883,7 @@ public abstract class EntityRepository<T extends EntityInterface> {
   private T createNewEntity(T entity) throws IOException {
     storeEntity(entity, false);
     storeExtension(entity);
-    storeRelationships(entity);
+    storeRelationshipsInternal(entity);
     setInheritedFields(entity);
     return entity;
   }
@@ -921,8 +927,7 @@ public abstract class EntityRepository<T extends EntityInterface> {
       String entityJson,
       Long timestamp,
       String operation,
-      boolean update)
-      throws JsonProcessingException {
+      boolean update) {
     String fqnHash = FullyQualifiedName.buildHash(fullyQualifiedName);
     if (update) {
       daoCollection
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java
index e8999af875a..50e83ed4538 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java
@@ -84,7 +84,7 @@ public class EventSubscriptionRepository extends EntityRepository<EventSubscript
 
   @Override
   public void storeRelationships(EventSubscription entity) {
-    storeOwner(entity, entity.getOwner());
+    // No relationships to store beyond what is stored in the super class
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java
index 00ead6762e8..17cd8fd9ec2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java
@@ -97,8 +97,6 @@ public class GlossaryRepository extends EntityRepository<Glossary> {
 
   @Override
   public void storeRelationships(Glossary glossary) {
-    storeOwner(glossary, glossary.getOwner());
-    applyTags(glossary);
     for (EntityReference reviewer : listOrEmpty(glossary.getReviewers())) {
       addRelationship(reviewer.getId(), glossary.getId(), Entity.USER, Entity.GLOSSARY, Relationship.REVIEWS);
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java
index 358f3f744f9..3ed4bb0a116 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java
@@ -157,7 +157,6 @@ public class GlossaryTermRepository extends EntityRepository<GlossaryTerm> {
   public void storeRelationships(GlossaryTerm entity) {
     addGlossaryRelationship(entity);
     addParentRelationship(entity);
-    storeOwner(entity, entity.getOwner());
     for (EntityReference relTerm : listOrEmpty(entity.getRelatedTerms())) {
       // Make this bidirectional relationship
       addRelationship(entity.getId(), relTerm.getId(), GLOSSARY_TERM, GLOSSARY_TERM, Relationship.RELATED_TO, true);
@@ -165,8 +164,6 @@ public class GlossaryTermRepository extends EntityRepository<GlossaryTerm> {
     for (EntityReference reviewer : listOrEmpty(entity.getReviewers())) {
       addRelationship(reviewer.getId(), entity.getId(), Entity.USER, GLOSSARY_TERM, Relationship.REVIEWS);
     }
-
-    applyTags(entity);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java
index 99e1963b750..6414daed387 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java
@@ -128,8 +128,6 @@ public class IngestionPipelineRepository extends EntityRepository<IngestionPipel
         service.getType(),
         Entity.INGESTION_PIPELINE,
         Relationship.CONTAINS);
-    storeOwner(ingestionPipeline, ingestionPipeline.getOwner());
-    applyTags(ingestionPipeline);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/KpiRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/KpiRepository.java
index 8d6f0428330..b94566d5604 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/KpiRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/KpiRepository.java
@@ -94,8 +94,6 @@ public class KpiRepository extends EntityRepository<Kpi> {
   public void storeRelationships(Kpi kpi) {
     // Add relationship from Kpi to dataInsightChart
     addRelationship(kpi.getId(), kpi.getDataInsightChart().getId(), KPI, DATA_INSIGHT_CHART, Relationship.USES);
-    // Add kpi owner relationship
-    storeOwner(kpi, kpi.getOwner());
   }
 
   @Transaction
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MetricsRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MetricsRepository.java
index 833def3ed66..aef8b1919f7 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MetricsRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MetricsRepository.java
@@ -75,8 +75,6 @@ public class MetricsRepository extends EntityRepository<Metrics> {
   public void storeRelationships(Metrics metrics) {
     EntityReference service = metrics.getService();
     addRelationship(service.getId(), metrics.getId(), service.getType(), Entity.METRICS, Relationship.CONTAINS);
-    storeOwner(metrics, metrics.getOwner());
-    applyTags(metrics);
   }
 
   private EntityReference getService(EntityReference service) throws IOException { // Get service by service ID
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java
index 666328f09ba..8b9987766f3 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java
@@ -161,8 +161,6 @@ public class MlModelRepository extends EntityRepository<MlModel> {
     EntityReference service = mlModel.getService();
     addRelationship(service.getId(), mlModel.getId(), service.getType(), MLMODEL, Relationship.CONTAINS);
 
-    storeOwner(mlModel, mlModel.getOwner());
-
     setDashboard(mlModel, mlModel.getDashboard());
 
     if (mlModel.getDashboard() != null) {
@@ -172,7 +170,6 @@ public class MlModelRepository extends EntityRepository<MlModel> {
     }
 
     setMlFeatureSourcesLineage(mlModel);
-    applyTags(mlModel);
   }
 
   /**
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java
index ebd909840cf..18c9cf62f1d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java
@@ -212,12 +212,6 @@ public class PipelineRepository extends EntityRepository<Pipeline> {
   public void storeRelationships(Pipeline pipeline) {
     EntityReference service = pipeline.getService();
     addRelationship(service.getId(), pipeline.getId(), service.getType(), Entity.PIPELINE, Relationship.CONTAINS);
-
-    // Add owner relationship
-    storeOwner(pipeline, pipeline.getOwner());
-
-    // Add tag to pipeline relationship
-    applyTags(pipeline);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PolicyRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PolicyRepository.java
index c98953c3cb3..30bbd028967 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PolicyRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PolicyRepository.java
@@ -96,8 +96,7 @@ public class PolicyRepository extends EntityRepository<Policy> {
 
   @Override
   public void storeRelationships(Policy policy) {
-    // Add policy owner relationship.
-    storeOwner(policy, policy.getOwner());
+    // No relationships to store beyond what is stored in the super class
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java
index 50d9e328c3e..31ba74f7383 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java
@@ -108,12 +108,6 @@ public class QueryRepository extends EntityRepository<Query> {
             entityRef.getId(), queryEntity.getId(), entityRef.getType(), Entity.QUERY, Relationship.MENTIONED_IN);
       }
     }
-
-    // Add table owner relationship
-    storeOwner(queryEntity, queryEntity.getOwner());
-
-    // Add tag to table relationship
-    applyTags(queryEntity);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportRepository.java
index 8b6ca9f5df3..d6481f6b5b3 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportRepository.java
@@ -52,8 +52,6 @@ public class ReportRepository extends EntityRepository<Report> {
   public void storeRelationships(Report report) {
     EntityReference service = report.getService();
     addRelationship(service.getId(), report.getId(), service.getType(), Entity.CHART, Relationship.CONTAINS);
-    storeOwner(report, report.getOwner());
-    applyTags(report);
   }
 
   private EntityReference getService(Report report) {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java
index d72728d7df6..c6988a68930 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java
@@ -87,10 +87,7 @@ public abstract class ServiceEntityRepository<
 
   @Override
   public void storeRelationships(T service) {
-    // Add owner relationship
-    storeOwner(service, service.getOwner());
-    // add tags relationship
-    applyTags(service);
+    // No relationships to store beyond what is stored in the super class
   }
 
   public T addTestConnectionResult(UUID serviceId, TestConnectionResult testConnectionResult) throws IOException {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java
index aeba581c752..c86e5b3b074 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java
@@ -643,12 +643,6 @@ public class TableRepository extends EntityRepository<Table> {
   public void storeRelationships(Table table) {
     // Add relationship from database to table
     addRelationship(table.getDatabaseSchema().getId(), table.getId(), DATABASE_SCHEMA, TABLE, Relationship.CONTAINS);
-
-    // Add table owner relationship
-    storeOwner(table, table.getOwner());
-
-    // Add tag to table relationship
-    applyTags(table);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TeamRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TeamRepository.java
index 2957e46d724..cb8aa87d0af 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TeamRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TeamRepository.java
@@ -154,8 +154,6 @@ public class TeamRepository extends EntityRepository<Team> {
 
   @Override
   public void storeRelationships(Team team) {
-    // Add team owner relationship
-    storeOwner(team, team.getOwner());
     for (EntityReference user : listOrEmpty(team.getUsers())) {
       addRelationship(team.getId(), user.getId(), TEAM, Entity.USER, Relationship.HAS);
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java
index 883548425e4..e14b60becf4 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java
@@ -197,8 +197,6 @@ public class TestCaseRepository extends EntityRepository<TestCase> {
     // Add relationship from test definition to test
     addRelationship(
         test.getTestDefinition().getId(), test.getId(), TEST_DEFINITION, TEST_CASE, Relationship.APPLIED_TO);
-    // Add test owner relationship
-    storeOwner(test, test.getOwner());
   }
 
   @Transaction
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java
index a6f6a4a0fec..40ad9423904 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java
@@ -66,7 +66,7 @@ public class TestConnectionDefinitionRepository extends EntityRepository<TestCon
 
   @Override
   public void storeRelationships(TestConnectionDefinition entity) {
-    storeOwner(entity, entity.getOwner());
+    // No relationships to store beyond what is stored in the super class
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestDefinitionRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestDefinitionRepository.java
index a7ae0368698..d74b47825fc 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestDefinitionRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestDefinitionRepository.java
@@ -44,7 +44,7 @@ public class TestDefinitionRepository extends EntityRepository<TestDefinition> {
 
   @Override
   public void storeRelationships(TestDefinition entity) {
-    storeOwner(entity, entity.getOwner());
+    // No relationships to store beyond what is stored in the super class
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java
index 94d27350e2e..bf297b0311e 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java
@@ -77,7 +77,6 @@ public class TestSuiteRepository extends EntityRepository<TestSuite> {
 
   @Override
   public void storeRelationships(TestSuite entity) throws IOException {
-    storeOwner(entity, entity.getOwner());
     if (entity.getExecutable()) {
       storeExecutableRelationship(entity);
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java
index d12f0f88624..5ffc6df6bd5 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java
@@ -114,8 +114,6 @@ public class TopicRepository extends EntityRepository<Topic> {
   @Override
   public void storeRelationships(Topic topic) {
     setService(topic, topic.getService());
-    storeOwner(topic, topic.getOwner());
-    applyTags(topic);
   }
 
   @Override
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
index ef725c1257e..734a2c51ff6 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
@@ -78,7 +78,7 @@ public class TypeRepository extends EntityRepository<Type> {
 
   @Override
   public void storeRelationships(Type type) {
-    /* Nothing to do */
+    // No relationships to store beyond what is stored in the super class
   }
 
   private void updateTypeMap(Type entity) {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java
index cbde2b9026c..a774c7bd744 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java
@@ -48,7 +48,7 @@ public class WebAnalyticEventRepository extends EntityRepository<WebAnalyticEven
 
   @Override
   public void storeRelationships(WebAnalyticEvent entity) {
-    storeOwner(entity, entity.getOwner());
+    // No relationships to store beyond what is stored in the super class
   }
 
   @Transaction
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowRepository.java
index 04e73419fa9..8c775909b1a 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowRepository.java
@@ -67,7 +67,7 @@ public class WorkflowRepository extends EntityRepository<Workflow> {
 
   @Override
   public void storeRelationships(Workflow entity) {
-    storeOwner(entity, entity.getOwner());
+    // No relationships to store beyond what is stored in the super class
   }
 
   @Override