diff --git a/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/config/impl/OidcProviderConfig.java b/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/config/impl/OidcProviderConfig.java
index a1eb9fe9c..840f664cc 100644
--- a/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/config/impl/OidcProviderConfig.java
+++ b/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/config/impl/OidcProviderConfig.java
@@ -121,13 +121,13 @@ private static OpenIDConfiguration createStsConfiguration(String wellKnownUrl) {
 
     @SuppressWarnings("unused")
     private static OpenIDConfiguration createAzureAppConfiguration(String wellKnownUrl) {
-        var useProxy = ENV.isLocal() ? null : URI.create(ENV.getProperty(AZURE_HTTP_PROXY, getDefaultProxy()));
+        var proxyUrl = ENV.isFss() ? URI.create(ENV.getProperty(AZURE_HTTP_PROXY, getDefaultProxy())) : null;
         return createConfiguration(OpenIDProvider.AZUREAD, Optional.ofNullable(getAzureProperty(AzureProperty.AZURE_OPENID_CONFIG_ISSUER))
-                .orElseGet(() -> getIssuerFra(wellKnownUrl, useProxy).orElse(null)),
+                .orElseGet(() -> getIssuerFra(wellKnownUrl, proxyUrl).orElse(null)),
             Optional.ofNullable(getAzureProperty(AzureProperty.AZURE_OPENID_CONFIG_JWKS_URI))
-                .orElseGet(() -> getJwksFra(wellKnownUrl, useProxy).orElse(null)),
+                .orElseGet(() -> getJwksFra(wellKnownUrl, proxyUrl).orElse(null)),
             Optional.ofNullable(getAzureProperty(AzureProperty.AZURE_OPENID_CONFIG_TOKEN_ENDPOINT))
-                .orElseGet(() -> getTokenEndpointFra(wellKnownUrl, useProxy).orElse(null)), !ENV.isLocal(), useProxy,
+                .orElseGet(() -> getTokenEndpointFra(wellKnownUrl, proxyUrl).orElse(null)), ENV.isFss(), proxyUrl,
             getAzureProperty(AzureProperty.AZURE_APP_CLIENT_ID), getAzureProperty(AzureProperty.AZURE_APP_CLIENT_SECRET), ENV.isLocal());
     }
 
diff --git a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/FpApplication.java b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/FpApplication.java
index 0f9c3d5b9..3124d7250 100644
--- a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/FpApplication.java
+++ b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/FpApplication.java
@@ -70,7 +70,10 @@ public static String contextPathFor(FpApplication application) {
             if (ENV.isFss()) { // Kaller fra FSS til GCP
                 return prefix + ".intern" + (ENV.isProd() ? "" : ".dev") + ".nav.no/" + appname;
             } else if (ENV.isGcp()) { // Kaller fra GCP til FSS
-                return prefix + clusterForApplication.clusterName() + "-pub.nais.io/" + appname;
+                if (FPSAK.equals(application)) {
+                    return prefix + "-api." + clusterForApplication.clusterName() + "-pub.nais.io/" + appname;
+                }
+                return prefix + "." + clusterForApplication.clusterName() + "-pub.nais.io/" + appname;
             } else {
                 throw new IllegalStateException("Utviklerfeil: Skal ikke komme hit");
             }