diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs
index 79d98a90c251..00b4e42d6a5b 100644
--- a/util/Setup/EnvironmentFileBuilder.cs
+++ b/util/Setup/EnvironmentFileBuilder.cs
@@ -83,6 +83,12 @@ private void Init()
         {
             ["globalSettings__baseServiceUri__vault"] = _context.Config.Url,
             ["globalSettings__baseServiceUri__cloudRegion"] = _context.Install?.CloudRegion.ToString(),
+            ["globalSettings__baseServiceUri__internalIdentity"] = "http://bitwarden-identity:5000",
+            ["globalSettings__baseServiceUri__internalApi"] = "http://bitwarden-api:5000",
+            ["globalSettings__baseServiceUri__internalNotifications"] = "http://bitwarden-notifications:5000",
+            ["globalSettings__baseServiceUri__internalSso"] = "http://bitwarden-sso:5000",
+            ["globalSettings__baseServiceUri__internalAdmin"] = "http://bitwarden-admin:5000",
+            ["globalSettings__baseServiceUri__internalVault"] = "http://bitwarden-web:5000",
             ["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString.Replace("\"", "\\\"")}\"",
             ["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword,
             ["globalSettings__internalIdentityKey"] = _context.Stub ? "RANDOM_IDENTITY_KEY" :
@@ -120,7 +126,7 @@ private void Init()
         _keyConnectorOverrideValues = new Dictionary<string, string>
         {
             ["keyConnectorSettings__webVaultUri"] = _context.Config.Url,
-            ["keyConnectorSettings__identityServerUri"] = "http://identity:5000",
+            ["keyConnectorSettings__identityServerUri"] = "http://bitwarden-identity:5000",
             ["keyConnectorSettings__database__provider"] = "json",
             ["keyConnectorSettings__database__jsonFilePath"] = "/etc/bitwarden/key-connector/data.json",
             ["keyConnectorSettings__rsaKey__provider"] = "certificate",
diff --git a/util/Setup/Templates/NginxConfig.hbs b/util/Setup/Templates/NginxConfig.hbs
index b8a6ee899c08..22577a416aed 100644
--- a/util/Setup/Templates/NginxConfig.hbs
+++ b/util/Setup/Templates/NginxConfig.hbs
@@ -63,7 +63,7 @@ server {
 {{/if}}
 
   location / {
-    proxy_pass http://web:5000/;
+    proxy_pass http://bitwarden-web:5000/;
 {{#if Ssl}}
     include /etc/nginx/security-headers-ssl.conf;
 {{/if}}
@@ -79,7 +79,7 @@ server {
   }
 
   location = /app-id.json {
-    proxy_pass http://web:5000/app-id.json;
+    proxy_pass http://bitwarden-web:5000/app-id.json;
 {{#if Ssl}}
     include /etc/nginx/security-headers-ssl.conf;
 {{/if}}
@@ -89,55 +89,55 @@ server {
   }
 
   location = /duo-connector.html {
-    proxy_pass http://web:5000/duo-connector.html;
+    proxy_pass http://bitwarden-web:5000/duo-connector.html;
   }
 
   location = /webauthn-connector.html {
-    proxy_pass http://web:5000/webauthn-connector.html;
+    proxy_pass http://bitwarden-web:5000/webauthn-connector.html;
   }
 
   location = /webauthn-fallback-connector.html {
-    proxy_pass http://web:5000/webauthn-fallback-connector.html;
+    proxy_pass http://bitwarden-web:5000/webauthn-fallback-connector.html;
   }
 
   location = /sso-connector.html {
-    proxy_pass http://web:5000/sso-connector.html;
+    proxy_pass http://bitwarden-web:5000/sso-connector.html;
   }
 
   location /attachments/ {
-    proxy_pass http://attachments:5000/;
+    proxy_pass http://bitwarden-attachments:5000/;
   }
 
   location /api/ {
-    proxy_pass http://api:5000/;
+    proxy_pass http://bitwarden-api:5000/;
   }
 
   location /icons/ {
-    proxy_pass http://icons:5000/;
+    proxy_pass http://bitwarden-icons:5000/;
   }
 
   location /notifications/ {
-    proxy_pass http://notifications:5000/;
+    proxy_pass http://bitwarden-notifications:5000/;
   }
 
   location /notifications/hub {
-    proxy_pass http://notifications:5000/hub;
+    proxy_pass http://bitwarden-notifications:5000/hub;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $http_connection;
   }
 
   location /notifications/anonymous-hub {
-    proxy_pass http://notifications:5000/anonymous-hub;
+    proxy_pass http://bitwarden-notifications:5000/anonymous-hub;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $http_connection;
   }
 
   location /events/ {
-    proxy_pass http://events:5000/;
+    proxy_pass http://bitwarden-events:5000/;
   }
 
   location /sso {
-    proxy_pass http://sso:5000;
+    proxy_pass http://bitwarden-sso:5000;
 {{#if Ssl}}
     include /etc/nginx/security-headers-ssl.conf;
 {{/if}}
@@ -146,7 +146,7 @@ server {
   }
 
   location /identity {
-    proxy_pass http://identity:5000;
+    proxy_pass http://bitwarden-identity:5000;
 {{#if Ssl}}
     include /etc/nginx/security-headers-ssl.conf;
 {{/if}}
@@ -155,7 +155,7 @@ server {
   }
 
   location /admin {
-    proxy_pass http://admin:5000;
+    proxy_pass http://bitwarden-admin:5000;
 {{#if Ssl}}
     include /etc/nginx/security-headers-ssl.conf;
 {{/if}}
@@ -165,13 +165,13 @@ server {
 
 {{#if EnableKeyConnector}}
   location /key-connector/ {
-    proxy_pass http://key-connector:5000/;
+    proxy_pass http://bitwarden-key-connector:5000/;
   }
 {{/if}}
 {{#if EnableScim}}
 
   location /scim/ {
-    proxy_pass http://scim:5000/;
+    proxy_pass http://bitwarden-scim:5000/;
   }
 {{/if}}