diff --git a/Directory.Build.props b/Directory.Build.props
index 85e02f48e..3b59773ae 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>8.0.3</VersionPrefix>
+    <VersionPrefix>8.0.4</VersionPrefix>
     <LangVersion>preview</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AnalysisLevel>latest</AnalysisLevel>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index b66627455..35f639e1f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,8 +1,8 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>8.0.2</EFCoreVersion>
+    <EFCoreVersion>8.0.4</EFCoreVersion>
     <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
-    <NpgsqlVersion>8.0.2</NpgsqlVersion>
+    <NpgsqlVersion>8.0.3</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.PG/Storage/Internal/NpgsqlTypeMappingSource.cs b/src/EFCore.PG/Storage/Internal/NpgsqlTypeMappingSource.cs
index 3c9baa486..00b27afab 100644
--- a/src/EFCore.PG/Storage/Internal/NpgsqlTypeMappingSource.cs
+++ b/src/EFCore.PG/Storage/Internal/NpgsqlTypeMappingSource.cs
@@ -362,6 +362,7 @@ public virtual void LoadUserDefinedTypeMappings(
         NpgsqlDataSource? dataSource)
         => SetupEnumMappings(sqlGenerationHelper, dataSource);
 
+#pragma warning disable NPG9001
     /// <summary>
     ///     Gets all global enum mappings from the ADO.NET layer and creates mappings for them
     /// </summary>
@@ -407,6 +408,7 @@ is PropertyInfo globalEnumTypeMappingsProperty
             }
         }
     }
+#pragma warning restore NPG9001
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to