diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index f7bc928cb2..67a30226bc 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -180,7 +180,7 @@ namespace Bit.Api
             {
                 Authority = globalSettings.BaseServiceUri.InternalIdentity,
                 AllowedScopes = new string[] { "api" },
-                RequireHttpsMetadata = false && !env.IsDevelopment(),
+                RequireHttpsMetadata = !env.IsDevelopment() && globalSettings.BaseServiceUri.InternalIdentity.StartsWith("https"),
                 ApiName = "api",
                 NameClaimType = ClaimTypes.Email,
                 // Suffix until we retire the old jwt schemes.
diff --git a/src/Api/settings.json b/src/Api/settings.json
index 31839f2ae8..650f6fa03a 100644
--- a/src/Api/settings.json
+++ b/src/Api/settings.json
@@ -8,7 +8,7 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "identityInternal": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Billing/settings.json b/src/Billing/settings.json
index 481f843ad2..eac966c20a 100644
--- a/src/Billing/settings.json
+++ b/src/Billing/settings.json
@@ -8,7 +8,7 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "identityInternal": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656"
     },
     "sqlServer": {
       "connectionString": "SECRET"
diff --git a/src/Identity/settings.json b/src/Identity/settings.json
index 0ba274093d..a2f4b590b5 100644
--- a/src/Identity/settings.json
+++ b/src/Identity/settings.json
@@ -8,7 +8,7 @@
       "vault": "http://localhost:4001",
       "api": "http://localhost:4000",
       "identity": "http://localhost:33656",
-      "identityInternal": "http://localhost:33656"
+      "internalIdentity": "http://localhost:33656"
     },
     "sqlServer": {
       "connectionString": "SECRET"