diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 719137eab9..a666940e26 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -59,7 +59,7 @@
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="PropertyChanging.Fody" Version="1.30.3" />
     <PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
-    <PackageVersion Include="RavenDB.Embedded" Version="5.4.201" />
+    <PackageVersion Include="RavenDB.Embedded" Version="5.4.207" />
     <PackageVersion Include="ReactiveUI.WPF" Version="20.1.1" />
     <PackageVersion Include="ServiceControl.Contracts" Version="5.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
diff --git a/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs b/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs
index 6b28389aea..4b5a8a9d8a 100644
--- a/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs
+++ b/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs
@@ -37,7 +37,7 @@ public async Task EnsureLicenseIsValid()
                         Assert.That(details.Status, Is.EqualTo("Commercial"));
                         Assert.That(details.Expired, Is.False);
                         Assert.That(details.Type, Is.EqualTo("Professional"));
-                        Assert.That(DateTime.UtcNow.AddDays(14), Is.LessThan(details.Expiration), $"The RavenDB license expires {details.Expiration} which is less than 2 weeks. Contact RavenDB at <sales@ravendb.net> for the new license.");
+                        Assert.That(DateTime.UtcNow.AddDays(7), Is.LessThan(details.Expiration), $"The RavenDB license expires {details.Expiration} which is less than one week. Contact RavenDB at <sales@ravendb.net> for the new license.");
                     });
                 }
             }
diff --git a/src/ServiceControl.RavenDB/EmbeddedDatabase.cs b/src/ServiceControl.RavenDB/EmbeddedDatabase.cs
index 327b7db368..a8fba63648 100644
--- a/src/ServiceControl.RavenDB/EmbeddedDatabase.cs
+++ b/src/ServiceControl.RavenDB/EmbeddedDatabase.cs
@@ -57,18 +57,19 @@ public static EmbeddedDatabase Start(EmbeddedDatabaseConfiguration databaseConfi
             {
                 CommandLineArgs =
                 [
-                    $"--License.Path=\"{licenseFileNameAndServerDirectory.LicenseFileName}\"",
                     $"--Logs.Mode={databaseConfiguration.LogsMode}",
                     // HINT: If this is not set, then Raven will pick a default location relative to the server binaries
                     // See https://github.com/ravendb/ravendb/issues/15694
                     $"--Indexing.NuGetPackagesPath=\"{nugetPackagesPath}\""
                 ],
-                AcceptEula = true,
                 DataDirectory = databaseConfiguration.DbPath,
                 ServerUrl = databaseConfiguration.ServerUrl,
                 LogsPath = databaseConfiguration.LogPath
             };
 
+            serverOptions.Licensing.EulaAccepted = true;
+            serverOptions.Licensing.LicensePath = licenseFileNameAndServerDirectory.LicenseFileName;
+
             if (!string.IsNullOrWhiteSpace(licenseFileNameAndServerDirectory.ServerDirectory))
             {
                 serverOptions.ServerDirectory = licenseFileNameAndServerDirectory.ServerDirectory;