diff --git a/src/modules/Elsa.Secrets.Persistence.EFCore.MySql/Extensions/MySqlSecretsPersistenceFeatureExtensions.cs b/src/modules/Elsa.Secrets.Persistence.EFCore.MySql/Extensions/MySqlSecretsPersistenceFeatureExtensions.cs
index 9f9be5c38..490eb5425 100644
--- a/src/modules/Elsa.Secrets.Persistence.EFCore.MySql/Extensions/MySqlSecretsPersistenceFeatureExtensions.cs
+++ b/src/modules/Elsa.Secrets.Persistence.EFCore.MySql/Extensions/MySqlSecretsPersistenceFeatureExtensions.cs
@@ -1,7 +1,6 @@
 using System.Reflection;
 using Elsa.Persistence.EFCore;
 using Elsa.Persistence.EFCore.Extensions;
-using Elsa.Secrets.Persistence.EFCore;
 using Elsa.Secrets.Persistence.EFCore.Features;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
@@ -26,8 +25,6 @@ public static class MySqlSecretsPersistenceFeatureExtensions
         ElsaDbContextOptions? options = null,
         Action<MySqlDbContextOptionsBuilder>? configure = null)
     {
-        feature.Module.Services.AddMySqlEntityModelCreatingHandlers();
-        feature.DbContextOptionsBuilder = (sp, db) => db.UseElsaMySql(Assembly, connectionStringFunc(sp), options, configure: configure);
-        return feature;
+        return feature.UseMySql(Assembly, connectionStringFunc, options, configure);
     }
 }
diff --git a/src/modules/Elsa.Secrets.Persistence.EFCore.PostgreSql/Extensions/PostgreSqlSecretsPersistenceFeatureExtensions.cs b/src/modules/Elsa.Secrets.Persistence.EFCore.PostgreSql/Extensions/PostgreSqlSecretsPersistenceFeatureExtensions.cs
index 220f7191a..e7531b350 100644
--- a/src/modules/Elsa.Secrets.Persistence.EFCore.PostgreSql/Extensions/PostgreSqlSecretsPersistenceFeatureExtensions.cs
+++ b/src/modules/Elsa.Secrets.Persistence.EFCore.PostgreSql/Extensions/PostgreSqlSecretsPersistenceFeatureExtensions.cs
@@ -1,7 +1,6 @@
 using System.Reflection;
 using Elsa.Persistence.EFCore;
 using Elsa.Persistence.EFCore.Extensions;
-using Elsa.Secrets.Persistence.EFCore;
 using Elsa.Secrets.Persistence.EFCore.Features;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 
@@ -26,8 +25,6 @@ public static class PostgreSqlSecretsPersistenceFeatureExtensions
         ElsaDbContextOptions? options = null,
         Action<NpgsqlDbContextOptionsBuilder>? configure = null)
     {
-        feature.Module.Services.AddPostgreSqlEntityModelCreatingHandlers();
-        feature.DbContextOptionsBuilder = (sp, db) => db.UseElsaPostgreSql(Assembly, connectionStringFunc(sp), options, configure);
-        return feature;
+        return feature.UsePostgreSql(Assembly, connectionStringFunc, options, configure);
     }
 }
diff --git a/src/modules/Elsa.Secrets.Persistence.EFCore.SqlServer/Extensions/SqlServerSecretsPersistenceFeatureExtensions.cs b/src/modules/Elsa.Secrets.Persistence.EFCore.SqlServer/Extensions/SqlServerSecretsPersistenceFeatureExtensions.cs
index 5af73a01f..0af97aa64 100644
--- a/src/modules/Elsa.Secrets.Persistence.EFCore.SqlServer/Extensions/SqlServerSecretsPersistenceFeatureExtensions.cs
+++ b/src/modules/Elsa.Secrets.Persistence.EFCore.SqlServer/Extensions/SqlServerSecretsPersistenceFeatureExtensions.cs
@@ -1,7 +1,6 @@
 using System.Reflection;
 using Elsa.Persistence.EFCore;
 using Elsa.Persistence.EFCore.Extensions;
-using Elsa.Secrets.Persistence.EFCore;
 using Elsa.Secrets.Persistence.EFCore.Features;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
@@ -26,7 +25,6 @@ public static class SqlServerSecretsPersistenceFeatureExtensions
         ElsaDbContextOptions? options = null,
         Action<SqlServerDbContextOptionsBuilder>? configure = null)
     {
-        feature.DbContextOptionsBuilder = (sp, db) => db.UseElsaSqlServer(Assembly, connectionStringFunc(sp), options, configure);
-        return feature;
+        return feature.UseSqlServer(Assembly, connectionStringFunc, options, configure);
     }
 }
diff --git a/src/modules/Elsa.Secrets.Persistence.EFCore.Sqlite/Extensions/SqliteSecretsPersistenceFeatureExtensions.cs b/src/modules/Elsa.Secrets.Persistence.EFCore.Sqlite/Extensions/SqliteSecretsPersistenceFeatureExtensions.cs
index c29e85266..c7ee53bb1 100644
--- a/src/modules/Elsa.Secrets.Persistence.EFCore.Sqlite/Extensions/SqliteSecretsPersistenceFeatureExtensions.cs
+++ b/src/modules/Elsa.Secrets.Persistence.EFCore.Sqlite/Extensions/SqliteSecretsPersistenceFeatureExtensions.cs
@@ -1,7 +1,6 @@
 using System.Reflection;
 using Elsa.Persistence.EFCore;
 using Elsa.Persistence.EFCore.Extensions;
-using Elsa.Secrets.Persistence.EFCore;
 using Elsa.Secrets.Persistence.EFCore.Features;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
@@ -27,8 +26,6 @@ public static class SqliteSecretsPersistenceFeatureExtensions
         ElsaDbContextOptions? options = null,
         Action<SqliteDbContextOptionsBuilder>? configure = null)
     {
-        feature.Module.Services.AddSqliteEntityModelCreatingHandlers();
-        feature.DbContextOptionsBuilder = (sp, db) => db.UseElsaSqlite(Assembly, connectionStringFunc(sp), options, configure);
-        return feature;
+        return feature.UseSqlite(Assembly, connectionStringFunc, options, configure);
     }
 }