diff --git a/src/ServiceControl.AcceptanceTests.RavenDB5/SharedEmbeddedServer.cs b/src/ServiceControl.AcceptanceTests.RavenDB5/SharedEmbeddedServer.cs
index b4f7881774..0cc061f7d5 100644
--- a/src/ServiceControl.AcceptanceTests.RavenDB5/SharedEmbeddedServer.cs
+++ b/src/ServiceControl.AcceptanceTests.RavenDB5/SharedEmbeddedServer.cs
@@ -20,7 +20,7 @@ public static async Task<EmbeddedDatabase> GetInstance(CancellationToken cancell
             DatabasePath = dbPath,
             LogPath = Path.Combine(basePath, "Logs"),
             LogsMode = "Operations",
-            ServerUrl = $"http://localhost:{PortUtility.FindAvailablePort(33334)}"
+            DatabasePort = PortUtility.FindAvailablePort(RavenDBPersisterSettings.DatabasePortDefault)
         };
 
         var instance = EmbeddedDatabase.Start(settings);
diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/SharedEmbeddedServer.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/SharedEmbeddedServer.cs
index 463ecf894a..2746f6a3df 100644
--- a/src/ServiceControl.MultiInstance.AcceptanceTests/SharedEmbeddedServer.cs
+++ b/src/ServiceControl.MultiInstance.AcceptanceTests/SharedEmbeddedServer.cs
@@ -20,7 +20,7 @@ public static async Task<EmbeddedDatabase> GetInstance(CancellationToken cancell
             DatabasePath = dbPath,
             LogPath = Path.Combine(basePath, "Logs"),
             LogsMode = "Operations",
-            ServerUrl = $"http://localhost:{PortUtility.FindAvailablePort(33334)}"
+            DatabasePort = PortUtility.FindAvailablePort(RavenDBPersisterSettings.DatabasePortDefault)
         };
 
         var instance = EmbeddedDatabase.Start(settings);
diff --git a/src/ServiceControl.Persistence.RavenDb5/RavenDBPersisterSettings.cs b/src/ServiceControl.Persistence.RavenDb5/RavenDBPersisterSettings.cs
index b01120e995..a7d52a5026 100644
--- a/src/ServiceControl.Persistence.RavenDb5/RavenDBPersisterSettings.cs
+++ b/src/ServiceControl.Persistence.RavenDb5/RavenDBPersisterSettings.cs
@@ -4,9 +4,7 @@
 
 class RavenDBPersisterSettings : PersistenceSettings
 {
-    public string HostName { get; set; } = "localhost";
-    public int DatabaseMaintenancePort { get; set; } = DatabaseMaintenancePortDefault;
-    public string DatabaseMaintenanceUrl => $"http://{HostName}:{DatabaseMaintenancePort}";
+    public int DatabasePort { get; set; } = DatabasePortDefault;
     public int ExpirationProcessTimerInSeconds { get; set; } = ExpirationProcessTimerInSecondsDefault;
     public int MinimumStorageLeftRequiredForIngestion { get; set; } = CheckMinimumStorageRequiredForIngestion.MinimumStorageLeftRequiredForIngestionDefault;
     public int DataSpaceRemainingThreshold { get; set; } = CheckFreeDiskSpace.DataSpaceRemainingThresholdDefault;
@@ -15,8 +13,14 @@ class RavenDBPersisterSettings : PersistenceSettings
     public TimeSpan? AuditRetentionPeriod { get; set; }
     public int ExternalIntegrationsDispatchingBatchSize { get; set; } = 100;
 
-    //TODO: these are newly added settings, we should remove any duplication
-    public string ServerUrl { get; set; } // TODO: This name is SUPER confusing
+    /// <summary>
+    /// Computed connection string to access embedded RavenDB API and RavenDB Studio
+    /// </summary>
+    public string ServerUrl => $"http://localhost:{DatabasePort}";
+
+    /// <summary>
+    /// User provided external RavenDB instance connection string
+    /// </summary>
     public string ConnectionString { get; set; }
     public bool UseEmbeddedServer => string.IsNullOrWhiteSpace(ConnectionString);
     public string LogPath { get; set; }
@@ -24,9 +28,9 @@ class RavenDBPersisterSettings : PersistenceSettings
     public string DatabaseName { get; set; } = DatabaseNameDefault;
 
     public const string DatabaseNameDefault = "primary";
-    public const int DatabaseMaintenancePortDefault = 33334;
+    public const int DatabasePortDefault = 33334;
     public const int ExpirationProcessTimerInSecondsDefault = 600;
-    public const string LogsModeDefault = "Information";
+    public const string LogsModeDefault = "Operations";
 
     public override bool MessageBodiesAlwaysStoredInFailedMessage => true;
 }
\ No newline at end of file
diff --git a/src/ServiceControl.Persistence.RavenDb5/RavenDbPersistenceConfiguration.cs b/src/ServiceControl.Persistence.RavenDb5/RavenDbPersistenceConfiguration.cs
index 9e414f9299..b5415e993d 100644
--- a/src/ServiceControl.Persistence.RavenDb5/RavenDbPersistenceConfiguration.cs
+++ b/src/ServiceControl.Persistence.RavenDb5/RavenDbPersistenceConfiguration.cs
@@ -45,8 +45,7 @@ T GetSetting<T>(string key, T defaultValue)
                 ConnectionString = GetSetting<string>(RavenBootstrapper.ConnectionStringKey, default),
                 DatabaseName = GetSetting(RavenBootstrapper.DatabaseNameKey, RavenDBPersisterSettings.DatabaseNameDefault),
                 DatabasePath = GetSetting<string>(RavenBootstrapper.DatabasePathKey, default),
-                HostName = GetSetting(RavenBootstrapper.HostNameKey, "localhost"),
-                DatabaseMaintenancePort = GetSetting(RavenBootstrapper.DatabaseMaintenancePortKey, RavenDBPersisterSettings.DatabaseMaintenancePortDefault),
+                DatabasePort = GetSetting(RavenBootstrapper.DatabaseMaintenancePortKey, RavenDBPersisterSettings.DatabasePortDefault),
                 ExpirationProcessTimerInSeconds = GetSetting(RavenBootstrapper.ExpirationProcessTimerInSecondsKey, 600),
                 MinimumStorageLeftRequiredForIngestion = GetSetting(RavenBootstrapper.MinimumStorageLeftRequiredForIngestionKey, CheckMinimumStorageRequiredForIngestion.MinimumStorageLeftRequiredForIngestionDefault),
                 DataSpaceRemainingThreshold = GetSetting(DataSpaceRemainingThresholdKey, CheckFreeDiskSpace.DataSpaceRemainingThresholdDefault),
diff --git a/src/ServiceControl.Persistence.Tests.RavenDb5/SharedEmbeddedServer.cs b/src/ServiceControl.Persistence.Tests.RavenDb5/SharedEmbeddedServer.cs
index c8850164ff..7870f99d26 100644
--- a/src/ServiceControl.Persistence.Tests.RavenDb5/SharedEmbeddedServer.cs
+++ b/src/ServiceControl.Persistence.Tests.RavenDb5/SharedEmbeddedServer.cs
@@ -19,7 +19,7 @@ public static async Task<EmbeddedDatabase> GetInstance(CancellationToken cancell
             DatabasePath = dbPath,
             LogPath = Path.Combine(basePath, "Logs"),
             LogsMode = "Operations",
-            ServerUrl = $"http://localhost:{PortUtility.FindAvailablePort(33334)}"
+            DatabasePort = PortUtility.FindAvailablePort(RavenDBPersisterSettings.DatabasePortDefault)
         };
 
         var instance = EmbeddedDatabase.Start(settings);