diff --git a/util/Setup/Context.cs b/util/Setup/Context.cs
index 1be600fc32..63593ad067 100644
--- a/util/Setup/Context.cs
+++ b/util/Setup/Context.cs
@@ -165,14 +165,18 @@ namespace Bit.Setup
                 "Template: https://github.com/bitwarden/core/blob/master/util/Setup/Templates/NginxConfig.hbs")]
             public bool GenerateNginxConfig { get; set; } = true;
 
-            [Description("Docker compose file port mapping for HTTP. Leave empty for remove the port mapping.\n" +
+            [Description("Docker compose file port mapping for HTTP. Leave empty to remove the port mapping.\n" +
                 "Learn more: https://docs.docker.com/compose/compose-file/#ports")]
             public string HttpPort { get; set; } = "80";
 
-            [Description("Docker compose file port mapping for HTTPS. Leave empty for remove the port mapping.\n" +
+            [Description("Docker compose file port mapping for HTTPS. Leave empty to remove the port mapping.\n" +
                 "Learn more: https://docs.docker.com/compose/compose-file/#ports")]
             public string HttpsPort { get; set; } = "443";
 
+            [Description("Docker compose file version. Leave empty for default.\n" +
+                "Learn more: https://docs.docker.com/compose/compose-file/compose-versioning/")]
+            public string ComposeVersion { get; set; }
+
             [Description("Configure Nginx for SSL.")]
             public bool Ssl { get; set; } = true;
 
diff --git a/util/Setup/DockerComposeBuilder.cs b/util/Setup/DockerComposeBuilder.cs
index 8e1162e4a5..b8757d1d21 100644
--- a/util/Setup/DockerComposeBuilder.cs
+++ b/util/Setup/DockerComposeBuilder.cs
@@ -45,13 +45,24 @@ namespace Bit.Setup
         {
             public TemplateModel(Context context)
             {
+                if(!string.IsNullOrWhiteSpace(context.Config.ComposeVersion))
+                {
+                    ComposeVersion = context.Config.ComposeVersion;
+                }
                 MssqlDataDockerVolume = context.Config.DatabaseDockerVolume;
                 HttpPort = context.Config.HttpPort;
                 HttpsPort = context.Config.HttpsPort;
-                CoreVersion = context.CoreVersion;
-                WebVersion = context.WebVersion;
+                if(!string.IsNullOrWhiteSpace(context.CoreVersion))
+                {
+                    CoreVersion = context.CoreVersion;
+                }
+                if(!string.IsNullOrWhiteSpace(context.WebVersion))
+                {
+                    WebVersion = context.WebVersion;
+                }
             }
 
+            public string ComposeVersion { get; set; } = "3";
             public bool MssqlDataDockerVolume { get; set; }
             public string HttpPort { get; set; }
             public string HttpsPort { get; set; }
diff --git a/util/Setup/Templates/DockerCompose.hbs b/util/Setup/Templates/DockerCompose.hbs
index 3281a52477..6969067379 100644
--- a/util/Setup/Templates/DockerCompose.hbs
+++ b/util/Setup/Templates/DockerCompose.hbs
@@ -3,12 +3,12 @@
 #
 #########################################################################
 # WARNING: This file is generated. Do not make changes to this file.    #
-# They will be overwritten on update. If you want to make additions to  # 
+# They will be overwritten on update. If you want to make additions to  #
 # this file, you can create a `docker-compose.override.yml` file in the #
-# same directory and it will be merged into this file at runtime.       # 
+# same directory and it will be merged into this file at runtime.       #
 #########################################################################
 
-version: '3'
+version: '{{{ComposeVersion}}}'
 
 services:
   mssql:
diff --git a/util/Setup/Templates/NginxConfig.hbs b/util/Setup/Templates/NginxConfig.hbs
index 7b64ac3d63..41ea06f0f1 100644
--- a/util/Setup/Templates/NginxConfig.hbs
+++ b/util/Setup/Templates/NginxConfig.hbs
@@ -1,7 +1,7 @@
-#########################################################################
-# WARNING: This file is generated. Do not make changes to this file.    #
-# They will be overwritten on update.                                   #
-#########################################################################
+######################################################################
+# WARNING: This file is generated. Do not make changes to this file. #
+# They will be overwritten on update.                                #
+######################################################################
 
 server {
   listen 8080 default_server;