diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/MigrationContextFactory.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/MigrationContextFactory.cs
index 582034d42..4424b01cd 100644
--- a/src/providers/WorkflowCore.Persistence.PostgreSQL/MigrationContextFactory.cs
+++ b/src/providers/WorkflowCore.Persistence.PostgreSQL/MigrationContextFactory.cs
@@ -7,7 +7,7 @@ public class MigrationContextFactory : IDesignTimeDbContextFactory<PostgresConte
     {
         public PostgresContext CreateDbContext(string[] args)
         {
-            return new PostgresContext(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;Password=password;");
+            return new PostgresContext(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;Password=password;","wfc");
         }
     }
 }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContext.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContext.cs
index 840f91eec..818a75be2 100644
--- a/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContext.cs
+++ b/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContext.cs
@@ -12,11 +12,13 @@ namespace WorkflowCore.Persistence.PostgreSQL
     public class PostgresContext : WorkflowDbContext
     {
         private readonly string _connectionString;
+        private readonly string _schemaName;
 
-        public PostgresContext(string connectionString)
+        public PostgresContext(string connectionString,string schemaName)
             :base()
         {   
             _connectionString = connectionString;
+            _schemaName = schemaName;
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -27,37 +29,37 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
         protected override void ConfigureSubscriptionStorage(EntityTypeBuilder<PersistedSubscription> builder)
         {
-            builder.ToTable("Subscription", "wfc");
+            builder.ToTable("Subscription", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureWorkflowStorage(EntityTypeBuilder<PersistedWorkflow> builder)
         {
-            builder.ToTable("Workflow", "wfc");
+            builder.ToTable("Workflow", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
                 
         protected override void ConfigureExecutionPointerStorage(EntityTypeBuilder<PersistedExecutionPointer> builder)
         {
-            builder.ToTable("ExecutionPointer", "wfc");
+            builder.ToTable("ExecutionPointer", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureExecutionErrorStorage(EntityTypeBuilder<PersistedExecutionError> builder)
         {
-            builder.ToTable("ExecutionError", "wfc");
+            builder.ToTable("ExecutionError", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureExetensionAttributeStorage(EntityTypeBuilder<PersistedExtensionAttribute> builder)
         {
-            builder.ToTable("ExtensionAttribute", "wfc");
+            builder.ToTable("ExtensionAttribute", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureEventStorage(EntityTypeBuilder<PersistedEvent> builder)
         {
-            builder.ToTable("Event", "wfc");
+            builder.ToTable("Event", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
     }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContextFactory.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContextFactory.cs
index de6d0e24d..e0758dfab 100644
--- a/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContextFactory.cs
+++ b/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContextFactory.cs
@@ -9,15 +9,17 @@ namespace WorkflowCore.Persistence.PostgreSQL
     public class PostgresContextFactory : IWorkflowDbContextFactory
     {
         private readonly string _connectionString;
+        private readonly string _schemaName;
 
-        public PostgresContextFactory(string connectionString)
+        public PostgresContextFactory(string connectionString, string schemaName)
         {
             _connectionString = connectionString;
+            _schemaName = schemaName;
         }
 
         public WorkflowDbContext Build()
         {
-            return new PostgresContext(_connectionString);
+            return new PostgresContext(_connectionString,_schemaName);
         }
     }
 }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/ServiceCollectionExtensions.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/ServiceCollectionExtensions.cs
index 26abb29ce..bf1bac81f 100644
--- a/src/providers/WorkflowCore.Persistence.PostgreSQL/ServiceCollectionExtensions.cs
+++ b/src/providers/WorkflowCore.Persistence.PostgreSQL/ServiceCollectionExtensions.cs
@@ -10,9 +10,10 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {
-        public static WorkflowOptions UsePostgreSQL(this WorkflowOptions options, string connectionString, bool canCreateDB, bool canMigrateDB)
+        public static WorkflowOptions UsePostgreSQL(this WorkflowOptions options,
+            string connectionString, bool canCreateDB, bool canMigrateDB, string schemaName="wfc")
         {
-            options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new PostgresContextFactory(connectionString), canCreateDB, canMigrateDB));
+            options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new PostgresContextFactory(connectionString, schemaName), canCreateDB, canMigrateDB));
             return options;
         }
     }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj b/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj
index e210a8b55..484dc6941 100644
--- a/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj
+++ b/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj
@@ -15,9 +15,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Provides support to persist workflows running on Workflow Core to a PostgreSQL database.</Description>
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
+    <Version>2.0.1</Version>
+    <AssemblyVersion>2.0.1.0</AssemblyVersion>
+    <FileVersion>2.0.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/WorkflowCore.Tests.PostgreSQL/PostgresPersistenceProviderFixture.cs b/test/WorkflowCore.Tests.PostgreSQL/PostgresPersistenceProviderFixture.cs
index 21215f61d..95ebe7976 100644
--- a/test/WorkflowCore.Tests.PostgreSQL/PostgresPersistenceProviderFixture.cs
+++ b/test/WorkflowCore.Tests.PostgreSQL/PostgresPersistenceProviderFixture.cs
@@ -19,7 +19,7 @@ public class PostgresPersistenceProviderFixture : BasePersistenceFixture
         public PostgresPersistenceProviderFixture(PostgresDockerSetup dockerSetup, ITestOutputHelper output)
         {
             output.WriteLine($"Connecting on {PostgresDockerSetup.ConnectionString}");
-            _subject = new EntityFrameworkPersistenceProvider(new PostgresContextFactory(PostgresDockerSetup.ConnectionString), true, true);
+            _subject = new EntityFrameworkPersistenceProvider(new PostgresContextFactory(PostgresDockerSetup.ConnectionString,"wfc"), true, true);
             _subject.EnsureStoreExists();
         }
     }