diff --git a/util/Setup/Configuration.cs b/util/Setup/Configuration.cs
index 192823c001..aae82be4a4 100644
--- a/util/Setup/Configuration.cs
+++ b/util/Setup/Configuration.cs
@@ -97,8 +97,8 @@ public class Configuration
     [Description("Enable SCIM")]
     public bool EnableScim { get; set; } = false;
 
-    [Description("Disable Built-In MSSQL Container Generation")]
-    public bool DisableBuiltInMsSql { get; set; }
+    [Description("Enable Built-In MSSQL Container Generation")]
+    public bool? EnableBuiltInMsSql { get; set; } = true;
 
     [YamlIgnore]
     public string Domain
diff --git a/util/Setup/DockerComposeBuilder.cs b/util/Setup/DockerComposeBuilder.cs
index 1787b9994b..465ff46d87 100644
--- a/util/Setup/DockerComposeBuilder.cs
+++ b/util/Setup/DockerComposeBuilder.cs
@@ -42,7 +42,7 @@ public class DockerComposeBuilder
     {
         public TemplateModel(Context context)
         {
-            DisableBuiltInMsSql = context.Config.DisableBuiltInMsSql;
+            EnableBuiltInMsSql = context.Config.EnableBuiltInMsSql;
             MssqlDataDockerVolume = context.Config.DatabaseDockerVolume;
             EnableKeyConnector = context.Config.EnableKeyConnector;
             EnableScim = context.Config.EnableScim;
@@ -62,7 +62,7 @@ public class DockerComposeBuilder
             }
         }
 
-        public bool DisableBuiltInMsSql { get; set; }
+        public bool? EnableBuiltInMsSql { get; set; }
         public bool MssqlDataDockerVolume { get; set; }
         public bool EnableKeyConnector { get; set; }
         public bool EnableScim { get; set; }
diff --git a/util/Setup/Templates/DockerCompose.hbs b/util/Setup/Templates/DockerCompose.hbs
index 628ca477fd..07818204fd 100644
--- a/util/Setup/Templates/DockerCompose.hbs
+++ b/util/Setup/Templates/DockerCompose.hbs
@@ -14,7 +14,7 @@
 #########################################################################
 
 services:
-{{#if DisableBuiltInMsSql}}
+{{#if EnableBuiltInMsSql}}
   mssql:
     image: bitwarden/mssql:{{{CoreVersion}}}
     container_name: bitwarden-mssql
@@ -32,8 +32,8 @@ services:
       - mssql.env
       - ../env/uid.env
       - ../env/mssql.override.env
-{{/if}}
 
+{{/if}}
   web:
     image: bitwarden/web:{{{WebVersion}}}
     container_name: bitwarden-web
@@ -108,8 +108,10 @@ services:
     image: bitwarden/admin:{{{CoreVersion}}}
     container_name: bitwarden-admin
     restart: always
+{{#if EnableBuiltInMsSql}}
     depends_on:
       - mssql
+{{/if}}
     volumes:
       - ../core:/etc/bitwarden/core
       - ../ca-certificates:/etc/bitwarden/ca-certificates