diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5340c7c54..58f37a11b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -24,6 +24,19 @@
       - "3306:3306"
     volumes:
       - mysql_data2:/var/lib/mysql
+        
+  oracle:
+      image: container-registry.oracle.com/database/free:latest
+      container_name: oracle
+      environment:
+        ORACLE_PDB: ORCLPDB1
+        ORACLE_PWD: elsa
+      ports:
+        - "1521:1521"
+        - "5500:5500"
+      volumes:
+        - oracle-data-free:/opt/oracle/oradata
+      shm_size: '1g'
   
   mongodb:
     image: mongo:latest
@@ -84,7 +97,6 @@
       - ASPNETCORE_URLS=http://+:80
       - Logging__LogLevel__Default=Information
 
-
   elsa-server:
     build:
       context: ../.
@@ -116,6 +128,7 @@
 
 volumes:
   postgres-data:
+  oracle-data-free:
   mysql_data2:
   cockroachdb-data:
   mongodb_data:
diff --git a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj
index badb50298..0c3c5f082 100644
--- a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj
+++ b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj
@@ -9,6 +9,7 @@
         <ProjectReference Include="..\..\modules\Elsa.Caching.Distributed.MassTransit\Elsa.Caching.Distributed.MassTransit.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.Caching.Distributed.ProtoActor\Elsa.Caching.Distributed.ProtoActor.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.MySql\Elsa.EntityFrameworkCore.MySql.csproj" Condition=" '$(TargetFramework)' != 'net9.0' " />
+        <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.Oracle\Elsa.EntityFrameworkCore.Oracle.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.PostgreSql\Elsa.EntityFrameworkCore.PostgreSql.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Kafka\Elsa.Kafka.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.MassTransit.AzureServiceBus\Elsa.MassTransit.AzureServiceBus.csproj"/>
diff --git a/src/apps/Elsa.Server.Web/Enums/SqlDatabaseProvider.cs b/src/apps/Elsa.Server.Web/Enums/SqlDatabaseProvider.cs
index cc2988042..651163385 100644
--- a/src/apps/Elsa.Server.Web/Enums/SqlDatabaseProvider.cs
+++ b/src/apps/Elsa.Server.Web/Enums/SqlDatabaseProvider.cs
@@ -6,5 +6,6 @@ public enum SqlDatabaseProvider
     Sqlite,
     MySql,
     PostgreSql,
+    Oracle,
     CockroachDb
 }
\ No newline at end of file
diff --git a/src/apps/Elsa.Server.Web/Program.cs b/src/apps/Elsa.Server.Web/Program.cs
index 199ff6cce..0e9985ad8 100644
--- a/src/apps/Elsa.Server.Web/Program.cs
+++ b/src/apps/Elsa.Server.Web/Program.cs
@@ -99,6 +99,7 @@ var identityTokenSection = identitySection.GetSection("Tokens");
 var sqliteConnectionString = configuration.GetConnectionString("Sqlite")!;
 var sqlServerConnectionString = configuration.GetConnectionString("SqlServer")!;
 var postgresConnectionString = configuration.GetConnectionString("PostgreSql")!;
+var oracleConnectionString = configuration.GetConnectionString("Oracle")!;
 var mySqlConnectionString = configuration.GetConnectionString("MySql")!;
 var cockroachDbConnectionString = configuration.GetConnectionString("CockroachDb")!;
 var mongoDbConnectionString = configuration.GetConnectionString("MongoDb")!;
@@ -195,6 +196,8 @@ services
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
                             ef.UsePostgreSql(cockroachDbConnectionString!);
+                        else if (sqlDatabaseProvider == SqlDatabaseProvider.Oracle)
+                            ef.UseOracle(oracleConnectionString);
                         else
                             ef.UseSqlite(sp => sp.GetSqliteConnectionString());
 
@@ -231,6 +234,8 @@ services
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
                             ef.UsePostgreSql(cockroachDbConnectionString!);
+                        else if (sqlDatabaseProvider == SqlDatabaseProvider.Oracle)
+                            ef.UseOracle(oracleConnectionString);
                         else
                             ef.UseSqlite(sp => sp.GetSqliteConnectionString());
 
@@ -276,7 +281,9 @@ services
                             ef.UseMySql(mySqlConnectionString);
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
-                            ef.UsePostgreSql(cockroachDbConnectionString!);
+                            ef.UsePostgreSql(cockroachDbConnectionString);
+                        else if (sqlDatabaseProvider == SqlDatabaseProvider.Oracle)
+                            ef.UseOracle(oracleConnectionString);
                         else
                             ef.UseSqlite(sp => sp.GetSqliteConnectionString());
 
@@ -411,7 +418,9 @@ services
                             ef.UseMySql(mySqlConnectionString);
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
-                            ef.UsePostgreSql(cockroachDbConnectionString!);
+                            ef.UsePostgreSql(cockroachDbConnectionString);
+                        else if (sqlDatabaseProvider == SqlDatabaseProvider.Oracle)
+                            ef.UseOracle(oracleConnectionString);
                         else
                             ef.UseSqlite(sp => sp.GetSqliteConnectionString());
 
@@ -614,6 +623,7 @@ services
                                 if (sqlDatabaseProvider == SqlDatabaseProvider.Sqlite) ef.UseSqlite(sqliteConnectionString);
                                 if (sqlDatabaseProvider == SqlDatabaseProvider.SqlServer) ef.UseSqlServer(sqlServerConnectionString);
                                 if (sqlDatabaseProvider == SqlDatabaseProvider.PostgreSql) ef.UsePostgreSql(postgresConnectionString);
+                                if (sqlDatabaseProvider == SqlDatabaseProvider.Oracle) ef.UseOracle(oracleConnectionString);
 #if !NET9_0
                                 if (sqlDatabaseProvider == SqlDatabaseProvider.MySql) 
                                     ef.UseMySql(mySqlConnectionString);
diff --git a/src/apps/Elsa.Server.Web/appsettings.json b/src/apps/Elsa.Server.Web/appsettings.json
index 221cdcf22..ae6820a3f 100644
--- a/src/apps/Elsa.Server.Web/appsettings.json
+++ b/src/apps/Elsa.Server.Web/appsettings.json
@@ -13,6 +13,7 @@
     "Sqlite": "Data Source=App_Data/elsa.sqlite.db;Cache=Shared;",
     "MySql": "Server=localhost;Database=elsa;Uid=admin;Pwd=password;",
     "PostgreSql": "Server=localhost;Username=elsa;Database=elsa;Port=5432;Password=elsa;SSLMode=Prefer;MaxPoolSize=2000;Timeout=60",
+    "Oracle": "User Id=SYSTEM;Password=elsa;Data Source=oracle:1521/ORCLPDB1",
     "CockroachDb": "Host=localhost;Port=26257;Database=elsa;SslMode=Disable;Username=root;IncludeErrorDetail=true",
     "MongoDb": "mongodb://localhost:27017/elsa-workflows",
     "AzureServiceBus": "",
diff --git a/src/modules/Elsa.Agents.Persistence.EntityFrameworkCore/SetupForOracle.cs b/src/modules/Elsa.Agents.Persistence.EntityFrameworkCore/SetupForOracle.cs
index 2f5444792..1dec01e7d 100644
--- a/src/modules/Elsa.Agents.Persistence.EntityFrameworkCore/SetupForOracle.cs
+++ b/src/modules/Elsa.Agents.Persistence.EntityFrameworkCore/SetupForOracle.cs
@@ -19,7 +19,7 @@ public class SetupForOracle : IEntityModelCreatingHandler
         
         // In order to use data more than 2000 char we have to use NCLOB.
         // In Oracle, we have to explicitly say the column is NCLOB otherwise it would be considered nvarchar(2000).
-        modelBuilder.Entity<ServiceDefinition>().Property("SerializedSettings").HasColumnType("NCLOB");
-        modelBuilder.Entity<AgentDefinition>().Property("SerializedAgentConfig").HasColumnType("NCLOB");
+        modelBuilder.Entity<ServiceDefinition>().Property<string>("SerializedSettings").HasColumnType("NCLOB");
+        modelBuilder.Entity<AgentDefinition>().Property<string>("SerializedAgentConfig").HasColumnType("NCLOB");
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.EntityFrameworkCore.Common/ElsaDbContextBase.cs b/src/modules/Elsa.EntityFrameworkCore.Common/ElsaDbContextBase.cs
index eef02af6e..2a677bb6f 100644
--- a/src/modules/Elsa.EntityFrameworkCore.Common/ElsaDbContextBase.cs
+++ b/src/modules/Elsa.EntityFrameworkCore.Common/ElsaDbContextBase.cs
@@ -69,7 +69,7 @@ public abstract class ElsaDbContextBase : DbContext, IElsaDbContextSchema
         
         var entityTypeHandlers = ServiceProvider.GetServices<IEntityModelCreatingHandler>().ToList();
 
-        foreach (var entityType in modelBuilder.Model.GetEntityTypes())
+        foreach (var entityType in modelBuilder.Model.GetEntityTypes().ToList())
         {
             foreach (var handler in entityTypeHandlers)
             {
diff --git a/src/modules/Elsa.EntityFrameworkCore/Modules/Alterations/SetupForOracle.cs b/src/modules/Elsa.EntityFrameworkCore/Modules/Alterations/SetupForOracle.cs
index a9b7703bc..8c3b5b2a3 100644
--- a/src/modules/Elsa.EntityFrameworkCore/Modules/Alterations/SetupForOracle.cs
+++ b/src/modules/Elsa.EntityFrameworkCore/Modules/Alterations/SetupForOracle.cs
@@ -18,8 +18,11 @@ public class SetupForOracle : IEntityModelCreatingHandler
         
         // In order to use data more than 2000 char we have to use NCLOB.
         // In Oracle, we have to explicitly say the column is NCLOB otherwise it would be considered nvarchar(2000).
-        modelBuilder.Entity<AlterationPlan>().Property("SerializedAlterations").HasColumnType("NCLOB");
-        modelBuilder.Entity<AlterationPlan>().Property("SerializedWorkflowInstanceIds").HasColumnType("NCLOB");
-        modelBuilder.Entity<AlterationJob>().Property("SerializedLog").HasColumnType("NCLOB");
+        modelBuilder.Entity<AlterationPlan>().Ignore(x => x.Alterations);
+        modelBuilder.Entity<AlterationPlan>().Ignore(x => x.WorkflowInstanceFilter);
+        modelBuilder.Entity<AlterationPlan>().Property<string>("SerializedAlterations").HasColumnType("NCLOB");
+        modelBuilder.Entity<AlterationPlan>().Property<string>("SerializedWorkflowInstanceFilter").HasColumnType("NCLOB");
+        modelBuilder.Entity<AlterationJob>().Ignore(x => x.Log);
+        modelBuilder.Entity<AlterationJob>().Property<string>("SerializedLog").HasColumnType("NCLOB");
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.EntityFrameworkCore/Modules/Management/SetupForOracle.cs b/src/modules/Elsa.EntityFrameworkCore/Modules/Management/SetupForOracle.cs
index c14e6f4e1..da338d428 100644
--- a/src/modules/Elsa.EntityFrameworkCore/Modules/Management/SetupForOracle.cs
+++ b/src/modules/Elsa.EntityFrameworkCore/Modules/Management/SetupForOracle.cs
@@ -18,8 +18,8 @@ public class SetupForOracle : IEntityModelCreatingHandler
         
         // In order to use data more than 2000 char we have to use NCLOB.
         // In Oracle, we have to explicitly say the column is NCLOB otherwise it would be considered nvarchar(2000).
-        modelBuilder.Entity<WorkflowInstance>().Property("Data").HasColumnType("NCLOB");
-        modelBuilder.Entity<WorkflowDefinition>().Property("StringData").HasColumnType("NCLOB");
-        modelBuilder.Entity<WorkflowDefinition>().Property("Data").HasColumnType("NCLOB");
+        modelBuilder.Entity<WorkflowInstance>().Property<string>("Data").HasColumnType("NCLOB");
+        modelBuilder.Entity<WorkflowDefinition>().Property<string>("StringData").HasColumnType("NCLOB");
+        modelBuilder.Entity<WorkflowDefinition>().Property<string>("Data").HasColumnType("NCLOB");
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/SetupForOracle.cs b/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/SetupForOracle.cs
index 2a4351a38..9820dfbab 100644
--- a/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/SetupForOracle.cs
+++ b/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/SetupForOracle.cs
@@ -19,22 +19,37 @@ public class SetupForOracle : IEntityModelCreatingHandler
 
         // To use data more than 2000 char we have to use NCLOB.
         // In Oracle, we have to explicitly say the column is NCLOB otherwise it would be considered nvarchar(2000).
-        modelBuilder.Entity<StoredTrigger>().Property("SerializedPayload").HasColumnType("NCLOB");
+        modelBuilder.Entity<StoredTrigger>().Property<string>("SerializedPayload").HasColumnType("NCLOB");
 
-        modelBuilder.Entity<WorkflowExecutionLogRecord>().Property("SerializedActivityState").HasColumnType("NCLOB");
-        modelBuilder.Entity<WorkflowExecutionLogRecord>().Property("SerializedPayload").HasColumnType("NCLOB");
+        modelBuilder.Entity<WorkflowExecutionLogRecord>().Ignore(x => x.ActivityState);
+        modelBuilder.Entity<WorkflowExecutionLogRecord>().Ignore(x => x.Payload);
+        modelBuilder.Entity<WorkflowExecutionLogRecord>().Property<string>("SerializedActivityState").HasColumnType("NCLOB");
+        modelBuilder.Entity<WorkflowExecutionLogRecord>().Property<string>("SerializedPayload").HasColumnType("NCLOB");
 
-        modelBuilder.Entity<ActivityExecutionRecord>().Property("SerializedActivityState").HasColumnType("NCLOB");
-        modelBuilder.Entity<ActivityExecutionRecord>().Property("SerializedException").HasColumnType("NCLOB");
-        modelBuilder.Entity<ActivityExecutionRecord>().Property("SerializedPayload").HasColumnType("NCLOB");
-        modelBuilder.Entity<ActivityExecutionRecord>().Property("SerializedOutputs").HasColumnType("NCLOB");
+        modelBuilder.Entity<ActivityExecutionRecord>().Ignore(x => x.ActivityState);
+        modelBuilder.Entity<ActivityExecutionRecord>().Ignore(x => x.Exception);
+        modelBuilder.Entity<ActivityExecutionRecord>().Ignore(x => x.Payload);
+        modelBuilder.Entity<ActivityExecutionRecord>().Ignore(x => x.Outputs);
+        modelBuilder.Entity<ActivityExecutionRecord>().Ignore(x => x.Properties);
+        modelBuilder.Entity<ActivityExecutionRecord>().Property<string>("SerializedActivityState").HasColumnType("NCLOB");
+        modelBuilder.Entity<ActivityExecutionRecord>().Property<string>("SerializedException").HasColumnType("NCLOB");
+        modelBuilder.Entity<ActivityExecutionRecord>().Property<string>("SerializedPayload").HasColumnType("NCLOB");
+        modelBuilder.Entity<ActivityExecutionRecord>().Property<string>("SerializedOutputs").HasColumnType("NCLOB");
+        modelBuilder.Entity<ActivityExecutionRecord>().Property<string>("SerializedProperties").HasColumnType("NCLOB");
 
-        modelBuilder.Entity<StoredBookmark>().Property("SerializedPayload").HasColumnType("NCLOB");
-        modelBuilder.Entity<StoredBookmark>().Property("SerializedMetadata").HasColumnType("NCLOB");
+        modelBuilder.Entity<StoredBookmark>().Ignore(x => x.Payload);
+        modelBuilder.Entity<StoredBookmark>().Ignore(x => x.Metadata);
+        modelBuilder.Entity<StoredBookmark>().Property<string>("SerializedPayload").HasColumnType("NCLOB");
+        modelBuilder.Entity<StoredBookmark>().Property<string>("SerializedMetadata").HasColumnType("NCLOB");
+        
+        modelBuilder.Entity<StoredTrigger>().Ignore(x => x.Payload);
+        modelBuilder.Entity<StoredTrigger>().Property<string>("SerializedPayload").HasColumnType("NCLOB");
 
-        modelBuilder.Entity<WorkflowInboxMessage>().Property("SerializedInput").HasColumnType("NCLOB");
-        modelBuilder.Entity<WorkflowInboxMessage>().Property("SerializedBookmarkPayload").HasColumnType("NCLOB");
-
-        modelBuilder.Entity<SerializedKeyValuePair>().Property("SerializedValue").HasColumnType("NCLOB");
+        modelBuilder.Entity<WorkflowInboxMessage>().Ignore(x => x.Input);
+        modelBuilder.Entity<WorkflowInboxMessage>().Ignore(x => x.BookmarkPayload);
+        modelBuilder.Entity<WorkflowInboxMessage>().Property<string>("SerializedInput").HasColumnType("NCLOB");
+        modelBuilder.Entity<WorkflowInboxMessage>().Property<string>("SerializedBookmarkPayload").HasColumnType("NCLOB");
+        
+        modelBuilder.Entity<SerializedKeyValuePair>().Property<string>("SerializedValue").HasColumnType("NCLOB");
     }
 }
\ No newline at end of file