diff --git a/util/Setup/DockerComposeBuilder.cs b/util/Setup/DockerComposeBuilder.cs
index 38620b9876..6b171ea8db 100644
--- a/util/Setup/DockerComposeBuilder.cs
+++ b/util/Setup/DockerComposeBuilder.cs
@@ -87,7 +87,7 @@ namespace Bit.Setup
 version: '3'
 
 services:
-  bitwarden-mssql:
+  mssql:
     image: bitwarden/mssql:{CoreVersion}
     container_name: bitwarden-mssql
     restart: always
@@ -110,21 +110,21 @@ services:
       - mssql.env
       - ../env/mssql.override.env
 
-  bitwarden-web:
+  web:
     image: bitwarden/web:{WebVersion}
     container_name: bitwarden-web
     restart: always
     volumes:
       - ../web:/etc/bitwarden/web
 
-  bitwarden-attachments:
+  attachments:
     image: bitwarden/attachments:{CoreVersion}
     container_name: bitwarden-attachments
     restart: always
     volumes:
       - ../core/attachments:/etc/bitwarden/core/attachments
 
-  bitwarden-api:
+  api:
     image: bitwarden/api:{CoreVersion}
     container_name: bitwarden-api
     restart: always
@@ -134,7 +134,7 @@ services:
       - global.env
       - ../env/global.override.env
 
-  bitwarden-identity:
+  identity:
     image: bitwarden/identity:{CoreVersion}
     container_name: bitwarden-identity
     restart: always
@@ -145,12 +145,12 @@ services:
       - global.env
       - ../env/global.override.env
 
-  bitwarden-icons:
+  icons:
     image: bitwarden/icons:{CoreVersion}
     container_name: bitwarden-icons
     restart: always
 
-  bitwarden-nginx:
+  nginx:
     image: bitwarden/nginx:{CoreVersion}
     container_name: bitwarden-nginx
     restart: always
diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs
index a65dbbe7e3..36daaf4a60 100644
--- a/util/Setup/EnvironmentFileBuilder.cs
+++ b/util/Setup/EnvironmentFileBuilder.cs
@@ -35,7 +35,7 @@ namespace Bit.Setup
 
         private void Init(bool forInstall)
         {
-            var dbConnectionString = Helpers.MakeSqlConnectionString("bitwarden-mssql", "vault", "sa", DatabasePassword);
+            var dbConnectionString = Helpers.MakeSqlConnectionString("mssql", "vault", "sa", DatabasePassword);
             _globalValues = new Dictionary<string, string>
             {
                 ["globalSettings__baseServiceUri__vault"] = Url,
@@ -125,7 +125,7 @@ globalSettings__selfHosted=true
 globalSettings__baseServiceUri__vault=http://localhost
 globalSettings__baseServiceUri__api=http://localhost/api
 globalSettings__baseServiceUri__identity=http://localhost/identity
-globalSettings__baseServiceUri__internalIdentity=http://bitwarden-identity
+globalSettings__baseServiceUri__internalIdentity=http://identity
 globalSettings__pushRelayBaseUri=https://push.bitwarden.com
 globalSettings__installation__identityUri=https://identity.bitwarden.com
 ");
diff --git a/util/Setup/NginxConfigBuilder.cs b/util/Setup/NginxConfigBuilder.cs
index 634cc496b9..490ceed3cd 100644
--- a/util/Setup/NginxConfigBuilder.cs
+++ b/util/Setup/NginxConfigBuilder.cs
@@ -169,29 +169,29 @@ server {{
 
                 sw.WriteLine($@"
   location / {{
-    proxy_pass http://bitwarden-web/;
+    proxy_pass http://web/;
   }}
 
   location = /app-id.json {{
-    proxy_pass http://bitwarden-web/app-id.json;
+    proxy_pass http://web/app-id.json;
     proxy_hide_header Content-Type;
     add_header Content-Type $fido_content_type;
   }}
 
   location /attachments/ {{
-    proxy_pass http://bitwarden-attachments/;
+    proxy_pass http://attachments/;
   }}
 
   location /api/ {{
-    proxy_pass http://bitwarden-api/;
+    proxy_pass http://api/;
   }}
 
   location /identity/ {{
-    proxy_pass http://bitwarden-identity/;
+    proxy_pass http://identity/;
   }}
 
   location /icons/ {{
-    proxy_pass http://bitwarden-icons/;
+    proxy_pass http://icons/;
   }}
 }}");
             }
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index 79485c252e..6db2f6831b 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -233,9 +233,9 @@ namespace Bit.Setup
 
             var dbPass = Helpers.GetValueFronEnvFile("mssql", "SA_PASSWORD");
             var masterConnectionString = Helpers.MakeSqlConnectionString(
-                "bitwarden-mssql", "master", "sa", dbPass ?? string.Empty);
+                "mssql", "master", "sa", dbPass ?? string.Empty);
             var vaultConnectionString = Helpers.MakeSqlConnectionString(
-                "bitwarden-mssql", "vault", "sa", dbPass ?? string.Empty);
+                "mssql", "vault", "sa", dbPass ?? string.Empty);
 
             using(var connection = new SqlConnection(masterConnectionString))
             {