Oppdatert systemkonfigurasjon og refactoret filnavn

navikt · Jan 8, 2024 · b06252a · b06252a
1 parent 9e021ad
commit b06252a
Show file tree

Hide file tree

Showing 82 changed files with 156 additions and 195 deletions.
diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yaml
@@ -13,8 +13,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:

diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml
@@ -13,8 +13,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-amelding-service
 
 springdoc:

diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
@@ -16,8 +16,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-app-tilgang-analyse-service
 
 springdoc:

diff --git a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/arbeidsforhold-service/src/main/resources/application-dev.yml
diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -12,8 +12,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-arbeidsforhold-service
 
 springdoc:

diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml
@@ -17,8 +17,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-batch-bestilling-service
 
 springdoc:

diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml
@@ -5,7 +5,7 @@ azure.app.client.id: ${client_id}
 azure.app.client.secret: ${client_secret}
 
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
-TOKENDINGS_URL: https://tokenx.dev-gcp.nav.cloud.nais.io 
+TOKENDINGS_URL: ${TOKEN_X_ISSUER} 
 spring:
   application:
     name: testnav-bruker-service-dev

diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml
@@ -7,8 +7,8 @@ spring:
     oauth2:
       resourceserver:
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
   jackson:
     serialization:

diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yaml
@@ -47,8 +47,8 @@ spring:
           #The client_id of this application
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:

diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
@@ -23,8 +23,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 consumers:

diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml
@@ -13,8 +13,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-endringsmelding-service
 
 springdoc:

diff --git a/apps/ereg-batch-status-service/src/main/resources/application.yml b/apps/ereg-batch-status-service/src/main/resources/application.yml
@@ -15,8 +15,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-fss:dolly:ereg-batch-status-service
 
 springdoc:

diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
@@ -12,8 +12,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-generer-arbeidsforhold-populasjon-service
   cloud:
     vault:

diff --git a/apps/generer-navn-service/src/main/resources/application.yml b/apps/generer-navn-service/src/main/resources/application.yml
@@ -15,8 +15,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:generer-navn-service
   cloud:
     vault:

diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
@@ -12,8 +12,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-generer-organisasjon-populasjon-service
 
 springdoc:

diff --git a/apps/generer-synt-amelding-service/src/main/resources/application.yml b/apps/generer-synt-amelding-service/src/main/resources/application.yml
@@ -17,8 +17,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-generer-synt-amelding-service
 
 springdoc:

diff --git a/apps/geografiske-kodeverk-service/src/main/resources/application.yml b/apps/geografiske-kodeverk-service/src/main/resources/application.yml
@@ -12,8 +12,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-geografiske-kodeverk-service
 
 springdoc:

diff --git a/apps/helsepersonell-service/src/main/resources/application.yml b/apps/helsepersonell-service/src/main/resources/application.yml
@@ -18,8 +18,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-helsepersonell-service
 
 springdoc:

diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application.yml b/apps/inntektsmelding-generator-service/src/main/resources/application.yml
@@ -14,8 +14,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-generator-service
   cloud:
     vault:

diff --git a/apps/inntektsmelding-service/src/main/resources/application.yml b/apps/inntektsmelding-service/src/main/resources/application.yml
@@ -18,8 +18,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-service
 
 springdoc:

diff --git a/apps/jenkins-batch-status-service/src/main/resources/application.yml b/apps/jenkins-batch-status-service/src/main/resources/application.yml
@@ -15,8 +15,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-jenkins-batch-status-service
 
 springdoc:

diff --git a/apps/joark-dokument-service/src/main/resources/application.yml b/apps/joark-dokument-service/src/main/resources/application.yml
@@ -20,8 +20,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-joark-dokument-service
 
 springdoc:

diff --git a/apps/miljoer-service/src/main/resources/application.yml b/apps/miljoer-service/src/main/resources/application.yml
@@ -17,8 +17,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-miljoer-service
   cloud:
     vault:

diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application.yml b/apps/oppsummeringsdokument-service/src/main/resources/application.yml
@@ -17,8 +17,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:oppsummeringsdokument-service
   application:
     name: oppsummeringsdokument-service

diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application.yml b/apps/organisasjon-bestilling-service/src/main/resources/application.yml
@@ -16,8 +16,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:organisasjon-bestilling-service
 
 springdoc:

diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application.yml b/apps/organisasjon-faste-data-service/src/main/resources/application.yml
@@ -12,8 +12,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-organisasjon-faste-data-service
   cloud:
     vault:

diff --git a/apps/organisasjon-forvalter/src/main/resources/application.yml b/apps/organisasjon-forvalter/src/main/resources/application.yml
@@ -13,8 +13,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-organisasjon-forvalter
 
 springdoc:

diff --git a/...nisasjonmottak/OMSApplicationStarter.java → ...asjonMottakServiceApplicationStarter.java b/...nisasjonmottak/OMSApplicationStarter.java → ...asjonMottakServiceApplicationStarter.java
@@ -6,10 +6,10 @@
 
 @Slf4j
 @SpringBootApplication
-public class OMSApplicationStarter {
+public class OrganisasjonMottakServiceApplicationStarter {
 
     public static void main(String[] args) {
-        SpringApplication.run(OMSApplicationStarter.class, args);
+        SpringApplication.run(OrganisasjonMottakServiceApplicationStarter.class, args);
 
     }
 }
diff --git a/apps/organisasjon-mottak-service/src/main/resources/application.yml b/apps/organisasjon-mottak-service/src/main/resources/application.yml
@@ -12,8 +12,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-organisasjon-mottak-service
 
 springdoc:

diff --git a/apps/organisasjon-service/src/main/resources/application.yml b/apps/organisasjon-service/src/main/resources/application.yml
@@ -11,8 +11,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-organisasjon-service
   cloud:
     vault:

diff --git a/apps/organisasjon-tilgang-service/config.yml b/apps/organisasjon-tilgang-service/config.yml
@@ -74,7 +74,7 @@ spec:
     - name: ACCEPTED_AUDIENCE
       value: dev-gcp:dolly:testnav-organisasjon-tilgang-service
     - name: TOKENDINGS_URL
-      value: https://tokenx.dev-gcp.nav.cloud.nais.io 
+      value: ${TOKEN_X_ISSUER} 
   gcp:
     sqlInstances:
       - type: POSTGRES_15

diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 
 ALTINN_URL: https://tt02.altinn.no
-TOKENDINGS_URL: https://tokenx.dev-gcp.nav.cloud.nais.io
+TOKENDINGS_URL: ${TOKEN_X_ISSUER}
 
 altinn.api.key: dummy
 

diff --git a/apps/orgnummer-service/src/main/resources/application.yml b/apps/orgnummer-service/src/main/resources/application.yml
@@ -17,8 +17,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: dev-gcp:dolly:testnav-orgnummer-service
   cloud:
     vault:

diff --git a/apps/oversikt-frontend/src/main/resources/application.yml b/apps/oversikt-frontend/src/main/resources/application.yml
@@ -9,8 +9,8 @@ spring:
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
         tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
   cloud:
     vault:
       enabled: false

diff --git a/apps/pdl-forvalter/config.test.yml b/apps/pdl-forvalter/config.test.yml
@@ -13,6 +13,8 @@ spec:
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: dev
+    - name: ACCEPTED_AUDIENCE
+      value: dev-gcp:dolly:testnav-pdl-forvalter-dev
   image: "{{image}}"
   webproxy: true
   tokenx:

diff --git a/apps/pdl-forvalter/config.yml b/apps/pdl-forvalter/config.yml
@@ -13,6 +13,8 @@ spec:
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: prod
+    - name: ACCEPTED_AUDIENCE
+      value: dev-gcp:dolly:testnav-pdl-forvalter
   image: "{{image}}"
   webproxy: true
   tokenx:

diff --git a/apps/pdl-forvalter/src/main/resources/application-dev.yaml b/apps/pdl-forvalter/src/main/resources/application-dev.yaml
@@ -21,14 +21,3 @@ spring:
     enabled: true # Disabled by default as you should probably think twice before running Flyway-migrations
     locations: classpath:db/migration
     baseline-on-migrate: true
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
-        tokenx:
-          issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
-          jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
-          accepted-audience: dev-gcp:dolly:testnav-pdl-forvalter-dev