diff --git a/src/Admin/Controllers/HomeController.cs b/src/Admin/Controllers/HomeController.cs
index 5484b0418..3573dbcd4 100644
--- a/src/Admin/Controllers/HomeController.cs
+++ b/src/Admin/Controllers/HomeController.cs
@@ -68,7 +68,8 @@ namespace Bit.Admin.Controllers
         {
             try
             {
-                var response = await _httpClient.GetAsync($"{_globalSettings.BaseServiceUri.Vault}/version.json");
+                var response = await _httpClient.GetAsync(
+                    $"{_globalSettings.BaseServiceUri.InternalVault}/version.json");
                 if(response.IsSuccessStatusCode)
                 {
                     var json = await response.Content.ReadAsStringAsync();
diff --git a/src/Admin/appsettings.Production.json b/src/Admin/appsettings.Production.json
index e0dbff6b0..6ca845bcd 100644
--- a/src/Admin/appsettings.Production.json
+++ b/src/Admin/appsettings.Production.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Admin/appsettings.json b/src/Admin/appsettings.json
index 7927f980f..10a0a9115 100644
--- a/src/Admin/appsettings.json
+++ b/src/Admin/appsettings.json
@@ -8,7 +8,9 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "internalIdentity": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656",
+      "internalApi": "http://localhost:4000",
+      "internalVault": "http://localhost:4001"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Api/appsettings.Preview.json b/src/Api/appsettings.Preview.json
index ebe1db52d..3206644db 100644
--- a/src/Api/appsettings.Preview.json
+++ b/src/Api/appsettings.Preview.json
@@ -4,7 +4,9 @@
       "vault": "https://preview-vault.bitwarden.com",
       "api": "https://preview-api.bitwarden.com",
       "identity": "https://preview-identity.bitwarden.com",
-      "internalIdentity": "https://preview-identity.bitwarden.com"
+      "internalIdentity": "https://preview-identity.bitwarden.com",
+      "internalApi": "https://preview-api.bitwarden.com",
+      "internalVault": "https://preview-vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Api/appsettings.Production.json b/src/Api/appsettings.Production.json
index e0dbff6b0..6ca845bcd 100644
--- a/src/Api/appsettings.Production.json
+++ b/src/Api/appsettings.Production.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Api/appsettings.Staging.json b/src/Api/appsettings.Staging.json
index 87ace9ae2..b70143c2c 100644
--- a/src/Api/appsettings.Staging.json
+++ b/src/Api/appsettings.Staging.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Api/appsettings.json b/src/Api/appsettings.json
index d682e8f86..b74a3306f 100644
--- a/src/Api/appsettings.json
+++ b/src/Api/appsettings.json
@@ -8,7 +8,9 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "internalIdentity": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656",
+      "internalApi": "http://localhost:4000",
+      "internalVault": "http://localhost:4001"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Billing/appsettings.json b/src/Billing/appsettings.json
index 7ae4ac024..1b64f9051 100644
--- a/src/Billing/appsettings.json
+++ b/src/Billing/appsettings.json
@@ -8,7 +8,9 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "internalIdentity": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656",
+      "internalApi": "http://localhost:4000",
+      "internalVault": "http://localhost:4001"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Core/GlobalSettings.cs b/src/Core/GlobalSettings.cs
index 2e71e3550..8b27c9c96 100644
--- a/src/Core/GlobalSettings.cs
+++ b/src/Core/GlobalSettings.cs
@@ -35,6 +35,8 @@ namespace Bit.Core
             public string Api { get; set; }
             public string Identity { get; set; }
             public string InternalIdentity { get; set; }
+            public string InternalApi { get; set; }
+            public string InternalVault { get; set; }
         }
 
         public class SqlServerSettings
diff --git a/src/Events/appsettings.Preview.json b/src/Events/appsettings.Preview.json
index ebe1db52d..3206644db 100644
--- a/src/Events/appsettings.Preview.json
+++ b/src/Events/appsettings.Preview.json
@@ -4,7 +4,9 @@
       "vault": "https://preview-vault.bitwarden.com",
       "api": "https://preview-api.bitwarden.com",
       "identity": "https://preview-identity.bitwarden.com",
-      "internalIdentity": "https://preview-identity.bitwarden.com"
+      "internalIdentity": "https://preview-identity.bitwarden.com",
+      "internalApi": "https://preview-api.bitwarden.com",
+      "internalVault": "https://preview-vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Events/appsettings.Production.json b/src/Events/appsettings.Production.json
index 87ace9ae2..b70143c2c 100644
--- a/src/Events/appsettings.Production.json
+++ b/src/Events/appsettings.Production.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Events/appsettings.Staging.json b/src/Events/appsettings.Staging.json
index 87ace9ae2..b70143c2c 100644
--- a/src/Events/appsettings.Staging.json
+++ b/src/Events/appsettings.Staging.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Events/appsettings.json b/src/Events/appsettings.json
index 7d5ebc123..266ad50c4 100644
--- a/src/Events/appsettings.json
+++ b/src/Events/appsettings.json
@@ -6,7 +6,9 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "internalIdentity": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656",
+      "internalApi": "http://localhost:4000",
+      "internalVault": "http://localhost:4001"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Identity/appsettings.Preview.json b/src/Identity/appsettings.Preview.json
index ebe1db52d..3206644db 100644
--- a/src/Identity/appsettings.Preview.json
+++ b/src/Identity/appsettings.Preview.json
@@ -4,7 +4,9 @@
       "vault": "https://preview-vault.bitwarden.com",
       "api": "https://preview-api.bitwarden.com",
       "identity": "https://preview-identity.bitwarden.com",
-      "internalIdentity": "https://preview-identity.bitwarden.com"
+      "internalIdentity": "https://preview-identity.bitwarden.com",
+      "internalApi": "https://preview-api.bitwarden.com",
+      "internalVault": "https://preview-vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Identity/appsettings.Production.json b/src/Identity/appsettings.Production.json
index e0dbff6b0..6ca845bcd 100644
--- a/src/Identity/appsettings.Production.json
+++ b/src/Identity/appsettings.Production.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Identity/appsettings.Staging.json b/src/Identity/appsettings.Staging.json
index 87ace9ae2..b70143c2c 100644
--- a/src/Identity/appsettings.Staging.json
+++ b/src/Identity/appsettings.Staging.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Identity/appsettings.json b/src/Identity/appsettings.json
index 26dccd516..330da6e60 100644
--- a/src/Identity/appsettings.json
+++ b/src/Identity/appsettings.json
@@ -8,7 +8,9 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "internalIdentity": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656",
+      "internalApi": "http://localhost:4000",
+      "internalVault": "http://localhost:4001"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Jobs/appsettings.Preview.json b/src/Jobs/appsettings.Preview.json
index ebe1db52d..3206644db 100644
--- a/src/Jobs/appsettings.Preview.json
+++ b/src/Jobs/appsettings.Preview.json
@@ -4,7 +4,9 @@
       "vault": "https://preview-vault.bitwarden.com",
       "api": "https://preview-api.bitwarden.com",
       "identity": "https://preview-identity.bitwarden.com",
-      "internalIdentity": "https://preview-identity.bitwarden.com"
+      "internalIdentity": "https://preview-identity.bitwarden.com",
+      "internalApi": "https://preview-api.bitwarden.com",
+      "internalVault": "https://preview-vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Jobs/appsettings.Production.json b/src/Jobs/appsettings.Production.json
index e0dbff6b0..6ca845bcd 100644
--- a/src/Jobs/appsettings.Production.json
+++ b/src/Jobs/appsettings.Production.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Jobs/appsettings.Staging.json b/src/Jobs/appsettings.Staging.json
index 87ace9ae2..b70143c2c 100644
--- a/src/Jobs/appsettings.Staging.json
+++ b/src/Jobs/appsettings.Staging.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     }
   }
 }
diff --git a/src/Jobs/appsettings.json b/src/Jobs/appsettings.json
index 968ae829f..addf0cc9f 100644
--- a/src/Jobs/appsettings.json
+++ b/src/Jobs/appsettings.json
@@ -8,7 +8,9 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "internalIdentity": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656",
+      "internalApi": "http://localhost:4000",
+      "internalVault": "http://localhost:4001"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Scim/appsettings.Production.json b/src/Scim/appsettings.Production.json
index e0dbff6b0..6ca845bcd 100644
--- a/src/Scim/appsettings.Production.json
+++ b/src/Scim/appsettings.Production.json
@@ -4,7 +4,9 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "internalIdentity": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com",
+      "internalApi": "https://api.bitwarden.com",
+      "internalVault": "https://vault.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Scim/appsettings.json b/src/Scim/appsettings.json
index 7ae4ac024..1b64f9051 100644
--- a/src/Scim/appsettings.json
+++ b/src/Scim/appsettings.json
@@ -8,7 +8,9 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "internalIdentity": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656",
+      "internalApi": "http://localhost:4000",
+      "internalVault": "http://localhost:4001"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs
index 8d365f2e9..7d076504f 100644
--- a/util/Setup/EnvironmentFileBuilder.cs
+++ b/util/Setup/EnvironmentFileBuilder.cs
@@ -127,6 +127,8 @@ globalSettings__baseServiceUri__vault=http://localhost
 globalSettings__baseServiceUri__api=http://localhost/api
 globalSettings__baseServiceUri__identity=http://localhost/identity
 globalSettings__baseServiceUri__internalIdentity=http://identity:5000
+globalSettings__baseServiceUri__internalApi=http://api:5000
+globalSettings__baseServiceUri__internalVault=http://web:5000
 globalSettings__pushRelayBaseUri=https://push.bitwarden.com
 globalSettings__installation__identityUri=https://identity.bitwarden.com
 ");