diff --git a/cli/src/test/java/io/kestra/cli/commands/migrations/MetadataMigrationCommandTest.java b/cli/src/test/java/io/kestra/cli/commands/migrations/MetadataMigrationCommandTest.java
index f1a96c1135..2d2a6909b7 100644
--- a/cli/src/test/java/io/kestra/cli/commands/migrations/MetadataMigrationCommandTest.java
+++ b/cli/src/test/java/io/kestra/cli/commands/migrations/MetadataMigrationCommandTest.java
@@ -63,7 +63,7 @@ public class MetadataMigrationCommandTest {
 
 
             assertThat(out.toString()).contains("✅ Metadata migration complete.");
-            // Still it's not in the metadata repository because no flow exist to find that secret
+            // Still it's not in the metadata repository because no flow exist to find that kv
             assertThat(kvMetadataRepository.findByName(tenantId, namespace, key).isPresent()).isFalse();
             assertThat(kvMetadataRepository.findByName(tenantId, anotherNamespace, anotherKey).isPresent()).isFalse();
 
@@ -79,9 +79,9 @@ public class MetadataMigrationCommandTest {
             PicocliRunner.call(App.class, ctx, kvMetadataMigrationCommand);
 
             assertThat(out.toString()).contains("✅ Metadata migration complete.");
-            Optional<PersistedKvMetadata> foundSecret = kvMetadataRepository.findByName(tenantId, namespace, key);
-            assertThat(foundSecret.isPresent()).isTrue();
-            assertThat(foundSecret.get().getDescription()).isEqualTo(description);
+            Optional<PersistedKvMetadata> foundKv = kvMetadataRepository.findByName(tenantId, namespace, key);
+            assertThat(foundKv.isPresent()).isTrue();
+            assertThat(foundKv.get().getDescription()).isEqualTo(description);
             assertThat(kvMetadataRepository.findByName(tenantId, anotherNamespace, anotherKey).isPresent()).isFalse();
 
             KVStore kvStore = new InternalKVStore(tenantId, namespace, storage, kvMetadataRepository);
diff --git a/jdbc-h2/src/main/java/io/kestra/repository/h2/H2KvMetadataRepository.java b/jdbc-h2/src/main/java/io/kestra/repository/h2/H2KvMetadataRepository.java
index 1d8d06723c..2e6730594a 100644
--- a/jdbc-h2/src/main/java/io/kestra/repository/h2/H2KvMetadataRepository.java
+++ b/jdbc-h2/src/main/java/io/kestra/repository/h2/H2KvMetadataRepository.java
@@ -20,9 +20,8 @@ import java.util.Map;
 @H2RepositoryEnabled
 public class H2KvMetadataRepository extends AbstractJdbcKvMetadataRepository {
     @Inject
-    public H2KvMetadataRepository(@Named("kvMetadata") H2Repository<PersistedKvMetadata> repository,
-                            ApplicationContext applicationContext) {
-        super(repository, applicationContext);
+    public H2KvMetadataRepository(@Named("kvMetadata") H2Repository<PersistedKvMetadata> repository) {
+        super(repository);
     }
 
 
diff --git a/jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlKvMetadataRepository.java b/jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlKvMetadataRepository.java
index a9f6e35ef8..6d2f775bf7 100644
--- a/jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlKvMetadataRepository.java
+++ b/jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlKvMetadataRepository.java
@@ -17,10 +17,9 @@ import java.util.List;
 public class MysqlKvMetadataRepository extends AbstractJdbcKvMetadataRepository {
     @Inject
     public MysqlKvMetadataRepository(
-        @Named("kvMetadata") MysqlRepository<PersistedKvMetadata> repository,
-        ApplicationContext applicationContext
+        @Named("kvMetadata") MysqlRepository<PersistedKvMetadata> repository
     ) {
-        super(repository, applicationContext);
+        super(repository);
     }
 
     @Override
diff --git a/jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresKvMetadataRepository.java b/jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresKvMetadataRepository.java
index 863551dea6..d5af5f85e4 100644
--- a/jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresKvMetadataRepository.java
+++ b/jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresKvMetadataRepository.java
@@ -17,10 +17,9 @@ import java.util.List;
 public class PostgresKvMetadataRepository extends AbstractJdbcKvMetadataRepository {
     @Inject
     public PostgresKvMetadataRepository(
-        @Named("kvMetadata") PostgresRepository<PersistedKvMetadata> repository,
-        ApplicationContext applicationContext
+        @Named("kvMetadata") PostgresRepository<PersistedKvMetadata> repository
     ) {
-        super(repository, applicationContext);
+        super(repository);
     }
 
     @Override
diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcKvMetadataRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcKvMetadataRepository.java
index f64436299f..ab7cabd430 100644
--- a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcKvMetadataRepository.java
+++ b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcKvMetadataRepository.java
@@ -1,14 +1,11 @@
 package io.kestra.jdbc.repository;
 
-import io.kestra.core.events.CrudEvent;
 import io.kestra.core.models.FetchVersion;
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.TenantAndNamespace;
 import io.kestra.core.models.kv.PersistedKvMetadata;
 import io.kestra.core.repositories.ArrayListTotal;
 import io.kestra.core.repositories.KvMetadataRepositoryInterface;
-import io.micronaut.context.ApplicationContext;
-import io.micronaut.context.event.ApplicationEventPublisher;
 import io.micronaut.data.model.Pageable;
 import jakarta.annotation.Nullable;
 import org.jooq.*;
@@ -22,15 +19,12 @@ import java.util.stream.Stream;
 
 public abstract class AbstractJdbcKvMetadataRepository extends AbstractJdbcRepository implements KvMetadataRepositoryInterface {
     protected final io.kestra.jdbc.AbstractJdbcRepository<PersistedKvMetadata> jdbcRepository;
-    private final ApplicationEventPublisher<CrudEvent<PersistedKvMetadata>> eventPublisher;
 
     @SuppressWarnings("unchecked")
     public AbstractJdbcKvMetadataRepository(
-        io.kestra.jdbc.AbstractJdbcRepository<PersistedKvMetadata> jdbcRepository,
-        ApplicationContext applicationContext
+        io.kestra.jdbc.AbstractJdbcRepository<PersistedKvMetadata> jdbcRepository
     ) {
         this.jdbcRepository = jdbcRepository;
-        this.eventPublisher = applicationContext.getBean(ApplicationEventPublisher.class);
     }
 
     private static Condition lastCondition(boolean isLast) {
@@ -138,13 +132,7 @@ public abstract class AbstractJdbcKvMetadataRepository extends AbstractJdbcRepos
                             ))).toList()));
                     }
 
-                    int deletedAmount = deleteCondition
-                        .execute();
-
-                    e.getValue().forEach(kvMetadata -> eventPublisher.publishEvent(CrudEvent.of(
-                        kvMetadata,
-                        null
-                    )));
+                    int deletedAmount = deleteCondition.execute();
 
                     return totalForTenantNamespace + deletedAmount;
                 }, Integer::sum);
@@ -173,10 +161,6 @@ public abstract class AbstractJdbcKvMetadataRepository extends AbstractJdbcRepos
                     }
                 }
 
-                eventPublisher.publishEvent(CrudEvent.of(
-                    maybePrevious.orElse(null),
-                    kvMetadataToPersist
-                ));
                 Map<Field<Object>, Object> fields = this.jdbcRepository.persistFields(kvMetadataToPersist);
                 this.jdbcRepository.persist(kvMetadataToPersist, context, fields);