diff --git a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj
index 5a2dfa69ef..9deb226783 100644
--- a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj
+++ b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj
@@ -10,8 +10,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="OpenIddict.Abstractions" Version="4.3.0" />
-    <PackageReference Include="OpenIddict.AspNetCore" Version="4.3.0" />
+    <PackageReference Include="OpenIddict.Abstractions" Version="4.2.0" />
+    <PackageReference Include="OpenIddict.AspNetCore" Version="4.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
diff --git a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs
index 857661fd83..4d47e64448 100644
--- a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DistributedLocking;
 using Umbraco.Cms.Persistence.EFCore.Locking;
 using Umbraco.Cms.Persistence.EFCore.Scoping;
@@ -16,6 +16,13 @@ public static class UmbracoEFCoreServiceCollectionExtensions
     {
         defaultEFCoreOptionsAction ??= DefaultOptionsAction;
 
+        // Replace data directory
+        string? dataDirectory = AppDomain.CurrentDomain.GetData(Constants.System.DataDirectoryName)?.ToString();
+        if (string.IsNullOrEmpty(dataDirectory) is false)
+        {
+            connectionString = connectionString.Replace(Constants.System.DataDirectoryPlaceholder, dataDirectory);
+        }
+
         services.AddDbContext<T>(
             options =>
             {
diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
index 3e6e57983f..3702db461b 100644
--- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
+++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
index a5161eca86..1d7690ab52 100644
--- a/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
@@ -15,7 +15,7 @@ public class ConnectionStrings // TODO: Rename to [Umbraco]ConnectionString (sin
     /// <summary>
     ///     The DataDirectory placeholder.
     /// </summary>
-    public const string DataDirectoryPlaceholder = ConfigurationExtensions.DataDirectoryPlaceholder;
+    public const string DataDirectoryPlaceholder = Constants.System.DataDirectoryPlaceholder;
 
     /// <summary>
     ///     The postfix used to identify a connection strings provider setting.
diff --git a/src/Umbraco.Core/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs
index 43de01995b..4a88da6459 100644
--- a/src/Umbraco.Core/Constants-System.cs
+++ b/src/Umbraco.Core/Constants-System.cs
@@ -64,5 +64,15 @@ public static partial class Constants
 
         public const string UmbracoConnectionName = "umbracoDbDSN";
         public const string DefaultUmbracoPath = "~/umbraco";
+
+        /// <summary>
+        /// The DataDirectory name.
+        /// </summary>
+        public const string DataDirectoryName = "DataDirectory";
+
+        /// <summary>
+        /// The DataDirectory placeholder.
+        /// </summary>
+        public const string DataDirectoryPlaceholder = "|DataDirectory|";
     }
 }
diff --git a/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs b/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs
index 53f3b76c06..3dffdd8e67 100644
--- a/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs
+++ b/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs
@@ -10,16 +10,6 @@ namespace Umbraco.Extensions;
 /// </summary>
 public static class ConfigurationExtensions
 {
-    /// <summary>
-    /// The DataDirectory name.
-    /// </summary>
-    internal const string DataDirectoryName = "DataDirectory";
-
-    /// <summary>
-    /// The DataDirectory placeholder.
-    /// </summary>
-    internal const string DataDirectoryPlaceholder = "|DataDirectory|";
-
     /// <summary>
     /// The postfix used to identify a connection string provider setting.
     /// </summary>
@@ -76,10 +66,10 @@ public static class ConfigurationExtensions
         if (!string.IsNullOrEmpty(connectionString))
         {
             // Replace data directory
-            string? dataDirectory = AppDomain.CurrentDomain.GetData(DataDirectoryName)?.ToString();
+            string? dataDirectory = AppDomain.CurrentDomain.GetData(Constants.System.DataDirectoryName)?.ToString();
             if (!string.IsNullOrEmpty(dataDirectory))
             {
-                connectionString = connectionString.Replace(DataDirectoryPlaceholder, dataDirectory);
+                connectionString = connectionString.Replace(Constants.System.DataDirectoryPlaceholder, dataDirectory);
             }
 
             // Get provider name
diff --git a/version.json b/version.json
index e22da7303c..b465096390 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "12.0.0-rc1",
+  "version": "12.0.0-rc2",
   "assemblyVersion": {
     "precision": "build"
   },