diff --git a/Dockerfile b/Dockerfile
index a682b6e9f..93362e7ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
-FROM ghcr.io/navikt/pus-nais-java-app/pus-nais-java-app:java17
+FROM ghcr.io/navikt/baseimages/temurin:17
 COPY /target/veilarbregistrering.jar app.jar
diff --git a/nais/nais-dev-gcp.yaml b/nais/nais-dev-gcp.yaml
index 8620ee96e..6b634b6ae 100644
--- a/nais/nais-dev-gcp.yaml
+++ b/nais/nais-dev-gcp.yaml
@@ -15,8 +15,9 @@ spec:
           - "NAVident"
   tokenx:
     enabled: true
+  idporten:
+    enabled: true
   envFrom:
-    - configmap: loginservice-idporten
     - secret: veilarbregistrering
   image: {{image}}
   ingresses:
diff --git a/nais/nais-prod-gcp.yaml b/nais/nais-prod-gcp.yaml
index 142817486..6ffc0a98d 100644
--- a/nais/nais-prod-gcp.yaml
+++ b/nais/nais-prod-gcp.yaml
@@ -15,8 +15,9 @@ spec:
           - "NAVident"
   tokenx:
     enabled: true
+  idporten:
+    enabled: true
   envFrom:
-    - configmap: loginservice-idporten
     - secret: veilarbregistrering
   image: {{image}}
   ingresses:
diff --git a/src/main/kotlin/no/nav/fo/veilarbregistrering/config/filters/FilterConfig.kt b/src/main/kotlin/no/nav/fo/veilarbregistrering/config/filters/FilterConfig.kt
index 4e2543d77..eaade98e7 100644
--- a/src/main/kotlin/no/nav/fo/veilarbregistrering/config/filters/FilterConfig.kt
+++ b/src/main/kotlin/no/nav/fo/veilarbregistrering/config/filters/FilterConfig.kt
@@ -72,8 +72,8 @@ class FilterConfig {
     }
 
     private fun createAzureAdB2CConfig(): OidcAuthenticatorConfig {
-        val discoveryUrl = requireProperty("LOGINSERVICE_IDPORTEN_DISCOVERY_URL")
-        val clientId = requireProperty("LOGINSERVICE_IDPORTEN_AUDIENCE")
+        val discoveryUrl = requireProperty("IDPORTEN_WELL_KNOWN_URL")
+        val clientId = requireProperty("IDPORTEN_CLIENT_ID")
         return OidcAuthenticatorConfig()
             .withDiscoveryUrl(discoveryUrl)
             .withClientId(clientId)