diff --git a/.github/workflows/app.adresse-service.yml b/.github/workflows/app.adresse-service.yml
index 8acaea880af..6277bd2a767 100644
--- a/.github/workflows/app.adresse-service.yml
+++ b/.github/workflows/app.adresse-service.yml
@@ -9,6 +9,7 @@ on:
       - libs/servlet-security
       - apps/adresse-service/**
       - .github/workflows/app.adresse-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.amelding-service.yml b/.github/workflows/app.amelding-service.yml
index 77017ca6d9f..f113babada8 100644
--- a/.github/workflows/app.amelding-service.yml
+++ b/.github/workflows/app.amelding-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/security-core
       - apps/amelding-service/**
       - .github/workflows/app.amelding-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.app-tilgang-analyse-service.yml b/.github/workflows/app.app-tilgang-analyse-service.yml
index 3c5f17f27fa..0b49750af2b 100644
--- a/.github/workflows/app.app-tilgang-analyse-service.yml
+++ b/.github/workflows/app.app-tilgang-analyse-service.yml
@@ -8,6 +8,7 @@ on:
       - libs/reactive-security
       - apps/app-tilgang-analyse-service/**
       - .github/workflows/app.app-tilgang-analyse-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.arbeidsforhold-service.yml b/.github/workflows/app.arbeidsforhold-service.yml
index 339f7da9e05..38727814c13 100644
--- a/.github/workflows/app.arbeidsforhold-service.yml
+++ b/.github/workflows/app.arbeidsforhold-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/servlet-security
       - apps/arbeidsforhold-service/**
       - .github/workflows/app.arbeidsforhold-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.batch-bestilling-service.yml b/.github/workflows/app.batch-bestilling-service.yml
index acc02fe8548..e58a3567662 100644
--- a/.github/workflows/app.batch-bestilling-service.yml
+++ b/.github/workflows/app.batch-bestilling-service.yml
@@ -12,6 +12,7 @@ on:
       - libs/servlet-security
       - apps/batch-bestilling-service/**
       - .github/workflows/app.batch-bestilling-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.brreg-stub.yml b/.github/workflows/app.brreg-stub.yml
index 7d4a1591b6a..c1ead9d9416 100644
--- a/.github/workflows/app.brreg-stub.yml
+++ b/.github/workflows/app.brreg-stub.yml
@@ -7,6 +7,7 @@ on:
       - libs/servlet-core
       - apps/brreg-stub/**
       - .github/workflows/app.brreg-stub.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.bruker-service.yml b/.github/workflows/app.bruker-service.yml
index 8de7a0b70ad..a31f1382d84 100644
--- a/.github/workflows/app.bruker-service.yml
+++ b/.github/workflows/app.bruker-service.yml
@@ -10,6 +10,7 @@ on:
       - libs/security-core
       - apps/bruker-service/**
       - .github/workflows/app.bruker-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.budpro-service.yml b/.github/workflows/app.budpro-service.yml
index a3311297486..25b20414558 100644
--- a/.github/workflows/app.budpro-service.yml
+++ b/.github/workflows/app.budpro-service.yml
@@ -12,6 +12,7 @@ on:
       - libs/servlet-security
       - apps/budpro-service/**
       - .github/workflows/app.budpro-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.dolly-backend.yml b/.github/workflows/app.dolly-backend.yml
index e8299e69245..c1729b5e588 100644
--- a/.github/workflows/app.dolly-backend.yml
+++ b/.github/workflows/app.dolly-backend.yml
@@ -12,6 +12,7 @@ on:
       - libs/servlet-security
       - apps/dolly-backend/**
       - .github/workflows/app.dolly-backend.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml
index aa95e32abf3..965c12bed8f 100644
--- a/.github/workflows/app.dolly-frontend.yml
+++ b/.github/workflows/app.dolly-frontend.yml
@@ -13,6 +13,8 @@ on:
       - libs/security-core
       - apps/dolly-frontend/**
       - .github/workflows/app.dolly-frontend.yml
+      - .github/workflows/common.cypress.yml
+      - .github/workflows/common.workflow.frontend.yml
 
 jobs:
 
diff --git a/.github/workflows/app.dollystatus.yml b/.github/workflows/app.dollystatus.yml
index 730f43e2f30..abf0c95ade6 100644
--- a/.github/workflows/app.dollystatus.yml
+++ b/.github/workflows/app.dollystatus.yml
@@ -5,6 +5,7 @@ on:
     paths:
       - apps/dollystatus/**
       - .github/workflows/app.dollystatus.yml
+      - .github/workflows/common.workflow.frontend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.endringsmelding-frontend.yml b/.github/workflows/app.endringsmelding-frontend.yml
index a05e180e445..252f0654d6c 100644
--- a/.github/workflows/app.endringsmelding-frontend.yml
+++ b/.github/workflows/app.endringsmelding-frontend.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - apps/endringsmelding-frontend/**
       - .github/workflows/app.endringsmelding-frontend.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.endringsmelding-service.yml b/.github/workflows/app.endringsmelding-service.yml
index e6ecb801a90..dcd6932537a 100644
--- a/.github/workflows/app.endringsmelding-service.yml
+++ b/.github/workflows/app.endringsmelding-service.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - apps/endringsmelding-service/**
       - .github/workflows/app.endringsmelding-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.ereg-batch-status-service.yml b/.github/workflows/app.ereg-batch-status-service.yml
index a85fa1addd1..3a6ad28a3f5 100644
--- a/.github/workflows/app.ereg-batch-status-service.yml
+++ b/.github/workflows/app.ereg-batch-status-service.yml
@@ -9,6 +9,7 @@ on:
       - libs/servlet-security
       - apps/ereg-batch-status-service/**
       - .github/workflows/app.ereg-batch-status-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.faste-data-frontend.yml b/.github/workflows/app.faste-data-frontend.yml
index 7587b562734..4704db12f01 100644
--- a/.github/workflows/app.faste-data-frontend.yml
+++ b/.github/workflows/app.faste-data-frontend.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - apps/faste-data-frontend/**
       - .github/workflows/app.faste-data-frontend.yml
+      - .github/workflows/common.workflow.frontend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml b/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml
index ff7aef85a87..7ac32b67a2b 100644
--- a/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml
+++ b/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml
@@ -10,6 +10,7 @@ on:
       - libs/servlet-insecure-security
       - apps/generer-arbeidsforhold-populasjon-service/**
       - .github/workflows/app.generer-arbeidsforhold-populasjon-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.generer-navn-service.yml b/.github/workflows/app.generer-navn-service.yml
index 6053e0beffd..e3b9aede884 100644
--- a/.github/workflows/app.generer-navn-service.yml
+++ b/.github/workflows/app.generer-navn-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/testing
       - apps/generer-navn-service/**
       - .github/workflows/app.generer-navn-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.generer-organisasjon-populasjon-service.yml b/.github/workflows/app.generer-organisasjon-populasjon-service.yml
index 0ef92eaaa2c..39a820fe093 100644
--- a/.github/workflows/app.generer-organisasjon-populasjon-service.yml
+++ b/.github/workflows/app.generer-organisasjon-populasjon-service.yml
@@ -15,6 +15,7 @@ on:
       - libs/servlet-security
       - apps/generer-organisasjon-populasjon-service/**
       - .github/workflows/app.generer-organisasjon-populasjon-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.generer-synt-amelding-service.yml b/.github/workflows/app.generer-synt-amelding-service.yml
index 6f9b0273a65..eef80e6fc0b 100644
--- a/.github/workflows/app.generer-synt-amelding-service.yml
+++ b/.github/workflows/app.generer-synt-amelding-service.yml
@@ -10,6 +10,7 @@ on:
       - libs/servlet-security
       - apps/generer-synt-amelding-service/**
       - .github/workflows/app.generer-synt-amelding-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.geografiske-kodeverk-service.yml b/.github/workflows/app.geografiske-kodeverk-service.yml
index 0dcc356b185..9ab8c50581d 100644
--- a/.github/workflows/app.geografiske-kodeverk-service.yml
+++ b/.github/workflows/app.geografiske-kodeverk-service.yml
@@ -8,6 +8,7 @@ on:
       - libs/testing
       - apps/geografiske-kodeverk-service/**
       - .github/workflows/app.geografiske-kodeverk-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.helsepersonell-service.yml b/.github/workflows/app.helsepersonell-service.yml
index 4f90de43a9b..c6aa23e77e4 100644
--- a/.github/workflows/app.helsepersonell-service.yml
+++ b/.github/workflows/app.helsepersonell-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/testing
       - apps/helsepersonell-service/**
       - .github/workflows/app.helsepersonell-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.inntektsmelding-generator-service.yml b/.github/workflows/app.inntektsmelding-generator-service.yml
index c78500e6eb4..22873dae2fb 100644
--- a/.github/workflows/app.inntektsmelding-generator-service.yml
+++ b/.github/workflows/app.inntektsmelding-generator-service.yml
@@ -8,6 +8,7 @@ on:
       - libs/servlet-security
       - apps/inntektsmelding-generator-service/**
       - .github/workflows/app.inntektsmelding-generator-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.inntektsmelding-service.yml b/.github/workflows/app.inntektsmelding-service.yml
index 837f9221c41..29dd00d67ac 100644
--- a/.github/workflows/app.inntektsmelding-service.yml
+++ b/.github/workflows/app.inntektsmelding-service.yml
@@ -9,6 +9,7 @@ on:
       - libs/servlet-security
       - apps/inntektsmelding-service/**
       - .github/workflows/app.inntektsmelding-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.jenkins-batch-status-service.yml b/.github/workflows/app.jenkins-batch-status-service.yml
index 9987827a628..9f3d4a1d95e 100644
--- a/.github/workflows/app.jenkins-batch-status-service.yml
+++ b/.github/workflows/app.jenkins-batch-status-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/servlet-security
       - apps/jenkins-batch-status-service/**
       - .github/workflows/app.jenkins-batch-status-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.joark-dokument-service.yml b/.github/workflows/app.joark-dokument-service.yml
index f64331dd625..131c7134d4c 100644
--- a/.github/workflows/app.joark-dokument-service.yml
+++ b/.github/workflows/app.joark-dokument-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/servlet-security
       - apps/joark-dokument-service/**
       - .github/workflows/app.joark-dokument-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.miljoer-service.yml b/.github/workflows/app.miljoer-service.yml
index bdd7c42dd71..4a7b0e9c1ef 100644
--- a/.github/workflows/app.miljoer-service.yml
+++ b/.github/workflows/app.miljoer-service.yml
@@ -10,6 +10,7 @@ on:
       - libs/servlet-security
       - apps/miljoer-service/**
       - .github/workflows/app.miljoer-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.oppsummeringsdokument-service.yml b/.github/workflows/app.oppsummeringsdokument-service.yml
index 85cca7f8edf..56a6df77def 100644
--- a/.github/workflows/app.oppsummeringsdokument-service.yml
+++ b/.github/workflows/app.oppsummeringsdokument-service.yml
@@ -10,6 +10,7 @@ on:
       - xsd/arbeidsforhold-xsd
       - apps/oppsummeringsdokument-service/**
       - .github/workflows/app.oppsummeringsdokument-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-bestilling-service.yml b/.github/workflows/app.organisasjon-bestilling-service.yml
index 5d8e2ce8f35..cb6f343e4f3 100644
--- a/.github/workflows/app.organisasjon-bestilling-service.yml
+++ b/.github/workflows/app.organisasjon-bestilling-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/servlet-security
       - apps/organisasjon-bestilling-service/**
       - .github/workflows/app.organisasjon-bestilling-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-faste-data-service.yml b/.github/workflows/app.organisasjon-faste-data-service.yml
index f0e03bf4f8f..f54061c7762 100644
--- a/.github/workflows/app.organisasjon-faste-data-service.yml
+++ b/.github/workflows/app.organisasjon-faste-data-service.yml
@@ -15,6 +15,7 @@ on:
       - libs/servlet-security
       - apps/organisasjon-faste-data-service/**
       - .github/workflows/app.organisasjon-faste-data-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-forvalter.yml b/.github/workflows/app.organisasjon-forvalter.yml
index 72b5f6861c9..ec42e2fde77 100644
--- a/.github/workflows/app.organisasjon-forvalter.yml
+++ b/.github/workflows/app.organisasjon-forvalter.yml
@@ -15,6 +15,7 @@ on:
       - libs/testing
       - apps/organisasjon-forvalter/**
       - .github/workflows/app.organisasjon-forvalter.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-mottak-service.yml b/.github/workflows/app.organisasjon-mottak-service.yml
index 67dca1c75e7..63cdf10e98c 100644
--- a/.github/workflows/app.organisasjon-mottak-service.yml
+++ b/.github/workflows/app.organisasjon-mottak-service.yml
@@ -14,6 +14,7 @@ on:
       - libs/servlet-insecure-security
       - apps/organisasjon-mottak-service/**
       - .github/workflows/app.organisasjon-mottak-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-service.yml b/.github/workflows/app.organisasjon-service.yml
index 6ccf1c20ea5..e9f23af37f4 100644
--- a/.github/workflows/app.organisasjon-service.yml
+++ b/.github/workflows/app.organisasjon-service.yml
@@ -12,6 +12,7 @@ on:
       - libs/testing
       - apps/organisasjon-service/**
       - .github/workflows/app.organisasjon-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-tilgang-frontend.yml b/.github/workflows/app.organisasjon-tilgang-frontend.yml
index 2b415a11c87..ae8957a72db 100644
--- a/.github/workflows/app.organisasjon-tilgang-frontend.yml
+++ b/.github/workflows/app.organisasjon-tilgang-frontend.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - apps/organisasjon-tilgang-frontend/**
       - .github/workflows/app.organisasjon-tilgang-frontend.yml
+      - .github/workflows/common.workflow.frontend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-tilgang-service.yml b/.github/workflows/app.organisasjon-tilgang-service.yml
index fabd9193dce..6258e580c8b 100644
--- a/.github/workflows/app.organisasjon-tilgang-service.yml
+++ b/.github/workflows/app.organisasjon-tilgang-service.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-security
       - apps/organisasjon-tilgang-service/**
       - .github/workflows/app.organisasjon-tilgang-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.orgnummer-service.yml b/.github/workflows/app.orgnummer-service.yml
index 591148ded99..06cf77b229d 100644
--- a/.github/workflows/app.orgnummer-service.yml
+++ b/.github/workflows/app.orgnummer-service.yml
@@ -12,6 +12,7 @@ on:
       - libs/servlet-security
       - apps/orgnummer-service/**
       - .github/workflows/app.orgnummer-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.oversikt-frontend.yml b/.github/workflows/app.oversikt-frontend.yml
index 6ebf48e69fc..bf5175aee6a 100644
--- a/.github/workflows/app.oversikt-frontend.yml
+++ b/.github/workflows/app.oversikt-frontend.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - apps/oversikt-frontend/**
       - .github/workflows/app.oversikt-frontend.yml
+      - .github/workflows/common.workflow.frontend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.pdl-forvalter.yml b/.github/workflows/app.pdl-forvalter.yml
index 98a372deb3f..c074203f0ca 100644
--- a/.github/workflows/app.pdl-forvalter.yml
+++ b/.github/workflows/app.pdl-forvalter.yml
@@ -11,6 +11,7 @@ on:
       - libs/testing
       - apps/pdl-forvalter/**
       - .github/workflows/app.pdl-forvalter.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-faste-data-service.yml b/.github/workflows/app.person-faste-data-service.yml
index 99c4dc32e8a..6cc485ff6b9 100644
--- a/.github/workflows/app.person-faste-data-service.yml
+++ b/.github/workflows/app.person-faste-data-service.yml
@@ -8,6 +8,7 @@ on:
       - libs/reactive-security
       - apps/person-faste-data-service/**
       - .github/workflows/app.person-faste-data-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-organisasjon-tilgang-service.yml b/.github/workflows/app.person-organisasjon-tilgang-service.yml
index 4d2730bf7c1..1bf80510d05 100644
--- a/.github/workflows/app.person-organisasjon-tilgang-service.yml
+++ b/.github/workflows/app.person-organisasjon-tilgang-service.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - apps/person-organisasjon-tilgang-service/**
       - .github/workflows/app.person-organisasjon-tilgang-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-search-service.yml b/.github/workflows/app.person-search-service.yml
index 991727895cb..1001d64dd10 100644
--- a/.github/workflows/app.person-search-service.yml
+++ b/.github/workflows/app.person-search-service.yml
@@ -10,6 +10,7 @@ on:
       - libs/servlet-security
       - apps/person-search-service/**
       - .github/workflows/app.person-search-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-service.yml b/.github/workflows/app.person-service.yml
index de812278908..1f0436f4795 100644
--- a/.github/workflows/app.person-service.yml
+++ b/.github/workflows/app.person-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/servlet-security
       - apps/person-service/**
       - .github/workflows/app.person-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.profil-api.yml b/.github/workflows/app.profil-api.yml
index 80d2adf4334..87df454bfe1 100644
--- a/.github/workflows/app.profil-api.yml
+++ b/.github/workflows/app.profil-api.yml
@@ -10,6 +10,7 @@ on:
       - libs/servlet-security
       - apps/profil-api/**
       - .github/workflows/app.profil-api.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.sykemelding-api.yml b/.github/workflows/app.sykemelding-api.yml
index 4d72174bee7..7449f666a6c 100644
--- a/.github/workflows/app.sykemelding-api.yml
+++ b/.github/workflows/app.sykemelding-api.yml
@@ -8,6 +8,7 @@ on:
       - libs/servlet-core
       - apps/sykemelding-api/**
       - .github/workflows/app.sykemelding-api.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.synt-sykemelding-api.yml b/.github/workflows/app.synt-sykemelding-api.yml
index 6d8c1fc2098..99b0c235ccc 100644
--- a/.github/workflows/app.synt-sykemelding-api.yml
+++ b/.github/workflows/app.synt-sykemelding-api.yml
@@ -11,6 +11,7 @@ on:
       - libs/testing
       - apps/synt-sykemelding-api/**
       - .github/workflows/app.synt-sykemelding-api.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.synt-vedtakshistorikk-service.yml b/.github/workflows/app.synt-vedtakshistorikk-service.yml
index 6b5bbb48c6b..d025e8e0e95 100644
--- a/.github/workflows/app.synt-vedtakshistorikk-service.yml
+++ b/.github/workflows/app.synt-vedtakshistorikk-service.yml
@@ -11,6 +11,7 @@ on:
       - libs/servlet-security
       - apps/synt-vedtakshistorikk-service/**
       - .github/workflows/app.synt-vedtakshistorikk-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-export-api.yml b/.github/workflows/app.tenor-search-service.yml
similarity index 59%
rename from .github/workflows/app.person-export-api.yml
rename to .github/workflows/app.tenor-search-service.yml
index 9625444e9a7..e7c256f6a16 100644
--- a/.github/workflows/app.person-export-api.yml
+++ b/.github/workflows/app.tenor-search-service.yml
@@ -1,22 +1,21 @@
-name: person-export-api
+name: tenor-search-service
 
 on:
   push:
     paths:
-      - libs/csv-converter
+      - libs/integration-test
       - libs/reactive-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/slack
-      - apps/person-export-api/**
-      - .github/workflows/app.person-export-api.yml
+      - libs/reactive-security
+      - libs/security-core
+      - apps/tenor-search-service/**
+      - .github/workflows/app.tenor-search-service.yml
 
 jobs:
   workflow:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
-      working-directory: "apps/person-export-api"
-      deploy-tag: "#deploy-person-export-api"
+      working-directory: "apps/tenor-search-service"
+      deploy-tag: "#deploy-tenor-search-service"
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/app.testnav-ident-pool.yml b/.github/workflows/app.testnav-ident-pool.yml
index 91eeb585370..db4bde3bc37 100644
--- a/.github/workflows/app.testnav-ident-pool.yml
+++ b/.github/workflows/app.testnav-ident-pool.yml
@@ -11,6 +11,7 @@ on:
       - libs/testing
       - apps/testnav-ident-pool/**
       - .github/workflows/app.testnav-ident-pool.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.testnorge-statisk-data-forvalter.yml b/.github/workflows/app.testnorge-statisk-data-forvalter.yml
index 4e9a952dfda..9aa0b356102 100644
--- a/.github/workflows/app.testnorge-statisk-data-forvalter.yml
+++ b/.github/workflows/app.testnorge-statisk-data-forvalter.yml
@@ -16,6 +16,7 @@ on:
       - libs/testing
       - apps/testnorge-statisk-data-forvalter/**
       - .github/workflows/app.testnorge-statisk-data-forvalter.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.tilbakemelding-api.yml b/.github/workflows/app.tilbakemelding-api.yml
index e7bfacd165b..9e6d2b9db7a 100644
--- a/.github/workflows/app.tilbakemelding-api.yml
+++ b/.github/workflows/app.tilbakemelding-api.yml
@@ -11,6 +11,7 @@ on:
       - libs/slack
       - apps/tilbakemelding-api/**
       - .github/workflows/app.tilbakemelding-api.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.tps-messaging-service.yml b/.github/workflows/app.tps-messaging-service.yml
index be914c409c6..f73c211c682 100644
--- a/.github/workflows/app.tps-messaging-service.yml
+++ b/.github/workflows/app.tps-messaging-service.yml
@@ -9,6 +9,7 @@ on:
       - libs/servlet-security
       - apps/tps-messaging-service/**
       - .github/workflows/app.tps-messaging-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.udi-stub.yml b/.github/workflows/app.udi-stub.yml
index 63dfc1eaf31..ac1d2dde931 100644
--- a/.github/workflows/app.udi-stub.yml
+++ b/.github/workflows/app.udi-stub.yml
@@ -9,6 +9,7 @@ on:
       - libs/servlet-security
       - apps/udi-stub/**
       - .github/workflows/app.udi-stub.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.varslinger-service.yml b/.github/workflows/app.varslinger-service.yml
index f31627c2694..1187386becf 100644
--- a/.github/workflows/app.varslinger-service.yml
+++ b/.github/workflows/app.varslinger-service.yml
@@ -10,6 +10,7 @@ on:
       - libs/servlet-security
       - apps/varslinger-service/**
       - .github/workflows/app.varslinger-service.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml
index 28d7ddc113a..a67bb3c1417 100644
--- a/.github/workflows/proxy.aareg-proxy.yml
+++ b/.github/workflows/proxy.aareg-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/aareg-proxy/**
       - .github/workflows/proxy.aareg-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml
index 244813526fc..b1d91affc37 100644
--- a/.github/workflows/proxy.aareg-synt-services-proxy.yml
+++ b/.github/workflows/proxy.aareg-synt-services-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/aareg-synt-services-proxy/**
       - .github/workflows/proxy.aareg-synt-services-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
index 404f0a8c062..12016f5f61f 100644
--- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml
+++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/arbeidsplassencv-proxy/**
       - .github/workflows/proxy.arbeidsplassencv-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml
index be18f3e63fa..251146513b7 100644
--- a/.github/workflows/proxy.arena-forvalteren-proxy.yml
+++ b/.github/workflows/proxy.arena-forvalteren-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/arena-forvalteren-proxy/**
       - .github/workflows/proxy.arena-forvalteren-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml
index 5baf1f00748..b47ac35679c 100644
--- a/.github/workflows/proxy.batch-adeo-proxy.yml
+++ b/.github/workflows/proxy.batch-adeo-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/batch-adeo-proxy/**
       - .github/workflows/proxy.batch-adeo-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml
index 5e6995ee696..2f697f68d24 100644
--- a/.github/workflows/proxy.brregstub-proxy.yml
+++ b/.github/workflows/proxy.brregstub-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/brregstub-proxy/**
       - .github/workflows/proxy.brregstub-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.dokarkiv-proxy.yml b/.github/workflows/proxy.dokarkiv-proxy.yml
index 4d16fb4ff2a..cda0907e386 100644
--- a/.github/workflows/proxy.dokarkiv-proxy.yml
+++ b/.github/workflows/proxy.dokarkiv-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/dokarkiv-proxy/**
       - .github/workflows/proxy.dokarkiv-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml
index 8ecffe0130e..56d1b009ce6 100644
--- a/.github/workflows/proxy.ereg-proxy.yml
+++ b/.github/workflows/proxy.ereg-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/ereg-proxy/**
       - .github/workflows/proxy.ereg-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml
index cd477338e80..e146dee8b99 100644
--- a/.github/workflows/proxy.histark-proxy.yml
+++ b/.github/workflows/proxy.histark-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/histark-proxy/**
       - .github/workflows/proxy.histark-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml
index 0d0ff4f0b24..16ee7a5d8f8 100644
--- a/.github/workflows/proxy.inntektstub-proxy.yml
+++ b/.github/workflows/proxy.inntektstub-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/inntektstub-proxy/**
       - .github/workflows/proxy.inntektstub-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml
index efcf944cc00..6e11223b2de 100644
--- a/.github/workflows/proxy.inst-proxy.yml
+++ b/.github/workflows/proxy.inst-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/inst-proxy/**
       - .github/workflows/proxy.inst-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.kodeverk-proxy.yml b/.github/workflows/proxy.kodeverk-proxy.yml
deleted file mode 100644
index 4a4c0befbca..00000000000
--- a/.github/workflows/proxy.kodeverk-proxy.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: kodeverk-proxy
-
-on:
-  push:
-    paths:
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/kodeverk-proxy/**
-      - .github/workflows/proxy.kodeverk-proxy.yml
-
-jobs:
-  workflow:
-    uses: ./.github/workflows/common.workflow.backend.yml
-    with:
-      cluster: "dev-fss"
-      working-directory: "proxies/kodeverk-proxy"
-      deploy-tag: "#deploy-proxy"
-    permissions:
-      contents: read
-      id-token: write
-    secrets:
-      NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
-      NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml
index 2618e3be7d7..96dce2b2f5a 100644
--- a/.github/workflows/proxy.kontoregister-person-proxy.yml
+++ b/.github/workflows/proxy.kontoregister-person-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/kontoregister-person-proxy/**
       - .github/workflows/proxy.kontoregister-person-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml
index 83f126d1f55..c6b0f93337f 100644
--- a/.github/workflows/proxy.krrstub-proxy.yml
+++ b/.github/workflows/proxy.krrstub-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/krrstub-proxy/**
       - .github/workflows/proxy.krrstub-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml
index 816b6fa3ad9..a0be21ff8f5 100644
--- a/.github/workflows/proxy.medl-proxy.yml
+++ b/.github/workflows/proxy.medl-proxy.yml
@@ -11,6 +11,7 @@ on:
       - libs/database
       - libs/data-transfer-objects
       - .github/workflows/proxy.medl-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml
index eeeab46890a..7ade7fffe37 100644
--- a/.github/workflows/proxy.norg2-proxy.yml
+++ b/.github/workflows/proxy.norg2-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/norg2-proxy/**
       - .github/workflows/proxy.norg2-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.pdl-proxy.yml b/.github/workflows/proxy.pdl-proxy.yml
index f9070b8401a..7c14776a2e5 100644
--- a/.github/workflows/proxy.pdl-proxy.yml
+++ b/.github/workflows/proxy.pdl-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/pdl-proxy/**
       - .github/workflows/proxy.pdl-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml
index cecc122f40a..0c495bfcf6d 100644
--- a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml
+++ b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/pensjon-testdata-facade-proxy/**
       - .github/workflows/proxy.pensjon-testdata-facade-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml
index 8ad13efbf17..8786ad64df9 100644
--- a/.github/workflows/proxy.saf-proxy.yml
+++ b/.github/workflows/proxy.saf-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/saf-proxy/**
       - .github/workflows/proxy.saf-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml
index 5ce006a6a9c..41f4ef91f53 100644
--- a/.github/workflows/proxy.sigrunstub-proxy.yml
+++ b/.github/workflows/proxy.sigrunstub-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/sigrunstub-proxy/**
       - .github/workflows/proxy.sigrunstub-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml
index 227bcde795b..d03aff5d737 100644
--- a/.github/workflows/proxy.skjermingsregister-proxy.yml
+++ b/.github/workflows/proxy.skjermingsregister-proxy.yml
@@ -8,6 +8,7 @@ on:
       - libs/security-token-service
       - proxies/skjermingsregister-proxy/**
       - .github/workflows/proxy.skjermingsregister-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml
index ef36d482a0e..0277c9b06c4 100644
--- a/.github/workflows/proxy.synthdata-meldekort-proxy.yml
+++ b/.github/workflows/proxy.synthdata-meldekort-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/synthdata-meldekort-proxy/**
       - .github/workflows/proxy.synthdata-meldekort-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.tps-forvalteren-proxy.yml b/.github/workflows/proxy.tps-forvalteren-proxy.yml
index 7a81ab1a699..bd3dbbfac75 100644
--- a/.github/workflows/proxy.tps-forvalteren-proxy.yml
+++ b/.github/workflows/proxy.tps-forvalteren-proxy.yml
@@ -7,6 +7,7 @@ on:
       - libs/reactive-proxy
       - proxies/tps-forvalteren-proxy/**
       - .github/workflows/proxy.tps-forvalteren-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml
index 9784f847502..1359253e785 100644
--- a/.github/workflows/proxy.udistub-proxy.yml
+++ b/.github/workflows/proxy.udistub-proxy.yml
@@ -9,6 +9,7 @@ on:
       - libs/security-core
       - proxies/udistub-proxy/**
       - .github/workflows/proxy.udistub-proxy.yml
+      - .github/workflows/common.workflow.backend.yml
 
 jobs:
   workflow:
diff --git a/.github/workflows/scheduled.scan.markdown.yml b/.github/workflows/scheduled.scan.markdown.yml
index b6081a41d55..a517acc2a9e 100644
--- a/.github/workflows/scheduled.scan.markdown.yml
+++ b/.github/workflows/scheduled.scan.markdown.yml
@@ -8,6 +8,9 @@ on:
         description: "Directory to scan, e.g. apps/dolly-backend. Defaults to whole repo."
         default: "."
         required: true
+    secrets:
+      SLACK_DEAD_URLS_WEBHOOK_URL:
+        required: true
 
 jobs:
   markdown:
@@ -20,4 +23,14 @@ jobs:
         with:
           folder-path: ${{ inputs.working-directory }}
           config-file: .github/workflows/scheduled.scan.markdown.json
-          use-quiet-mode: yes
\ No newline at end of file
+          use-quiet-mode: yes
+      - name: "Slack"
+        if: ${{ failure() }}
+        uses: slackapi/slack-github-action@v1.24.0
+        with:
+          payload: |
+            {
+              "url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEAD_URLS_WEBHOOK_URL }}
\ No newline at end of file
diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
index ff7439fd68e..dec19de4988 100644
--- a/apps/adresse-service/build.gradle
+++ b/apps/adresse-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -68,8 +68,8 @@ dependencies {
     implementation 'org.aspectj:aspectjweaver:1.9.7'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
diff --git a/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties b/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yaml
index 524e039d9e6..248874c9951 100644
--- 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/adresse-service/src/test/resources/application-test.properties b/apps/adresse-service/src/test/resources/application-test.properties
new file mode 100644
index 00000000000..e5e55886152
--- /dev/null
+++ b/apps/adresse-service/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
index 9ee08fb9224..949b8be4cb8 100644
--- a/apps/amelding-service/build.gradle
+++ b/apps/amelding-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -64,15 +64,15 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
-    
+
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'org.hibernate.validator:hibernate-validator'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
diff --git a/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java
index 117a241c0fe..e780ceb060f 100644
--- a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java
+++ b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java
@@ -32,4 +32,4 @@ public Mono<AMelding> get(String id) {
         Mono<String> accessToken = tokenExchange.exchange(consumers.getOppsummeringsdokumentService()).map(AccessToken::getTokenValue);
         return oppsummeringsdokumentConsumer.get(id, accessToken).map(AMelding::new);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml
index 1b7e9b88b6a..fa8f86cbe4c 100644
--- a/apps/amelding-service/src/main/resources/application.yml
+++ b/apps/amelding-service/src/main/resources/application.yml
@@ -13,9 +13,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-amelding-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/amelding-service/src/test/resources/application-test.properties b/apps/amelding-service/src/test/resources/application-test.properties
index f44e7773252..e5e55886152 100644
--- a/apps/amelding-service/src/test/resources/application-test.properties
+++ b/apps/amelding-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
index 562d0a2d3f6..8e2546f6d4a 100644
--- a/apps/app-tilgang-analyse-service/build.gradle
+++ b/apps/app-tilgang-analyse-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -69,8 +69,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
diff --git a/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties b/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
index 7760a09677b..822047d0729 100644
--- a/apps/app-tilgang-analyse-service/src/main/resources/application.yml
+++ b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
@@ -16,9 +16,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-app-tilgang-analyse-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml b/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml
index eccbfdfc4ce..060eeae71e3 100644
--- a/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml
+++ b/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml
@@ -4,4 +4,6 @@ spring:
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
-    password:
\ No newline at end of file
+    password:
+
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
index 15f4cf7f78c..de6e0e5551a 100644
--- a/apps/arbeidsforhold-service/build.gradle
+++ b/apps/arbeidsforhold-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -75,8 +75,8 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
diff --git a/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties b/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/arbeidsforhold-service/src/main/resources/application-dev.yml
deleted file mode 100644
index a1cf247e4df..00000000000
--- a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
\ No newline at end of file
diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
index 4562a9a9d8f..a73601451b5 100644
--- a/apps/arbeidsforhold-service/src/main/resources/application.yml
+++ b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -12,9 +12,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-arbeidsforhold-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/arbeidsforhold-service/src/test/resources/application-test.properties b/apps/arbeidsforhold-service/src/test/resources/application-test.properties
index 01ff575320a..e5e55886152 100644
--- a/apps/arbeidsforhold-service/src/test/resources/application-test.properties
+++ b/apps/arbeidsforhold-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.enabled=false
-
-azure.app.client.id=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
index bceca753034..24fc5f519a0 100644
--- a/apps/batch-bestilling-service/build.gradle
+++ b/apps/batch-bestilling-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -67,8 +67,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/batch-bestilling-service/config.yml b/apps/batch-bestilling-service/config.yml
index 7232b106207..dfc14304b02 100644
--- a/apps/batch-bestilling-service/config.yml
+++ b/apps/batch-bestilling-service/config.yml
@@ -11,8 +11,6 @@ spec:
   webproxy: true
   tokenx:
     enabled: true
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties b/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml
index 82505f2a5da..c94c017e80e 100644
--- a/apps/batch-bestilling-service/src/main/resources/application.yml
+++ b/apps/batch-bestilling-service/src/main/resources/application.yml
@@ -17,9 +17,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-batch-bestilling-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/batch-bestilling-service/src/test/resources/application-test.properties b/apps/batch-bestilling-service/src/test/resources/application-test.properties
index 148b7a6e0e6..483fe127f1f 100644
--- a/apps/batch-bestilling-service/src/test/resources/application-test.properties
+++ b/apps/batch-bestilling-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER= dummy
\ No newline at end of file
diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
index f00997f210d..876c09983c4 100644
--- a/apps/brreg-stub/build.gradle
+++ b/apps/brreg-stub/build.gradle
@@ -1,10 +1,11 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id "uk.co.boothen.gradle.wsimport" version "0.21"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
+    id("org.openrewrite.rewrite") version("6.6.4")
 }
 
 test {
@@ -33,16 +34,21 @@ sonarqube {
     }
 }
 
+rewrite {
+    activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2")
+}
+
 
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
 
     }
 }
 
 bootJar {
+    duplicatesStrategy(DuplicatesStrategy.INCLUDE)
     archiveFileName = "app.jar"
 }
 
@@ -62,6 +68,8 @@ repositories {
 
 dependencies {
 
+    rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0")
+
     implementation("io.dropwizard:dropwizard-jackson:4.0.2") {
         exclude group: "com.google.code.findbugs"
     }
@@ -76,7 +84,6 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
-    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
@@ -90,7 +97,7 @@ dependencies {
     implementation 'org.apache.cxf:cxf-rt-transports-http'
     implementation 'org.apache.cxf:cxf-rt-ws-security'
     implementation 'jakarta.servlet:jakarta.servlet-api'
-    
+
     implementation 'org.postgresql:postgresql'
     implementation 'com.zaxxer:HikariCP'
 
@@ -99,24 +106,26 @@ dependencies {
 
     implementation 'wsdl4j:wsdl4j'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.15'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'no.nav.common:auth'
     implementation 'no.nav.common:util'
     implementation 'no.nav.common:cxf:3.2023.10.17_06.55-4e30d96bba05'
 
     implementation 'com.h2database:h2'
+    implementation "com.sun.xml.ws:jaxws-rt:4.0.2"
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
-    implementation 'jakarta.jws:jakarta.jws-api:3.0.0'
-
-    testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5
+    implementation 'jakarta.jws:jakarta.jws-api:3.0.0' //TODO upgrade to JUnit5
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     implementation 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
+
+    testImplementation "org.junit.jupiter:junit-jupiter:5.10.1"
 }
 java {
     toolchain {
diff --git a/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties b/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
index afbd371a308..12faa239d78 100644
--- a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
+++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
@@ -1,10 +1,9 @@
 package no.nav.brregstub;
 
+import no.nav.testnav.libs.servletcore.util.VaultUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import no.nav.testnav.libs.servletcore.util.VaultUtil;
-
 
 @SpringBootApplication
 public class BrregApplicationLauncher {
@@ -16,4 +15,4 @@ public static void main(String[] args) {
         }
         SpringApplication.run(BrregApplicationLauncher.class, args);
     }
-}
\ No newline at end of file
+}
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java
index 0ce402687dd..2b42e25f307 100644
--- a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java
+++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java
@@ -26,7 +26,7 @@ public ClientAuthentication clientAuthentication() {
         }
         var token = System.getProperty(TOKEN);
         if (StringUtils.isBlank(token)) {
-            throw new IllegalArgumentException(String.format("Påkrevet property '%s' er ikke satt.", TOKEN));
+            throw new IllegalArgumentException("Påkrevet property '%s' er ikke satt.".formatted(TOKEN));
         }
         return new TokenAuthentication(System.getProperty(TOKEN));
     }
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java
index df6374f0463..9735cf9aeba 100644
--- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java
+++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java
@@ -42,8 +42,8 @@ public ResponseEntity<Map> lagreEllerOppdaterHentRolleStub(@Valid @RequestBody R
     @GetMapping("/{orgnr}")
     public ResponseEntity<RsOrganisasjon> hentGrunndata(@NotNull @PathVariable Integer orgnr) {
         var grunndata = service.hentRolle(orgnr)
-                .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne roller for :%s",
-                        orgnr)));
+                .orElseThrow(() -> new NotFoundException("Kunne ikke finne roller for :%s".formatted(
+                orgnr)));
         return ResponseEntity.status(HttpStatus.OK).body(grunndata);
     }
 
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java
index 60e45271cb9..5820cc73683 100644
--- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java
+++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java
@@ -39,8 +39,8 @@ public ResponseEntity<RolleoversiktTo> lagreEllerOppdaterRolleoversikt(@Valid @R
     @GetMapping
     public ResponseEntity<RolleoversiktTo> hentRolleoversikt(@NotNull @RequestHeader(name = "Nav-Personident") String ident) {
         var grunndata = service.hentRolleoversiktV1(ident)
-                .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne person med fnr:%s",
-                        ident)));
+                .orElseThrow(() -> new NotFoundException("Kunne ikke finne person med fnr:%s".formatted(
+                ident)));
         return ResponseEntity.status(HttpStatus.OK).body(grunndata);
     }
 
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java
index 8a506d3132f..35a1e35ed67 100644
--- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java
+++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java
@@ -40,7 +40,7 @@ public ResponseEntity<RsRolleoversikt> lagreEllerOppdaterRolleoversikt(@Valid @R
     @GetMapping
     public ResponseEntity<RsRolleoversikt> hentRolleoversikt(@NotNull @RequestHeader(name = "Nav-Personident") String ident) {
         var grunndata = service.hentRolleoversiktV2(ident)
-                .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne person med fnr:%s", ident)));
+                .orElseThrow(() -> new NotFoundException("Kunne ikke finne person med fnr:%s".formatted(ident)));
         return ResponseEntity.status(HttpStatus.OK).body(grunndata);
     }
 
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java
index b414591e5d4..f31256e9dc2 100644
--- a/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java
+++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java
@@ -9,7 +9,6 @@
 import no.nav.brregstub.tjenestekontrakter.ws.HentRolleutskriftResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ws.server.endpoint.annotation.Endpoint;
 import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
@@ -28,7 +27,6 @@ public class BrregEndpoint {
 
     private final BrregService brregService;
 
-    @Autowired
     public BrregEndpoint(BrregService brregService) {
         this.brregService = brregService;
     }
diff --git a/apps/brreg-stub/src/main/resources/application-prod.yaml b/apps/brreg-stub/src/main/resources/application-prod.yaml
index 6856ba2e0fb..aa34ab14e55 100644
--- a/apps/brreg-stub/src/main/resources/application-prod.yaml
+++ b/apps/brreg-stub/src/main/resources/application-prod.yaml
@@ -6,12 +6,14 @@ spring:
     locations: "classpath:db/migration/postgresql"
   main.banner-mode: "off"
   datasource:
-    url: "jdbc:postgresql://b27dbvl013.preprod.local:5432/brreg-stub"
+    url: "jdbc:postgresql://b27dbvl013.preprod.local:5432/brreg-stub?autoReconnect=true&useSSL=false"
     hikari:
       maximum-pool-size: 2
       connection-test-query: "select 1"
-      max-lifetime: 30000
+      connection-timeout: 30000
+      initialization-fail-timeout: 10000
       minimum-idle: 1
+      jdbc-url: "jdbc:postgresql://b27dbvl013.preprod.local:5432/brreg-stub?autoReconnect=true&useSSL=false"
     jpa:
       hibernate:
         ddl-auto: none
@@ -26,10 +28,15 @@ spring:
       port: 443
       connection-timeout: 15000
       read-timeout: 30000
-      application-name: preprod/fss/brreg-stub
+      kv:
+        enabled: false
       database:
         enabled: true
+        role: brreg-stub-admin
         backend: postgresql/preprod-fss
+      fail-fast: true
+  config:
+    import: vault://
 
 server:
   servlet:
diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yaml
index c9bf38e4653..1ee72bc46e8 100644
--- a/apps/brreg-stub/src/main/resources/application.yaml
+++ b/apps/brreg-stub/src/main/resources/application.yaml
@@ -1,4 +1,8 @@
 spring:
+  jpa:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
   application:
     name: brreg-stub
 
diff --git a/apps/brreg-stub/src/main/resources/bootstrap.yaml b/apps/brreg-stub/src/main/resources/bootstrap.yaml
deleted file mode 100644
index 3d95812827b..00000000000
--- a/apps/brreg-stub/src/main/resources/bootstrap.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-spring.cloud.vault:
-  host: vault.adeo.no
-  port: 443
-  connection-timeout: 15000
-  read-timeout: 30000
-  application-name: preprod/fss/brreg-stub
-  authentication: TOKEN
-
-  kv:
-    enabled: false
-    backend: kv
-    application-name: preprod/fss/brreg-stub/default
-    default-context: preprod/fss/brreg-stub/default
-  database:
-    enabled: true
-    role: brreg-stub-admin
-    backend: postgresql/preprod-fss
-    username-property: spring.datasource.username
-    password-property: spring.datasource.password
\ No newline at end of file
diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java
index 5bf4f32d655..5f54d245bd6 100644
--- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java
+++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java
@@ -9,7 +9,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -20,7 +19,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDate;
 import java.util.Map;
@@ -30,7 +28,6 @@
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class HentRolleoversiktControllerTest {
 
diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java
index 52e688bc232..0369854c39c 100644
--- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java
+++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java
@@ -6,7 +6,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,7 +15,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDate;
 import java.util.Map;
@@ -26,7 +24,6 @@
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class HentRollerControllerTest {
 
@@ -39,7 +36,7 @@ public class HentRollerControllerTest {
 
     @Test
     @DisplayName("GET rolle returnerer 404 hvis ikke eksisterer")
-    public void skalKasteNotFoundHvisRolleIkkeEksister() {
+    void skalKasteNotFoundHvisRolleIkkeEksister() {
         var response = restTemplate.getForEntity(API_V_1_ROLLER + "0",
                 String.class);
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
@@ -47,7 +44,7 @@ public void skalKasteNotFoundHvisRolleIkkeEksister() {
 
     @Test
     @DisplayName("GET rolle returnerer 200 hvis ikke eksisterer")
-    public void skalHenteRolleutskriftFraDatabase() {
+    void skalHenteRolleutskriftFraDatabase() {
         var nyRolle = new HentRolle();
         nyRolle.setOrgnr(1);
         nyRolle.setJson("{\"orgnr\": 1}");
@@ -62,7 +59,7 @@ public void skalHenteRolleutskriftFraDatabase() {
 
     @Test
     @DisplayName("DELETE rolle skal slettes fra database")
-    public void skalSletteRolleutskrift() {
+    void skalSletteRolleutskrift() {
         var rolleSomSkalSlettes = new HentRolle();
         rolleSomSkalSlettes.setOrgnr(3);
         rolleSomSkalSlettes.setJson("{}");
@@ -81,7 +78,7 @@ public void skalSletteRolleutskrift() {
 
     @Test
     @DisplayName("POST rolle skal opprette ny databaseinnslag")
-    public void skalLagreRequestIDatabase() {
+    void skalLagreRequestIDatabase() {
         var to = new RsOrganisasjon();
         to.setOrgnr(4);
         to.setRegistreringsdato(LocalDate.now());
@@ -96,7 +93,7 @@ public void skalLagreRequestIDatabase() {
 
     @Test
     @DisplayName("POST rolle returnere bad request ved manglende feilt")
-    public void skalReturnereBadRequestVedValideringsFeil() {
+    void skalReturnereBadRequestVedValideringsFeil() {
         var to = new RsOrganisasjon();
 
         var response =
diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java
index 01237f092ea..29dfdd8c260 100644
--- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java
+++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java
@@ -5,13 +5,11 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.Map;
 
@@ -19,7 +17,6 @@
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class KodeControllerTest {
 
diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java
index ae496d1f49c..85123f3268f 100644
--- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java
+++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java
@@ -13,7 +13,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -24,7 +23,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDate;
 import java.util.Collections;
@@ -35,7 +33,6 @@
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class RolleoversiktControllerTest {
 
diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java
index 1dab0054d39..74b4936c736 100644
--- a/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java
+++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java
@@ -49,7 +49,7 @@ class BrregServiceTest {
     private BrregService brregService;
 
     @BeforeEach
-    public void onSetup() {
+    void onSetup() {
         rolleoversiktRepositoryMock.deleteAll();
         hentRolleRepositoryMock.deleteAll();
         brregService = new BrregService(rolleoversiktRepositoryMock, hentRolleRepositoryMock, objectMapper);
diff --git a/apps/brreg-stub/src/test/resources/bootstrap.yml b/apps/brreg-stub/src/test/resources/bootstrap.yml
deleted file mode 100644
index 805ec8009eb..00000000000
--- a/apps/brreg-stub/src/test/resources/bootstrap.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-spring:
-  cloud:
-    vault:
-      enabled: false
-    database:
-      enabled: false
\ No newline at end of file
diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
index 0171386fb3b..9f2f92c8ff6 100644
--- a/apps/bruker-service/build.gradle
+++ b/apps/bruker-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -48,7 +48,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -75,8 +75,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
diff --git a/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties b/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml
index ae66cf64dcd..e5668233f25 100644
--- a/apps/bruker-service/src/main/resources/application-local.yml
+++ b/apps/bruker-service/src/main/resources/application-local.yml
@@ -1,11 +1,8 @@
 CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
 JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE
 
-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
index f5a5045f3fe..7269e777be2 100644
--- 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/budpro-service/README.md b/apps/budpro-service/README.md
index b2f1db88d7c..3b225d22d36 100644
--- a/apps/budpro-service/README.md
+++ b/apps/budpro-service/README.md
@@ -1,4 +1,4 @@
-Dette er en tjeneste laget for [Team BudPro](https://teamkatalog.nav.no/team/abc1b143-87e3-45d1-8518-0efd23a775fa), for å generere NAV-ansatte og deres informasjon.
+Dette er en tjeneste laget for Team BudPro, for å generere NAV-ansatte og deres informasjon.
 
 Startes lokalt på samme måte som alle andre. Spring profile `local`, definer `spring.cloud.vault.token` fra Vault.
 Swagger på http://localhost:8080/swagger. Se endepunkter under `budpro-controller`. Andre endepunkter er for å liste ut definerte grunnverdier.
diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle
index 80da396b83b..d1cd1af2bb8 100644
--- a/apps/budpro-service/build.gradle
+++ b/apps/budpro-service/build.gradle
@@ -1,9 +1,10 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.1.4'
-    id 'io.spring.dependency-management' version '1.1.3'
+    id 'org.springframework.boot' version '3.2.1'
+    id 'io.spring.dependency-management' version '1.1.4'
     id "jacoco"
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
+    id("org.openrewrite.rewrite") version("6.6.4")
 }
 
 bootJar {
@@ -11,6 +12,10 @@ bootJar {
     mainClass = 'no.nav.dolly.budpro.BudproServiceApplication'
 }
 
+rewrite {
+    activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2")
+}
+
 configurations {
     compileOnly {
         extendsFrom annotationProcessor
@@ -39,11 +44,13 @@ repositories {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.4"
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.0"
     }
 }
 
 dependencies {
+    rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0")
+
     annotationProcessor 'org.projectlombok:lombok'
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 
@@ -60,7 +67,7 @@ dependencies {
     implementation 'no.nav.testnav.libs:servlet-insecure-security'
     implementation 'no.nav.testnav.libs:servlet-security'
     implementation 'org.projectlombok:lombok'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
@@ -73,6 +80,7 @@ dependencies {
 
     testAnnotationProcessor 'org.projectlombok:lombok'
 
+    testImplementation "org.junit.jupiter:junit-jupiter:5.10.1"
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:junit-jupiter'
 }
diff --git a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties
index 744c64d1277..3499ded5c11 100644
--- a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java b/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java
index 4111fc3c6df..105dd393cd1 100644
--- a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java
+++ b/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java
@@ -20,7 +20,7 @@ public String next() {
             var a = random.nextInt(99);
             var b = random.nextInt(99);
             var c = random.nextInt(99);
-            generated = String.format("%02d%02d%02d", a, b, c);
+            generated = "%02d%02d%02d".formatted(a, b, c);
         } while (assigned.contains(generated));
         assigned.add(generated);
         return generated;
diff --git a/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java b/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java
index 84e14433dae..2c50833c75d 100644
--- a/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java
+++ b/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java
@@ -43,7 +43,7 @@ class BudproControllerTest {
     private AutoCloseable closeable;
 
     @BeforeEach
-    public void before() {
+    void before() {
         closeable = MockitoAnnotations.openMocks(this);
 
         var names = new ArrayList<String>(100);
@@ -56,12 +56,12 @@ public void before() {
     }
 
     @AfterEach
-    public void after() throws Exception {
+    void after() throws Exception {
         closeable.close();
     }
 
     @Test
-    void testThatNoSeedGivesDifferentResults()
+    void thatNoSeedGivesDifferentResults()
             throws Exception {
         var result1 = mockMvc
                 .perform(get("/api/random?limit={limit}", 50))
@@ -80,7 +80,7 @@ void testThatNoSeedGivesDifferentResults()
     }
 
     @Test
-    void testThatSameSeedGivesSameResults()
+    void thatSameSeedGivesSameResults()
             throws Exception {
         var result1 = mockMvc
                 .perform(get("/api/random?seed={seed}&limit={limit}", 123L, 50))
@@ -99,7 +99,7 @@ void testThatSameSeedGivesSameResults()
     }
 
     @Test
-    void testThatOverrideWorksAsIntended()
+    void thatOverrideWorksAsIntended()
             throws Exception {
         var override = new BudproRecord(
                 "OVERRIDE",
diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
index 2895086f8e7..84b4a303add 100644
--- a/apps/dolly-backend/build.gradle
+++ b/apps/dolly-backend/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -41,7 +41,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -78,8 +78,8 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
@@ -88,12 +88,12 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation 'org.springframework.retry:spring-retry:2.0.0'
+    implementation 'org.springframework.retry:spring-retry:2.0.5'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
-    implementation 'org.opensearch.client:spring-data-opensearch:1.2.0'
+    implementation 'org.opensearch.client:spring-data-opensearch:1.3.0'
 
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-lang3:3.14.0'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'com.github.ben-manes.caffeine:caffeine'
 
@@ -104,8 +104,8 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
     implementation 'org.codehaus.jettison:jettison:1.5.4'
-    implementation 'org.apache.poi:poi:5.2.3'
-    implementation 'org.apache.poi:poi-ooxml:5.2.3'
+    implementation 'org.apache.poi:poi:5.2.5'
+    implementation 'org.apache.poi:poi-ooxml:5.2.5'
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation 'org.opensearch:opensearch-testcontainers:2.0.0'
@@ -113,7 +113,7 @@ dependencies {
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'com.h2database:h2'
-    testImplementation 'io.projectreactor:reactor-test:3.5.3'
+    testImplementation 'io.projectreactor:reactor-test:3.5.4'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.bitbucket.b_c:jose4j:0.9.3'
diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
index 4f0f8143f07..30007c243aa 100644
--- a/apps/dolly-backend/config.test.yml
+++ b/apps/dolly-backend/config.test.yml
@@ -54,7 +54,6 @@ spec:
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
@@ -62,6 +61,7 @@ spec:
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-dev-proxy.dev-fss-pub.nais.io
   webproxy: true
@@ -110,4 +110,4 @@ spec:
         name: testnav-dolly-backend-dev
         databases:
           - name: testnav-dolly-backend-dev
-        autoBackupTime: "01:00"
\ No newline at end of file
+        autoBackupHour: 3
\ No newline at end of file
diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
index d0e7fb654d6..ce82a9671c2 100644
--- a/apps/dolly-backend/config.yml
+++ b/apps/dolly-backend/config.yml
@@ -61,9 +61,9 @@ spec:
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
@@ -118,4 +118,4 @@ spec:
         databases:
           - name: testnav-dolly-backend
         tier: db-custom-2-3840
-        autoBackupTime: "01:00"
+        autoBackupHour: 2
diff --git a/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties b/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties
index 744c64d1277..3499ded5c11 100644
--- a/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
index d0743b7b81b..d023e7e2dfd 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java
index 6001b0a9caa..10902a9aa71 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java
@@ -50,6 +50,7 @@
 import reactor.util.function.Tuple2;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -98,15 +99,14 @@ public class PensjonforvalterClient implements ClientRegister {
     public static PensjonforvalterResponse mergePensjonforvalterResponses(List<PensjonforvalterResponse> responser) {
 
         var status = new HashMap<String, PensjonforvalterResponse.Response>();
-        responser.stream()
-                .forEach(respons -> respons.getStatus().stream()
-                        .forEach(detalj -> {
-                            if (detalj.getResponse().isResponse2xx()) {
-                                status.putIfAbsent(detalj.getMiljo(), detalj.getResponse());
-                            } else {
-                                status.put(detalj.getMiljo(), detalj.getResponse());
-                            }
-                        }));
+        responser.forEach(respons -> respons.getStatus()
+                .forEach(detalj -> {
+                    if (detalj.getResponse().isResponse2xx()) {
+                        status.putIfAbsent(detalj.getMiljo(), detalj.getResponse());
+                    } else {
+                        status.put(detalj.getMiljo(), detalj.getResponse());
+                    }
+                }));
 
         return PensjonforvalterResponse.builder()
                 .status(status.entrySet().stream()
@@ -130,8 +130,9 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                 .collect(Collectors.toSet()));
 
         var bestillingId = bestilling.getId();
+        var statusResultat = new ArrayList<String>();
 
-        return Flux.from(pensjonforvalterConsumer.getMiljoer())
+        return Flux.from(Flux.from(pensjonforvalterConsumer.getMiljoer())
                 .flatMap(tilgjengeligeMiljoer -> {
                     bestilteMiljoer.set(bestilteMiljoer.get().stream()
                             .filter(tilgjengeligeMiljoer::contains)
@@ -157,49 +158,66 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                                             log.warn("Persondata for {} gir tom response fra PDL", dollyPerson.getIdent());
                                         }
                                     })
-                                    .map(utvidetPersondata -> Flux.concat(
-                                            opprettPersoner(dollyPerson.getIdent(), tilgjengeligeMiljoer, utvidetPersondata.getT1())
-                                                    .map(response -> PENSJON_FORVALTER + decodeStatus(response, dollyPerson.getIdent())),
-
-                                            lagreSamboer(dollyPerson.getIdent(), tilgjengeligeMiljoer)
-                                                    .map(response -> SAMBOER_REGISTER + decodeStatus(response, dollyPerson.getIdent())),
-
-                                            Flux.just(bestilling1)
+                                    .flatMap(utvidetPersondata -> Flux.concat(
+                                                    opprettPersoner(dollyPerson.getIdent(), tilgjengeligeMiljoer, utvidetPersondata.getT1())
+                                                            .map(response -> PENSJON_FORVALTER + decodeStatus(response, dollyPerson.getIdent())),
+
+                                                    lagreSamboer(dollyPerson.getIdent(), tilgjengeligeMiljoer)
+                                                            .map(response -> SAMBOER_REGISTER + decodeStatus(response, dollyPerson.getIdent()))
+                                            )
+                                            .collectList()
+                                            .doOnNext(statusResultat::addAll)
+                                            .map(status -> Flux.just(bestilling1)
                                                     .filter(bestilling2 -> nonNull(bestilling2.getPensjonforvalter()))
                                                     .map(RsDollyUtvidetBestilling::getPensjonforvalter)
                                                     .flatMap(pensjon -> Flux.merge(
-                                                            lagreInntekt(pensjon, dollyPerson.getIdent(), bestilteMiljoer.get(),
-                                                                    progress.getIsTpsSyncEnv())
-                                                                    .map(response -> POPP_INNTEKTSREGISTER + decodeStatus(response, dollyPerson.getIdent())),
-
-                                                            lagreTpForhold(pensjon, dollyPerson.getIdent(), bestilteMiljoer.get())
-                                                                    .map(response -> TP_FORHOLD + decodeStatus(response, dollyPerson.getIdent())),
-
-                                                            lagreAlderspensjon(
-                                                                    pensjon,
-                                                                    utvidetPersondata,
-                                                                    dollyPerson.getIdent(),
-                                                                    bestilteMiljoer.get(),
-                                                                    isOpprettEndre,
-                                                                    bestillingId,
-                                                                    progress.getIsTpsSyncEnv())
-                                                                    .map(response -> PEN_ALDERSPENSJON + decodeStatus(response, dollyPerson.getIdent())),
-
-                                                            lagreUforetrygd(
-                                                                    pensjon,
-                                                                    utvidetPersondata.getT2(),
-                                                                    dollyPerson.getIdent(),
-                                                                    bestilteMiljoer.get(),
-                                                                    isOpprettEndre,
-                                                                    bestillingId,
-                                                                    progress.getIsTpsSyncEnv())
-                                                                    .map(response -> PEN_UFORETRYGD + decodeStatus(response, dollyPerson.getIdent())))))))
-
-                            .flatMap(Flux::from)
-                            .filter(StringUtils::isNotBlank)
-                            .collect(Collectors.joining(SEP));
+
+                                                                    lagreInntekt(pensjon,
+                                                                            dollyPerson.getIdent(), bestilteMiljoer.get(),
+                                                                            progress.getIsTpsSyncEnv())
+                                                                            .map(response -> POPP_INNTEKTSREGISTER + decodeStatus(response, dollyPerson.getIdent())),
+
+                                                                    lagreTpForhold(pensjon, dollyPerson.getIdent(), bestilteMiljoer.get())
+                                                                            .map(response -> TP_FORHOLD + decodeStatus(response, dollyPerson.getIdent()))
+                                                            )
+                                                            .collectList()
+                                                            .doOnNext(statusResultat::addAll)
+
+                                                            .map(status2 -> Flux.just(pensjon)
+                                                                    .flatMap(pensjon2 -> Flux.merge(
+
+                                                                                            lagreAlderspensjon(
+                                                                                                    pensjon2,
+                                                                                                    utvidetPersondata,
+                                                                                                    dollyPerson.getIdent(),
+                                                                                                    bestilteMiljoer.get(),
+                                                                                                    isOpprettEndre,
+                                                                                                    bestillingId,
+                                                                                                    progress.getIsTpsSyncEnv())
+                                                                                                    .map(response -> PEN_ALDERSPENSJON + decodeStatus(response, dollyPerson.getIdent())),
+
+                                                                                            lagreUforetrygd(
+                                                                                                    pensjon2,
+                                                                                                    utvidetPersondata.getT2(),
+                                                                                                    dollyPerson.getIdent(),
+                                                                                                    bestilteMiljoer.get(),
+                                                                                                    isOpprettEndre,
+                                                                                                    bestillingId,
+                                                                                                    progress.getIsTpsSyncEnv())
+                                                                                                    .map(response -> PEN_UFORETRYGD + decodeStatus(response, dollyPerson.getIdent()))
+                                                                                    )
+                                                                                    .collectList()
+                                                                                    .doOnNext(statusResultat::addAll)
+                                                                    ))))));
                 })
-                .map(status -> futurePersist(dollyPerson, progress, status));
+                .flatMap(Flux::from)
+                .flatMap(Flux::from)
+                .flatMap(Flux::fromIterable)
+                .collectList()
+                .map(status -> statusResultat.stream()
+                        .filter(StringUtils::isNotBlank)
+                        .collect(Collectors.joining("$")))
+                .map(status2 -> futurePersist(dollyPerson, progress, status2)));
     }
 
     private static Mono<List<PdlPersonBolk.PersonBolk>> getPdlPerson(Flux<PdlPersonBolk.Data> persondata) {
@@ -233,7 +251,7 @@ private Mono<String> getNavEnhetNr(Flux<PdlPersonBolk.Data> persondata, String i
                 .map(Norg2EnhetResponse::getEnhetNr)
                 .collectList()
                 .doOnNext(norgdata -> log.info("Mottatt norgdata: {}", norgdata))
-                .map(norgdata -> !norgdata.isEmpty() ? norgdata.get(0) : "0315");
+                .map(norgdata -> !norgdata.isEmpty() ? norgdata.getFirst() : "0315");
     }
 
     private Flux<PensjonforvalterResponse> lagreSamboer(String ident, Set<String> tilgjengeligeMiljoer) {
@@ -363,7 +381,7 @@ private Flux<PensjonforvalterResponse> lagreAlderspensjon(PensjonData pensjonDat
 
                                 if (isTpsSyncEnv.contains(miljoe)) {
 
-                                    AlderspensjonRequest pensjonRequest = null;
+                                    AlderspensjonRequest pensjonRequest;
                                     var context = new MappingContext.Factory().getContext();
                                     context.setProperty(IDENT, ident);
                                     context.setProperty(MILJOER, List.of(miljoe));
@@ -455,7 +473,8 @@ private static Flux<PensjonforvalterResponse> getStatus(String miljoe, Integer s
     }
 
     @SuppressWarnings("java:S3740")
-    private void saveAPTransaksjonId(String ident, String miljoe, Long bestillingId, SystemTyper type, AtomicReference vedtak) {
+    private void saveAPTransaksjonId(String ident, String miljoe, Long bestillingId, SystemTyper
+            type, AtomicReference vedtak) {
 
         log.info("Lagrer transaksjon for {} i {} ", ident, miljoe);
 
@@ -492,7 +511,8 @@ private Flux<PensjonforvalterResponse> lagreInntekt(PensjonData pensjonData, Str
                         }));
     }
 
-    private Mono<PensjonforvalterResponse> lagreTpForhold(PensjonData pensjonData, String ident, Set<String> miljoer) {
+    private Mono<PensjonforvalterResponse> lagreTpForhold(PensjonData pensjonData, String
+            ident, Set<String> miljoer) {
 
         return Flux.just(pensjonData)
                 .filter(PensjonData::hasTp)
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonPersonMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonPersonMappingStrategy.java
index 0fb67857c26..5df20e9d6ee 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonPersonMappingStrategy.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonPersonMappingStrategy.java
@@ -53,6 +53,8 @@ public void mapAtoB(PdlPersonBolk.PersonBolk person, PensjonPersonRequest pensjo
 
                         if (person.getPerson().getUtflyttingFraNorge().stream()
                                 .noneMatch(utflytting -> person.getPerson().getInnflyttingTilNorge().stream()
+                                        .filter(innflytting -> nonNull(innflytting.getFolkeregistermetadata()) &&
+                                                nonNull(innflytting.getFolkeregistermetadata().getGyldighetstidspunkt()))
                                         .anyMatch(innflytting -> innflytting.getFolkeregistermetadata().getGyldighetstidspunkt()
                                                 .isAfter(utflytting.getUtflyttingsdato())))) {
 
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java
index 994fb30531a..5742cf7a679 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java
@@ -55,6 +55,13 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
         return Flux.empty();
     }
 
+    @Override
+    public void release(List<String> identer) {
+
+        skjermingsRegisterConsumer.deleteSkjerming(identer)
+                .subscribe(response -> log.info("Slettet identer fra Skjermingsregisteret"));
+    }
+
     private ClientFuture futurePersist(BestillingProgress progress, String status) {
 
         return () -> {
@@ -63,13 +70,6 @@ private ClientFuture futurePersist(BestillingProgress progress, String status) {
         };
     }
 
-    @Override
-    public void release(List<String> identer) {
-
-        skjermingsRegisterConsumer.deleteSkjerming(identer)
-                .subscribe(response -> log.info("Slettet identer fra Skjermingsregisteret"));
-    }
-
     private String getStatus(SkjermingDataResponse resultat) {
 
         return isBlank(resultat.getError()) ? "OK" :
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java
index 7a2a7e4c9fc..0c7d38cf7ae 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.ConsumerStatus;
-import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterDeleteCommand;
 import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterGetCommand;
 import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterPostCommand;
 import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterPutCommand;
@@ -19,6 +18,7 @@
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import static java.util.Objects.nonNull;
@@ -47,19 +47,23 @@ public SkjermingsRegisterConsumer(
                 .build();
     }
 
-    @Timed(name = "providers", tags = {"operation", "skjermingsdata-slett"})
-    public Mono<List<Void>> deleteSkjerming(List<String> identer) {
+    @Timed(name = "providers", tags = { "operation", "skjermingsdata-slett" })
+    public Mono<List<SkjermingDataResponse>> deleteSkjerming(List<String> identer) {
 
         return tokenService.exchange(serverProperties)
                 .flatMapMany(token -> Flux.range(0, identer.size())
                         .delayElements(Duration.ofMillis(100))
-                        .map(index -> new SkjermingsregisterDeleteCommand(webClient,
-                                identer.get(index), token.getTokenValue()).call())
+                        .map(index -> new SkjermingsregisterPutCommand(webClient,
+                                SkjermingDataRequest.builder()
+                                        .personident(identer.get(index))
+                                        .skjermetTil(LocalDateTime.now())
+                                        .build(),
+                                token.getTokenValue()).call())
                         .flatMap(Flux::from))
                 .collectList();
     }
 
-    @Timed(name = "providers", tags = {"operation", "skjermingsdata-oppdater"})
+    @Timed(name = "providers", tags = { "operation", "skjermingsdata-oppdater" })
     public Mono<SkjermingDataResponse> oppdaterPerson(SkjermingDataRequest skjerming) {
 
         return tokenService.exchange(serverProperties)
@@ -67,24 +71,23 @@ public Mono<SkjermingDataResponse> oppdaterPerson(SkjermingDataRequest skjerming
                         .flatMap(response -> {
                             if (isBlank(response.getError())) {
                                 if (response.isEksistererIkke()) {
-                                    return new SkjermingsregisterPostCommand(webClient, List.of(skjerming),
+                                    return new SkjermingsregisterPostCommand(webClient, skjerming,
                                             token.getTokenValue()).call()
                                             .collectList()
                                             .map(status -> {
                                                 log.info("Opprettet skjerming på ident {} fraDato {} tilDato {}",
-                                                        status.get(0).getPersonident(), status.get(0).getSkjermetFra(), status.get(0).getSkjermetTil());
-                                                return status.get(0);
+                                                        status.getFirst().getPersonident(), status.getFirst().getSkjermetFra(), status.getFirst().getSkjermetTil());
+                                                return status.getFirst();
                                             });
                                 } else {
                                     return nonNull(skjerming.getSkjermetTil()) ?
 
-                                            new SkjermingsregisterPutCommand(webClient, skjerming.getPersonident(),
-                                                    skjerming.getSkjermetTil(), token.getTokenValue()).call()
+                                            new SkjermingsregisterPutCommand(webClient, skjerming, token.getTokenValue())
+                                                    .call()
                                                     .map(status -> {
                                                         log.info("Oppdatert skjerming for ident {}, ny tilDato {}", skjerming.getPersonident(), skjerming.getSkjermetTil());
                                                         return status;
                                                     }) :
-
                                             Mono.just(new SkjermingDataResponse());
                                 }
                             } else {
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterDeleteCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterDeleteCommand.java
deleted file mode 100644
index 143ab2a0f8f..00000000000
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterDeleteCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package no.nav.dolly.bestilling.skjermingsregister.command;
-
-import lombok.RequiredArgsConstructor;
-import no.nav.dolly.util.CallIdUtil;
-import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
-import no.nav.testnav.libs.securitycore.config.UserConstant;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Flux;
-import reactor.util.retry.Retry;
-
-import java.time.Duration;
-import java.util.concurrent.Callable;
-
-import static no.nav.dolly.domain.CommonKeysAndUtils.CONSUMER;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CALL_ID;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CONSUMER_ID;
-import static no.nav.dolly.util.TokenXUtil.getUserJwt;
-import static org.springframework.http.HttpHeaders.AUTHORIZATION;
-
-@RequiredArgsConstructor
-public class SkjermingsregisterDeleteCommand implements Callable<Flux<Void>> {
-
-    private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata";
-
-    private final WebClient webClient;
-    private final String ident;
-    private final String token;
-
-    public Flux<Void> call() {
-
-        return webClient.delete().uri(uriBuilder -> uriBuilder
-                        .path(SKJERMINGSREGISTER_URL)
-                        .pathSegment(ident)
-                        .build())
-                .header(AUTHORIZATION, "Bearer " + token)
-                .header(UserConstant.USER_HEADER_JWT, getUserJwt())
-                .header(HEADER_NAV_CALL_ID, CallIdUtil.generateCallId())
-                .header(HEADER_NAV_CONSUMER_ID, CONSUMER)
-                .retrieve()
-                .bodyToFlux(Void.class)
-                .doOnError(WebClientFilter::logErrorMessage)
-                .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
-                        .filter(WebClientFilter::is5xxException));
-    }
-}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java
index a8ab2517272..d909fc9a3e9 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java
@@ -16,7 +16,8 @@
 @RequiredArgsConstructor
 public class SkjermingsregisterGetCommand implements Callable<Mono<SkjermingDataResponse>> {
 
-    private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata";
+    private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjerming/dolly";
+    private static final String PERSONIDENT_HEADER = "personident";
 
     private final WebClient webClient;
     private final String ident;
@@ -26,9 +27,9 @@ public class SkjermingsregisterGetCommand implements Callable<Mono<SkjermingData
     public Mono<SkjermingDataResponse> call() {
         return webClient.get().uri(uriBuilder -> uriBuilder
                         .path(SKJERMINGSREGISTER_URL)
-                        .pathSegment(ident)
                         .build())
                 .header(AUTHORIZATION, "Bearer " + token)
+                .header(PERSONIDENT_HEADER, ident)
                 .retrieve()
                 .bodyToMono(SkjermingDataResponse.class)
                 .onErrorResume(WebClientResponseException.NotFound.class::isInstance,
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java
index a1921ee8ba7..4279c806a8f 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java
@@ -9,7 +9,6 @@
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
-import java.util.List;
 import java.util.concurrent.Callable;
 
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
@@ -17,10 +16,10 @@
 @RequiredArgsConstructor
 public class SkjermingsregisterPostCommand implements Callable<Flux<SkjermingDataResponse>> {
 
-    private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata";
+    private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjerming/dolly";
 
     private final WebClient webClient;
-    private final List<SkjermingDataRequest> skjermingsDataRequest;
+    private final SkjermingDataRequest skjermingDataRequest;
     private final String token;
 
     @Override
@@ -30,7 +29,7 @@ public Flux<SkjermingDataResponse> call() {
                         .path(SKJERMINGSREGISTER_URL)
                         .build())
                 .header(AUTHORIZATION, "Bearer " + token)
-                .bodyValue(skjermingsDataRequest)
+                .bodyValue(skjermingDataRequest)
                 .retrieve()
                 .bodyToFlux(SkjermingDataResponse.class)
                 .onErrorResume(error -> Flux.just(SkjermingDataResponse.builder()
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java
index ee55cfb6cce..9e20b592b08 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java
@@ -1,6 +1,7 @@
 package no.nav.dolly.bestilling.skjermingsregister.command;
 
 import lombok.RequiredArgsConstructor;
+import no.nav.dolly.bestilling.skjermingsregister.domain.SkjermingDataRequest;
 import no.nav.dolly.bestilling.skjermingsregister.domain.SkjermingDataResponse;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -8,32 +9,26 @@
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
-import java.time.LocalDateTime;
 import java.util.concurrent.Callable;
 
-import static java.util.Objects.nonNull;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 
 @RequiredArgsConstructor
 public class SkjermingsregisterPutCommand implements Callable<Mono<SkjermingDataResponse>> {
 
-    private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata";
-    private static final String SKJERMINGOPPHOER_URL = SKJERMINGSREGISTER_URL + "/opphor";
-    private static final String SKJERMING_TOM = "skjermetTil";
+    private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjerming/dolly";
 
     private final WebClient webClient;
-    private final String ident;
-    private final LocalDateTime tilDato;
+    private final SkjermingDataRequest skjermingsDataRequest;
     private final String token;
 
     @Override
     public Mono<SkjermingDataResponse> call() {
         return webClient.put().uri(uriBuilder -> uriBuilder
-                        .path(SKJERMINGOPPHOER_URL)
-                        .pathSegment(ident)
-                        .queryParam(SKJERMING_TOM, nonNull(tilDato) ? tilDato.toLocalDate() : null)
+                        .path(SKJERMINGSREGISTER_URL)
                         .build())
                 .header(AUTHORIZATION, "Bearer " + token)
+                .bodyValue(skjermingsDataRequest)
                 .retrieve()
                 .toBodilessEntity()
                 .map(result -> SkjermingDataResponse.builder().build())
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java
index 56ef766ba0b..67c4e88d522 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java
@@ -24,7 +24,7 @@ public class CachingConfig {
     public static final String CACHE_KODEVERK_2 = "kodeverk2";
 
     @Bean
-    @Profile({"dev", "prod"})
+    @Profile({ "dev", "prod" })
     public CacheManager cacheManager(Caffeine caffeine) {
         var caffeineCacheManager = new CaffeineCacheManager(CACHE_BESTILLING,
                 CACHE_BRUKER,
@@ -34,6 +34,7 @@ public CacheManager cacheManager(Caffeine caffeine) {
                 CACHE_KODEVERK_2
         );
         caffeineCacheManager.setCaffeine(caffeine);
+        caffeineCacheManager.setAsyncCacheMode(true);
         return caffeineCacheManager;
     }
 
@@ -44,7 +45,7 @@ public CacheManager cacheManager() {
     }
 
     @Bean
-    public Caffeine caffeineConfig() {
+    public Caffeine<Object, Object> caffeineConfig() {
         return Caffeine.newBuilder().expireAfterWrite(8, TimeUnit.HOURS);
     }
 }
\ No newline at end of file
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java
index 8349d700206..c9204dc8cdb 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java
@@ -34,7 +34,7 @@ public class Consumers {
     private ServerProperties testnavInntektsmeldingService;
     private ServerProperties testnavInntektstubProxy;
     private ServerProperties testnavInstProxy;
-    private ServerProperties testnavKodeverkProxy;
+    private ServerProperties kodeverkApi;
     private ServerProperties testnavKontoregisterPersonProxy;
     private ServerProperties testnavKrrstubProxy;
     private ServerProperties testnavMedlProxy;
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java
index 6b362c5e8f6..81bd759e76f 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java
@@ -48,7 +48,7 @@ public KodeverkConsumer(
             WebClient.Builder webClientBuilder
     ) {
         this.tokenService = tokenService;
-        serverProperties = consumers.getTestnavKodeverkProxy();
+        serverProperties = consumers.getKodeverkApi();
         this.webClient = webClientBuilder
                 .exchangeStrategies(
                         ExchangeStrategies
diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yaml
index 5986947850a..1079899743c 100644
--- 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:
@@ -123,11 +123,11 @@ consumers:
     namespace: dolly
     url: http://testnav-person-service.dolly.svc.cluster.local
     cluster: dev-gcp
-  testnav-kodeverk-proxy:
-    name: testnav-kodeverk-proxy
-    namespace: dolly
-    url: https://testnav-kodeverk-proxy.dev-fss-pub.nais.io
-    cluster: dev-fss
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
+    url: https://kodeverk-api.nav.no
+    cluster: prod-gcp
   testnav-dokarkiv-proxy:
     name: testnav-dokarkiv-proxy
     namespace: dolly
diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml
index b5857a7a897..56f6041eedb 100644
--- a/apps/dolly-backend/src/test/resources/application-test.yaml
+++ b/apps/dolly-backend/src/test/resources/application-test.yaml
@@ -1,10 +1,7 @@
 APP_NAME: dolly
 APP_VERSION: ${application.version}
 environment: localhost
-CLIENT_ID: dummy
-CLIENT_SECRET: dummy
-
-TOKEN_X_CLIENT_ID: test
+TOKEN_X_ISSUER: dummy
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira
@@ -26,11 +23,11 @@ open:
     index: dummy
 
 consumers:
-  testnav-kodeverk-proxy:
-    name: kodeverk-mock
-    namespace: dolly
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
     url: http://localhost:${wiremock.server.port:0}/kodeverk
-    cluster: dev-fss
+    cluster: prod-gcp
   testnav-tps-messaging-service:
     name: tps-messaging-mock
     namespace: dolly
diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
index c4ba6e9f53f..710ea866e12 100644
--- a/apps/dolly-frontend/build.gradle
+++ b/apps/dolly-frontend/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java'
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
         mavenBom 'org.springframework.session:spring-session-bom:2021.2.3'
 
     }
@@ -72,7 +72,7 @@ dependencies {
     implementation 'no.nav.testnav.libs:data-transfer-objects'
 
     // Session
-    implementation 'redis.clients:jedis:4.4.0-m2'
+    implementation 'redis.clients:jedis:5.1.0'
     implementation 'org.springframework.session:spring-session-core'
     implementation 'org.springframework.session:spring-session-data-redis'
 
diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
index 7d4df05b969..3d6423e58b6 100644
--- a/apps/dolly-frontend/config.idporten.yml
+++ b/apps/dolly-frontend/config.idporten.yml
@@ -50,12 +50,12 @@ spec:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
index cc88bff6eef..8f725c1d820 100644
--- a/apps/dolly-frontend/config.test.yml
+++ b/apps/dolly-frontend/config.test.yml
@@ -14,10 +14,10 @@ spec:
   azure:
     sidecar:
       enabled: true
-      autologin: true
-      autologinignorepaths:
+      autoLogin: true
+      autoLoginIgnorePaths:
         - /login
-      errorPath: /login
+        - /assets/*
     application:
       allowAllUsers: true
       enabled: true
diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
index c27b7173093..cbbed02f8e2 100644
--- a/apps/dolly-frontend/config.unstable.yml
+++ b/apps/dolly-frontend/config.unstable.yml
@@ -17,7 +17,7 @@ spec:
       autoLogin: true
       autoLoginIgnorePaths:
         - /login
-      errorPath: /login
+        - /assets/*
     application:
       allowAllUsers: true
       enabled: true
@@ -56,11 +56,11 @@ spec:
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
index 496cf0d107d..c463664db78 100644
--- a/apps/dolly-frontend/config.yml
+++ b/apps/dolly-frontend/config.yml
@@ -14,10 +14,10 @@ spec:
   azure:
     sidecar:
       enabled: true
-      autologin: true
-      autologinignorepaths:
+      autoLogin: true
+      autoLoginIgnorePaths:
         - /login
-      errorPath: /login
+        - /assets/*
     application:
       allowAllUsers: true
       enabled: true
@@ -65,8 +65,8 @@ spec:
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
diff --git a/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json
index 07dfdf1e962..2271d7a9ab3 100644
--- a/apps/dolly-frontend/src/main/js/package-lock.json
+++ b/apps/dolly-frontend/src/main/js/package-lock.json
@@ -12152,9 +12152,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx
index 6e21bb5fb92..da4e97c000f 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx
@@ -19,6 +19,7 @@ import StyledAlert from '@/components/ui/alert/StyledAlert'
 
 type AaregVisningProps = {
 	ident?: string
+	master?: string
 	liste?: Array<MiljoDataListe>
 	ameldinger?: Array<any>
 	loading?: boolean
@@ -262,6 +263,7 @@ const Arbeidsforhold = ({ data }: ArbeidsforholdArray) => {
 
 export const AaregVisning = ({
 	ident,
+	master,
 	liste,
 	ameldinger,
 	loading,
@@ -309,7 +311,10 @@ export const AaregVisning = ({
 			...item,
 			data: item?.data
 				?.map((data) => {
-					return data?.sporingsinformasjon?.opprettetAv?.includes('testnav') ? data : null
+					return data?.sporingsinformasjon?.opprettetAv?.includes('testnav') ||
+						data?.sporingsinformasjon?.opprettetAv?.includes('srvappserver')
+						? data
+						: null
 				})
 				?.filter((data) => data),
 		}
@@ -387,7 +392,7 @@ export const AaregVisning = ({
 
 	return (
 		<>
-			{harArbeidsforholdBestilling && getArbeidsforhold()}
+			{(harArbeidsforholdBestilling || master === 'PDL') && getArbeidsforhold()}
 			{harAmeldingBestilling && getAmelding(ident)}
 		</>
 	)
diff --git a/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx
index 16b41647051..5a4556ee5b0 100644
--- a/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx
+++ b/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx
@@ -42,7 +42,9 @@ export const sokSelector = (bestillingerById, searchStr) => {
 	if (!searchStr || !items) return items
 
 	return items.filter(({ listedata }) => {
-		const searchValues = listedata.filter((v) => !_.isNil(v)).map((v) => v.toString().toLowerCase())
+		const searchValues = listedata
+			?.filter((v) => !_.isNil(v))
+			.map((v) => v.toString().toLowerCase())
 		return searchValues.some((v) => v.includes(searchStr.toLowerCase()))
 	})
 }
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx
index f77c4ee34e2..234f4d5eb1a 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx
@@ -96,7 +96,7 @@ export default function BestillingListe({
 			<DollyTable
 				pagination
 				gruppeDetaljer={{
-					antallElementer: gruppeInfo.antallBestillinger,
+					antallElementer: gruppeInfo?.antallBestillinger,
 					pageSize: sideStoerrelse,
 				}}
 				data={statusBestillinger}
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx
index 4a4046f3abb..7a807b097fe 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx
@@ -418,6 +418,7 @@ export default ({
 				{visArbeidsforhold && (
 					<AaregVisning
 						ident={ident.ident}
+						master={ident.master}
 						liste={arbeidsforhold}
 						ameldinger={ameldinger}
 						loading={loadingAareg || loadingAmelding}
diff --git a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx
index 8e10fb548dd..3c04f865bde 100644
--- a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx
@@ -68,7 +68,7 @@ export const SelectOptionsFormat = {
 				)
 			return options
 		} else if (type === 'arbeidsforholdstyper') {
-			const options = kodeverk || []
+			const options = kodeverk?.koder || kodeverk || []
 			options?.length > 0 &&
 				options.forEach((option: Option) => {
 					if (option.value === 'frilanserOppdragstakerHonorarPersonerMm') {
diff --git a/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx
index 824c0725699..aefe3757adb 100644
--- a/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx
@@ -1,13 +1,13 @@
 import Request from '@/service/services/Request'
 
-const skjermingUrl = '/testnav-skjermingsregister-proxy/api/v1/skjermingdata'
+const skjermingUrl = '/testnav-skjermingsregister-proxy/api/v1/skjerming/dolly'
 
 export default {
 	deleteSkjerming(ident: string) {
-		return Request.delete(`${skjermingUrl}/${ident}`)
+		return Request.put(skjermingUrl, { personident: ident, skjermetTil: new Date() })
 	},
 
 	getSkjerming(ident: string) {
-		return Request.get(`${skjermingUrl}/${ident}`)
-	}
+		return Request.get(skjermingUrl, { personident: ident })
+	},
 }
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index b6abc34b0e9..1c35d8f7dce 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -1,5 +1,6 @@
 POST_LOGOUT_REDIRECT_URI: 'http://localhost:3000/login'
 REDIS_HOST: localhost
+TOKEN_X_ISSUER: dummy
 
 server:
   port: 8020
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index d4d7a0ccdc8..2c15148f945 100644
--- 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/dolly-frontend/src/test/resources/application-test.yml b/apps/dolly-frontend/src/test/resources/application-test.yml
index 94ad768e500..74bf801179e 100644
--- a/apps/dolly-frontend/src/test/resources/application-test.yml
+++ b/apps/dolly-frontend/src/test/resources/application-test.yml
@@ -1,7 +1,4 @@
-spring.cloud.vault.token: dummy
-
-azure.app.client.id: dummy
-azure.app.client.secret: dummy
+TOKEN_X_ISSUER: dummy
 
 IDPORTEN_CLIENT_ID: dummy
 IDPORTEN_CLIENT_JWK: "{}"
diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle
index f4ce7b69aa9..3f49b0cbefd 100644
--- a/apps/dollystatus/build.gradle
+++ b/apps/dollystatus/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
diff --git a/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties b/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/dollystatus/src/main/js/package-lock.json b/apps/dollystatus/src/main/js/package-lock.json
index 79ebde590ee..a733f14eba6 100644
--- a/apps/dollystatus/src/main/js/package-lock.json
+++ b/apps/dollystatus/src/main/js/package-lock.json
@@ -28,7 +28,7 @@
         "path-browserify": "^1.0.1",
         "prettier": "^3.0.1",
         "typescript": "^5.0.2",
-        "vite": "^5.0.8",
+        "vite": "^5.0.12",
         "vite-plugin-html": "^3.2.0",
         "vite-plugin-svgr": "^4.0.0",
         "vite-tsconfig-paths": "^4.0.5"
@@ -3888,9 +3888,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/apps/dollystatus/src/main/js/package.json b/apps/dollystatus/src/main/js/package.json
index ff0978570c3..b2e8b46ee2d 100644
--- a/apps/dollystatus/src/main/js/package.json
+++ b/apps/dollystatus/src/main/js/package.json
@@ -24,7 +24,7 @@
     "path-browserify": "^1.0.1",
     "prettier": "^3.0.1",
     "typescript": "^5.0.2",
-    "vite": "^5.0.8",
+    "vite": "^5.0.12",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-svgr": "^4.0.0",
     "vite-tsconfig-paths": "^4.0.5"
diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle
index 99ae52f135d..c225fd5beb4 100644
--- a/apps/endringsmelding-frontend/build.gradle
+++ b/apps/endringsmelding-frontend/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom  'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom  'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/endringsmelding-frontend/src/main/js/package-lock.json b/apps/endringsmelding-frontend/src/main/js/package-lock.json
index 0aadda60c66..04de95a13d2 100644
--- a/apps/endringsmelding-frontend/src/main/js/package-lock.json
+++ b/apps/endringsmelding-frontend/src/main/js/package-lock.json
@@ -34,7 +34,7 @@
         "prettier": "^3.0.1",
         "swr": "^2.0.0",
         "typescript": "^5.0.2",
-        "vite": "^5.0.8",
+        "vite": "^5.0.12",
         "vite-plugin-svgr": "^4.0.0",
         "vite-tsconfig-paths": "^4.0.0"
       }
@@ -4130,9 +4130,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/apps/endringsmelding-frontend/src/main/js/package.json b/apps/endringsmelding-frontend/src/main/js/package.json
index 65f0c42d93e..31a3b5c4da1 100644
--- a/apps/endringsmelding-frontend/src/main/js/package.json
+++ b/apps/endringsmelding-frontend/src/main/js/package.json
@@ -30,7 +30,7 @@
     "prettier": "^3.0.1",
     "typescript": "^5.0.2",
     "@vitejs/plugin-react": "^4.0.0",
-    "vite": "^5.0.8",
+    "vite": "^5.0.12",
     "vite-plugin-svgr": "^4.0.0",
     "swr": "^2.0.0",
     "vite-tsconfig-paths": "^4.0.0"
diff --git a/apps/endringsmelding-frontend/src/test/resources/application-test.properties b/apps/endringsmelding-frontend/src/test/resources/application-test.properties
deleted file mode 100644
index 148b7a6e0e6..00000000000
--- a/apps/endringsmelding-frontend/src/test/resources/application-test.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle
index 210652ba98e..2d04faab4b4 100644
--- a/apps/endringsmelding-service/build.gradle
+++ b/apps/endringsmelding-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -32,7 +32,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom  'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom  'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -58,8 +58,8 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'org.hibernate.validator:hibernate-validator'
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
diff --git a/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml
index fb09b764336..40398f5dfe6 100644
--- a/apps/endringsmelding-service/src/main/resources/application.yml
+++ b/apps/endringsmelding-service/src/main/resources/application.yml
@@ -13,9 +13,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-endringsmelding-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/endringsmelding-service/src/test/resources/application-test.properties b/apps/endringsmelding-service/src/test/resources/application-test.properties
index f44e7773252..e5e55886152 100644
--- a/apps/endringsmelding-service/src/test/resources/application-test.properties
+++ b/apps/endringsmelding-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle
index 3e7fff65598..82748072fa7 100644
--- a/apps/ereg-batch-status-service/build.gradle
+++ b/apps/ereg-batch-status-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -65,8 +65,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties b/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/ereg-batch-status-service/src/main/resources/application.yml b/apps/ereg-batch-status-service/src/main/resources/application.yml
index ce848b204f5..ede2e74d146 100644
--- a/apps/ereg-batch-status-service/src/main/resources/application.yml
+++ b/apps/ereg-batch-status-service/src/main/resources/application.yml
@@ -15,9 +15,9 @@ 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
-          accepted-audience: dev-fss:dolly:ereg-batch-status-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/ereg-batch-status-service/src/test/resources/application-test.properties b/apps/ereg-batch-status-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/ereg-batch-status-service/src/test/resources/application-test.properties
+++ b/apps/ereg-batch-status-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle
index 0e76f343985..c9d2e827bb7 100644
--- a/apps/faste-data-frontend/build.gradle
+++ b/apps/faste-data-frontend/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/faste-data-frontend/src/main/js/package-lock.json b/apps/faste-data-frontend/src/main/js/package-lock.json
index 5bbe85d879e..58df0110c14 100644
--- a/apps/faste-data-frontend/src/main/js/package-lock.json
+++ b/apps/faste-data-frontend/src/main/js/package-lock.json
@@ -35,7 +35,7 @@
         "less": "^4.1.3",
         "prettier": "^3.0.1",
         "typescript": "^5.0.4",
-        "vite": "^5.0.8",
+        "vite": "^5.0.12",
         "vite-plugin-environment": "^1.1.3",
         "vite-plugin-svgr": "^4.0.0",
         "vite-tsconfig-paths": "^4.0.0"
@@ -3823,9 +3823,9 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/apps/faste-data-frontend/src/main/js/package.json b/apps/faste-data-frontend/src/main/js/package.json
index 398c53e5c72..790b54f6099 100644
--- a/apps/faste-data-frontend/src/main/js/package.json
+++ b/apps/faste-data-frontend/src/main/js/package.json
@@ -30,7 +30,7 @@
     "prettier": "^3.0.1",
     "typescript": "^5.0.4",
     "@vitejs/plugin-react": "^4.0.0",
-    "vite": "^5.0.8",
+    "vite": "^5.0.12",
     "vite-plugin-environment": "^1.1.3",
     "vite-plugin-svgr": "^4.0.0",
     "vite-tsconfig-paths": "^4.0.0"
diff --git a/apps/faste-data-frontend/src/main/resources/application-dev.yml b/apps/faste-data-frontend/src/main/resources/application-dev.yml
index 642f62d64e9..4b73567c4dc 100644
--- a/apps/faste-data-frontend/src/main/resources/application-dev.yml
+++ b/apps/faste-data-frontend/src/main/resources/application-dev.yml
@@ -1,5 +1,3 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
 
 consumers:
   testnorge-profil-api:
diff --git a/apps/faste-data-frontend/src/test/resources/application-test.properties b/apps/faste-data-frontend/src/test/resources/application-test.properties
deleted file mode 100644
index 148b7a6e0e6..00000000000
--- a/apps/faste-data-frontend/src/test/resources/application-test.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle
index acff03c789e..b31371ed56a 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle
+++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -66,8 +66,8 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
diff --git a/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
index 85c6c31d85d..f00988c5f62 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
+++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
@@ -12,9 +12,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-generer-arbeidsforhold-populasjon-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties b/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties
+++ b/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle
index c1efbd5e8ac..d1da6add3be 100644
--- a/apps/generer-navn-service/build.gradle
+++ b/apps/generer-navn-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -63,8 +63,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/generer-navn-service/config.yml b/apps/generer-navn-service/config.yml
index b1e23da4e0c..2e2ad5598d3 100644
--- a/apps/generer-navn-service/config.yml
+++ b/apps/generer-navn-service/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/generer-navn-service/src/main/resources/application.yml b/apps/generer-navn-service/src/main/resources/application.yml
index ed8733ceea6..fbf80725da1 100644
--- a/apps/generer-navn-service/src/main/resources/application.yml
+++ b/apps/generer-navn-service/src/main/resources/application.yml
@@ -15,9 +15,9 @@ 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
-          accepted-audience: dev-gcp:dolly:generer-navn-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
diff --git a/apps/generer-navn-service/src/test/resources/application-test.properties b/apps/generer-navn-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/generer-navn-service/src/test/resources/application-test.properties
+++ b/apps/generer-navn-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle
index 1743ca07cb2..92d472ee3f9 100644
--- a/apps/generer-organisasjon-populasjon-service/build.gradle
+++ b/apps/generer-organisasjon-populasjon-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -84,8 +84,8 @@ dependencies {
     implementation 'com.zaxxer:HikariCP'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE'
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'org.postgresql:postgresql'
diff --git a/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
index cb67c5b2ffe..1095396feec 100644
--- a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
+++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
@@ -12,9 +12,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-generer-organisasjon-populasjon-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties
index d0fd67ad6d8..f039fb475ec 100644
--- a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties
+++ b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties
@@ -1,2 +1,2 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
 KAFKA_KEYSTORE_PATH=""
\ No newline at end of file
diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle
index 96535cbf724..8de3db15b44 100644
--- a/apps/generer-synt-amelding-service/build.gradle
+++ b/apps/generer-synt-amelding-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -32,7 +32,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -59,8 +59,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/generer-synt-amelding-service/config.yml b/apps/generer-synt-amelding-service/config.yml
index 3d937750474..0fca6cc3028 100644
--- a/apps/generer-synt-amelding-service/config.yml
+++ b/apps/generer-synt-amelding-service/config.yml
@@ -9,8 +9,6 @@ spec:
   image: "{{image}}"
   port: 8080
   webproxy: true
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml b/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml
deleted file mode 100644
index 968e537aa99..00000000000
--- a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-azure:
-  app:
-    client:
-      id: ${client_id}
-      secret: ${client_secret}
diff --git a/apps/generer-synt-amelding-service/src/main/resources/application.yml b/apps/generer-synt-amelding-service/src/main/resources/application.yml
index ad9e81fac63..646d5965c2f 100644
--- a/apps/generer-synt-amelding-service/src/main/resources/application.yml
+++ b/apps/generer-synt-amelding-service/src/main/resources/application.yml
@@ -17,9 +17,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-generer-synt-amelding-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/generer-synt-amelding-service/src/test/resources/application-test.yml b/apps/generer-synt-amelding-service/src/test/resources/application-test.yml
index 1513514ac87..c7ad525dd9c 100644
--- a/apps/generer-synt-amelding-service/src/test/resources/application-test.yml
+++ b/apps/generer-synt-amelding-service/src/test/resources/application-test.yml
@@ -18,3 +18,4 @@ consumers:
 
 
 AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token
+TOKEN_X_ISSUER: dummy
diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle
index f60b47b5d26..4198be13b68 100644
--- a/apps/geografiske-kodeverk-service/build.gradle
+++ b/apps/geografiske-kodeverk-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -64,8 +64,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/geografiske-kodeverk-service/config.yml b/apps/geografiske-kodeverk-service/config.yml
index 7e4b2a015ac..af967fcc550 100644
--- a/apps/geografiske-kodeverk-service/config.yml
+++ b/apps/geografiske-kodeverk-service/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties b/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml b/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml
index 67429d094f5..76ddc7c5db2 100644
--- a/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml
+++ b/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml
@@ -1,3 +1 @@
 AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
diff --git a/apps/geografiske-kodeverk-service/src/main/resources/application.yml b/apps/geografiske-kodeverk-service/src/main/resources/application.yml
index 4b0f1c60c23..90f1aec1670 100644
--- a/apps/geografiske-kodeverk-service/src/main/resources/application.yml
+++ b/apps/geografiske-kodeverk-service/src/main/resources/application.yml
@@ -12,9 +12,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-geografiske-kodeverk-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java
index d4e219fc3b7..f381bd8b4d9 100644
--- a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java
+++ b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 public class ApplicationContextTest {
 
     @MockBean
diff --git a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java
index 5f8c8ade095..e84648bf685 100644
--- a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java
+++ b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java
@@ -9,6 +9,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -17,10 +18,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 @SpringBootTest
+@ActiveProfiles("test")
 @AutoConfigureMockMvc(addFilters = false)
 class KodeverkControllerTest {
 
@@ -265,7 +266,7 @@ void should_return_bad_request_when_embetenavn_is_not_alphabetical() throws Exce
 
     private List<Kodeverk> readResponse(MvcResult result) throws Exception {
         Kodeverk[] array = objectMapper.readValue(result.getResponse().getContentAsString(), Kodeverk[].class);
-        return Arrays.stream(array).collect(Collectors.toUnmodifiableList());
+        return Arrays.stream(array).toList();
     }
 
 }
\ No newline at end of file
diff --git a/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties b/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties
new file mode 100644
index 00000000000..38e5e4b2b5e
--- /dev/null
+++ b/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=DUMMY
diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle
index fbafef94927..aee26706100 100644
--- a/apps/helsepersonell-service/build.gradle
+++ b/apps/helsepersonell-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -63,8 +63,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties b/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/helsepersonell-service/src/main/resources/application.yml b/apps/helsepersonell-service/src/main/resources/application.yml
index 231c4c6e1d2..1d0a77c0f9f 100644
--- a/apps/helsepersonell-service/src/main/resources/application.yml
+++ b/apps/helsepersonell-service/src/main/resources/application.yml
@@ -18,9 +18,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-helsepersonell-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/helsepersonell-service/src/test/resources/application-test.properties b/apps/helsepersonell-service/src/test/resources/application-test.properties
new file mode 100644
index 00000000000..e5e55886152
--- /dev/null
+++ b/apps/helsepersonell-service/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle
index 4313ba82af5..b1d1513c14f 100644
--- a/apps/inntektsmelding-generator-service/build.gradle
+++ b/apps/inntektsmelding-generator-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -59,8 +59,8 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
 
     implementation 'org.hibernate.validator:hibernate-validator'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'org.aspectj:aspectjweaver:1.9.7'
 
diff --git a/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties b/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application.yml b/apps/inntektsmelding-generator-service/src/main/resources/application.yml
index fb8ffb03390..acd2b99aafa 100644
--- a/apps/inntektsmelding-generator-service/src/main/resources/application.yml
+++ b/apps/inntektsmelding-generator-service/src/main/resources/application.yml
@@ -14,9 +14,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-generator-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
diff --git a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java b/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java
index f9e74976829..faee7505b3e 100644
--- a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java
+++ b/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java
@@ -4,7 +4,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
+@ActiveProfiles("test")
 @SpringBootTest
 public class ApplicationContextTest {
 
diff --git a/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties b/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties
index da059fb49a7..69cc41673f4 100644
--- a/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties
+++ b/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=DUMMY
+TOKEN_X_ISSUER=dummy
diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle
index 661fe50f7aa..3e6a5a442af 100644
--- a/apps/inntektsmelding-service/build.gradle
+++ b/apps/inntektsmelding-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -64,8 +64,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'org.aspectj:aspectjweaver:1.9.7'
diff --git a/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java
index cdd6afb30bd..7b1b9e89e5b 100644
--- a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java
+++ b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java
@@ -3,8 +3,10 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 
@@ -16,25 +18,23 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
-                        "/internal/**",
-                        "/webjars/**",
-                        "/h2/**",
-                        "/swagger-resources/**",
-                        "/v3/api-docs/**",
-                        "/swagger-ui/**",
-                        "/swagger",
-                        "/error",
-                        "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+        httpSecurity.sessionManagement(managementConfigurer ->
+                        managementConfigurer.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(AbstractHttpConfigurer::disable)
+                .authorizeHttpRequests(matcherRegistry -> matcherRegistry.requestMatchers(
+                                "/internal/**",
+                                "/webjars/**",
+                                "/h2/**",
+                                "/swagger-resources/**",
+                                "/v3/api-docs/**",
+                                "/swagger-ui/**",
+                                "/swagger",
+                                "/error",
+                                "/swagger-ui.html")
+                        .permitAll()
+                        .requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(httpSecurityOAuth2ResourceServerConfigurer -> httpSecurityOAuth2ResourceServerConfigurer
+                        .jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }
diff --git a/apps/inntektsmelding-service/src/main/resources/application.yml b/apps/inntektsmelding-service/src/main/resources/application.yml
index dea9a38effe..c47500f7574 100644
--- a/apps/inntektsmelding-service/src/main/resources/application.yml
+++ b/apps/inntektsmelding-service/src/main/resources/application.yml
@@ -18,9 +18,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java b/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java
index 736cbb78c92..a06020db1b7 100644
--- a/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java
+++ b/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 public class ApplicationContextTest {
 
     @MockBean
diff --git a/apps/inntektsmelding-service/src/test/resources/application-test.properties b/apps/inntektsmelding-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/inntektsmelding-service/src/test/resources/application-test.properties
+++ b/apps/inntektsmelding-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle
index edd717a67cf..1f44da920aa 100644
--- a/apps/jenkins-batch-status-service/build.gradle
+++ b/apps/jenkins-batch-status-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -67,8 +67,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties b/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/service/BatchService.java b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/service/BatchService.java
index aed91a5ac3d..cbce1b84f0e 100644
--- a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/service/BatchService.java
+++ b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/service/BatchService.java
@@ -23,8 +23,8 @@ public void registerEregBestilling(String uuid, String miljo, Long itemId) {
 
         var id = organisasjonBestillingConsumer.save(uuid);
         var retryConfig = new RetryConfig.Builder()
-                .setRetryAttempts(60 * 5)
-                .setSleepSeconds(3)
+                .setRetryAttempts(5)
+                .setSleepSeconds(10)
                 .build();
 
 
diff --git a/apps/jenkins-batch-status-service/src/main/resources/application.yml b/apps/jenkins-batch-status-service/src/main/resources/application.yml
index 6804a47faf7..282bf9b0a24 100644
--- a/apps/jenkins-batch-status-service/src/main/resources/application.yml
+++ b/apps/jenkins-batch-status-service/src/main/resources/application.yml
@@ -15,9 +15,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-jenkins-batch-status-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java b/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java
index 365f550488c..9fc4b631887 100644
--- a/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java
+++ b/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 public class ApplicationContextTest {
 
     @MockBean
diff --git a/apps/jenkins-batch-status-service/src/test/resources/application-test.properties b/apps/jenkins-batch-status-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/jenkins-batch-status-service/src/test/resources/application-test.properties
+++ b/apps/jenkins-batch-status-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle
index d6b89056646..e16d6e24b30 100644
--- a/apps/joark-dokument-service/build.gradle
+++ b/apps/joark-dokument-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -64,8 +64,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/joark-dokument-service/config.yml b/apps/joark-dokument-service/config.yml
index 2e64de12fc3..0dd8a110d7f 100644
--- a/apps/joark-dokument-service/config.yml
+++ b/apps/joark-dokument-service/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties b/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/joark-dokument-service/src/main/resources/application.yml b/apps/joark-dokument-service/src/main/resources/application.yml
index 3f1f1aa66b9..d9900d2f2c7 100644
--- a/apps/joark-dokument-service/src/main/resources/application.yml
+++ b/apps/joark-dokument-service/src/main/resources/application.yml
@@ -20,9 +20,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-joark-dokument-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java b/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java
index e3fb2a3f8a4..b6b552e1b36 100644
--- a/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java
+++ b/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java
@@ -4,7 +4,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
+@ActiveProfiles("test")
 @SpringBootTest
 public class ApplicationContextTest {
 
diff --git a/apps/joark-dokument-service/src/test/resources/application-test.properties b/apps/joark-dokument-service/src/test/resources/application-test.properties
new file mode 100644
index 00000000000..483fe127f1f
--- /dev/null
+++ b/apps/joark-dokument-service/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER= dummy
\ No newline at end of file
diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle
index 3ffded68927..967ab1a2311 100644
--- a/apps/miljoer-service/build.gradle
+++ b/apps/miljoer-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -65,8 +65,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/miljoer-service/config.yml b/apps/miljoer-service/config.yml
index 6bc3aa92739..45fe78c1332 100644
--- a/apps/miljoer-service/config.yml
+++ b/apps/miljoer-service/config.yml
@@ -9,8 +9,6 @@ spec:
   image: "{{image}}"
   port: 8080
   webproxy: true
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties b/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/miljoer-service/src/main/resources/application-dev.yml b/apps/miljoer-service/src/main/resources/application-dev.yml
deleted file mode 100644
index a1cf247e4df..00000000000
--- a/apps/miljoer-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
\ No newline at end of file
diff --git a/apps/miljoer-service/src/main/resources/application.yml b/apps/miljoer-service/src/main/resources/application.yml
index c0990b4c896..7fd89e5b822 100644
--- a/apps/miljoer-service/src/main/resources/application.yml
+++ b/apps/miljoer-service/src/main/resources/application.yml
@@ -17,9 +17,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-miljoer-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
diff --git a/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java b/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java
index 5c714c2b198..44ecb7599b0 100644
--- a/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java
+++ b/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java
@@ -4,7 +4,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
+@ActiveProfiles("test")
 @SpringBootTest
 public class ApplicationContextTest {
 
diff --git a/apps/miljoer-service/src/test/resources/application-test.properties b/apps/miljoer-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/miljoer-service/src/test/resources/application-test.properties
+++ b/apps/miljoer-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle
index 2b4340fdf8d..e4af7804de0 100644
--- a/apps/oppsummeringsdokument-service/build.gradle
+++ b/apps/oppsummeringsdokument-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -76,7 +76,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    implementation 'org.opensearch.client:spring-data-opensearch:1.2.0'
+    implementation 'org.opensearch.client:spring-data-opensearch:1.3.0'
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
@@ -89,8 +89,8 @@ dependencies {
     implementation 'org.apache.kafka:kafka-clients:3.6.1'
     implementation 'io.confluent:kafka-avro-serializer:7.5.1'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'no.nav.freg:freg-security-oidc:2c24d35d'
 
diff --git a/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties b/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java
index c29911c75ea..cf9d43cae1a 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java
@@ -11,4 +11,4 @@ public class OppsummeringsdokumentServiceApplicationStarter {
     public static void main(String[] args) {
         SpringApplication.run(OppsummeringsdokumentServiceApplicationStarter.class, args);
     }
-}
\ No newline at end of file
+}
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application.yml b/apps/oppsummeringsdokument-service/src/main/resources/application.yml
index 318962f7136..3c0c3943611 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/application.yml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/application.yml
@@ -17,9 +17,9 @@ 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
-          accepted-audience: dev-gcp:dolly:oppsummeringsdokument-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   application:
     name: oppsummeringsdokument-service
     version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle
diff --git a/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties b/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties
index 5aedffc5dac..22db53e5b18 100644
--- a/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties
+++ b/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties
@@ -1,4 +1,4 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
 OPENSEARCH_USERNAME=username
 OPENSEARCH_PASSWORD=password
 OPENSEARCH_HOST=localhost
diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle
index 88fab1f912d..e1731360d18 100644
--- a/apps/organisasjon-bestilling-service/build.gradle
+++ b/apps/organisasjon-bestilling-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -75,8 +75,8 @@ dependencies {
     implementation 'org.hibernate.validator:hibernate-validator'
     
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
diff --git a/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java
index d05f99f986f..65b9e3dafdf 100644
--- a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java
+++ b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java
@@ -34,8 +34,8 @@ public Order save(Order order) {
             log.info("Finner build id for ordre {} med uuid {}...", saved.getId(), saved.getUuid());
 
             var retryConfig = new RetryConfig.Builder()
-                    .setRetryAttempts(60 * 5)
-                    .setSleepSeconds(2)
+                    .setRetryAttempts(5)
+                    .setSleepSeconds(10)
                     .build();
             retryService.execute(retryConfig, () -> {
                 var buildId = jenkinsConsumer.getBuildId(order.getQueueId()).block();
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application.yml b/apps/organisasjon-bestilling-service/src/main/resources/application.yml
index 89c1961c4df..3d3df5fd455 100644
--- a/apps/organisasjon-bestilling-service/src/main/resources/application.yml
+++ b/apps/organisasjon-bestilling-service/src/main/resources/application.yml
@@ -16,9 +16,9 @@ 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
-          accepted-audience: dev-gcp:dolly:organisasjon-bestilling-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties b/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties
+++ b/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle
index 6210f5e3856..f03ab646ff2 100644
--- a/apps/organisasjon-faste-data-service/build.gradle
+++ b/apps/organisasjon-faste-data-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -83,8 +83,8 @@ dependencies {
     implementation 'org.postgresql:postgresql'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE'
     implementation 'org.hibernate.validator:hibernate-validator'
 
diff --git a/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml
index bb9e89e1c87..b73f614e194 100644
--- a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml
+++ b/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml
@@ -1,5 +1,3 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
 
 spring:
   h2:
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application.yml b/apps/organisasjon-faste-data-service/src/main/resources/application.yml
index fbe86598ef8..8a26cd2b93a 100644
--- a/apps/organisasjon-faste-data-service/src/main/resources/application.yml
+++ b/apps/organisasjon-faste-data-service/src/main/resources/application.yml
@@ -12,9 +12,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-organisasjon-faste-data-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
diff --git a/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties b/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties
index 148b7a6e0e6..e5e55886152 100644
--- a/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties
+++ b/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle
index b8ca81d542c..df32eeb1ada 100644
--- a/apps/organisasjon-forvalter/build.gradle
+++ b/apps/organisasjon-forvalter/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -90,7 +90,7 @@ dependencies {
     implementation 'org.postgresql:postgresql'
     implementation 'org.hibernate.validator:hibernate-validator'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
diff --git a/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-forvalter/src/main/resources/application-prod.yml b/apps/organisasjon-forvalter/src/main/resources/application-prod.yml
index f5023aac59f..4b8821847b5 100644
--- a/apps/organisasjon-forvalter/src/main/resources/application-prod.yml
+++ b/apps/organisasjon-forvalter/src/main/resources/application-prod.yml
@@ -1,6 +1,4 @@
 
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   flyway:
     enabled: true # Disabled by default as you should probably think twice before running Flyway-migrations
diff --git a/apps/organisasjon-forvalter/src/main/resources/application.yml b/apps/organisasjon-forvalter/src/main/resources/application.yml
index 47c0b8e553b..281ffe2add2 100644
--- a/apps/organisasjon-forvalter/src/main/resources/application.yml
+++ b/apps/organisasjon-forvalter/src/main/resources/application.yml
@@ -13,9 +13,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-organisasjon-forvalter
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/organisasjon-forvalter/src/test/resources/application-test.properties b/apps/organisasjon-forvalter/src/test/resources/application-test.properties
index 938fc4b3fd4..2863d66abd4 100644
--- a/apps/organisasjon-forvalter/src/test/resources/application-test.properties
+++ b/apps/organisasjon-forvalter/src/test/resources/application-test.properties
@@ -1,4 +1,5 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
+spring.cloud.vault.enabled=false
 
 spring.datasource.url=jdbc:h2:mem:testdb
 spring.datasource.driverClassName=org.h2.Driver
diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle
index 92d0e4e4ae3..8029bfb52fc 100644
--- a/apps/organisasjon-mottak-service/build.gradle
+++ b/apps/organisasjon-mottak-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -79,7 +79,7 @@ dependencies {
     implementation 'org.apache.kafka:kafka-clients:3.6.1'
     implementation 'io.confluent:kafka-avro-serializer:7.5.1'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
diff --git a/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OMSApplicationStarter.java b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OrganisasjonMottakServiceApplicationStarter.java
similarity index 66%
rename from apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OMSApplicationStarter.java
rename to apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OrganisasjonMottakServiceApplicationStarter.java
index fe9bafa3b67..d02898ddb45 100644
--- a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OMSApplicationStarter.java
+++ b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OrganisasjonMottakServiceApplicationStarter.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
index ccce4473604..12b7a1c3f77 100644
--- a/apps/organisasjon-mottak-service/src/main/resources/application.yml
+++ b/apps/organisasjon-mottak-service/src/main/resources/application.yml
@@ -12,9 +12,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-organisasjon-mottak-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/organisasjon-mottak-service/src/test/resources/application-test.properties b/apps/organisasjon-mottak-service/src/test/resources/application-test.properties
index 62ea7c95ced..a550c3bea79 100644
--- a/apps/organisasjon-mottak-service/src/test/resources/application-test.properties
+++ b/apps/organisasjon-mottak-service/src/test/resources/application-test.properties
@@ -1,4 +1,4 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
 
 kafka.bootstrapservers= dummy
 kafka.schemaregistryservers= dummy
diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle
index e6282160c18..67bd8ebe2b2 100644
--- a/apps/organisasjon-service/build.gradle
+++ b/apps/organisasjon-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -67,7 +67,7 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
     implementation 'org.hibernate.validator:hibernate-validator'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5
diff --git a/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-service/src/main/resources/application.yml b/apps/organisasjon-service/src/main/resources/application.yml
index c2677e97d85..0b30288e953 100644
--- a/apps/organisasjon-service/src/main/resources/application.yml
+++ b/apps/organisasjon-service/src/main/resources/application.yml
@@ -11,9 +11,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-organisasjon-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
diff --git a/apps/organisasjon-service/src/test/resources/application-test.properties b/apps/organisasjon-service/src/test/resources/application-test.properties
index b14a316d82c..6763c44e6a5 100644
--- a/apps/organisasjon-service/src/test/resources/application-test.properties
+++ b/apps/organisasjon-service/src/test/resources/application-test.properties
@@ -1,3 +1,3 @@
 consumers.ereg.url=http://localhost:${wiremock.server.port}
 
-spring.cloud.vault.token=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle
index b6f0936ab52..ec24bb4d68f 100644
--- a/apps/organisasjon-tilgang-frontend/build.gradle
+++ b/apps/organisasjon-tilgang-frontend/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom  'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom  'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json b/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json
index 9e0aac31c57..9a7e2f85cdb 100644
--- a/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json
+++ b/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json
@@ -38,7 +38,7 @@
         "mini-css-extract-plugin": "^2.6.1",
         "prettier": "^3.0.1",
         "typescript": "^5.0.4",
-        "vite": "^5.0.8",
+        "vite": "^5.0.12",
         "vite-plugin-svgr": "^4.0.0",
         "vite-tsconfig-paths": "^4.2.0"
       }
@@ -4352,9 +4352,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/apps/organisasjon-tilgang-frontend/src/main/js/package.json b/apps/organisasjon-tilgang-frontend/src/main/js/package.json
index de407c068a2..d589f6a6869 100644
--- a/apps/organisasjon-tilgang-frontend/src/main/js/package.json
+++ b/apps/organisasjon-tilgang-frontend/src/main/js/package.json
@@ -35,7 +35,7 @@
     "prettier": "^3.0.1",
     "typescript": "^5.0.4",
     "@vitejs/plugin-react": "^4.0.0",
-    "vite": "^5.0.8",
+    "vite": "^5.0.12",
     "vite-plugin-svgr": "^4.0.0",
     "vite-tsconfig-paths": "^4.2.0"
   },
diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle
index 26d56417738..484b243261d 100644
--- a/apps/organisasjon-tilgang-service/build.gradle
+++ b/apps/organisasjon-tilgang-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -44,7 +44,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -72,8 +72,8 @@ dependencies {
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
diff --git a/apps/organisasjon-tilgang-service/config.yml b/apps/organisasjon-tilgang-service/config.yml
index c2668b76ef2..9870915500e 100644
--- a/apps/organisasjon-tilgang-service/config.yml
+++ b/apps/organisasjon-tilgang-service/config.yml
@@ -71,14 +71,10 @@ spec:
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: prod
-    - name: ACCEPTED_AUDIENCE
-      value: dev-gcp:dolly:testnav-organisasjon-tilgang-service
-    - name: TOKENDINGS_URL
-      value: https://tokenx.dev-gcp.nav.cloud.nais.io 
   gcp:
     sqlInstances:
       - type: POSTGRES_15
         name: testnav-organisasjon-tilganger
         databases:
           - name: testnav-organisasjon-tilganger
-        autoBackupTime: "02:30"
\ No newline at end of file
+        autoBackupHour: 2
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
index 247d2681871..f212b988f4a 100644
--- 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 @@
+TOKEN_X_ISSUER: dummy
 
 ALTINN_URL: https://tt02.altinn.no
-TOKENDINGS_URL: https://tokenx.dev-gcp.nav.cloud.nais.io
 
 altinn.api.key: dummy
 
@@ -13,9 +13,4 @@ spring:
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
-    password:
-  security:
-    oauth2:
-      resourceserver:
-        tokenx:
-          accepted-audience: dev-gcp:dolly:testnav-organisasjon-tilgang-service
\ No newline at end of file
+    password:
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application.yml b/apps/organisasjon-tilgang-service/src/main/resources/application.yml
index 0c72638d72d..c8e30c1fe89 100644
--- a/apps/organisasjon-tilgang-service/src/main/resources/application.yml
+++ b/apps/organisasjon-tilgang-service/src/main/resources/application.yml
@@ -13,9 +13,9 @@ 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: ${TOKENDINGS_URL}
-          jwk-set-uri: ${TOKENDINGS_URL}/jwks
-          accepted-audience: ${ACCEPTED_AUDIENCE}
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   jackson:
     serialization:
       write_dates_as_timestamps: false
diff --git a/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml b/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml
index e71cf08015e..dfbee67495e 100644
--- a/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml
+++ b/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml
@@ -4,4 +4,4 @@ MASKINPORTEN_CLIENT_ID: dummy
 MASKINPORTEN_CLIENT_JWK: dummy
 MASKINPORTEN_SCOPES: dummy
 MASKINPORTEN_WELL_KNOWN_URL: http://localhost:8080
-TOKENDINGS_URL: dummy
\ No newline at end of file
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle
index f9ce74141ed..de7c8a0701c 100644
--- a/apps/orgnummer-service/build.gradle
+++ b/apps/orgnummer-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -76,8 +76,8 @@ dependencies {
     implementation 'com.zaxxer:HikariCP'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'org.postgresql:postgresql'
diff --git a/apps/orgnummer-service/config.yml b/apps/orgnummer-service/config.yml
index 4923ebe32a0..815bd5b8b0c 100644
--- a/apps/orgnummer-service/config.yml
+++ b/apps/orgnummer-service/config.yml
@@ -65,4 +65,4 @@ spec:
         name: testnav-orgnummer-pool
         databases:
           - name: testnav-orgnummer-pool
-        autoBackupTime: "02:00"
+        autoBackupHour: 2
diff --git a/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties b/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/orgnummer-service/src/main/resources/application.yml b/apps/orgnummer-service/src/main/resources/application.yml
index 2112fa117a2..f46b42ceace 100644
--- 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/orgnummer-service/src/test/resources/application-test.properties b/apps/orgnummer-service/src/test/resources/application-test.properties
index 4e5df07aef2..e5e55886152 100644
--- a/apps/orgnummer-service/src/test/resources/application-test.properties
+++ b/apps/orgnummer-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.enabled=false
-spring.flyway.enabled=true
-azure.app.client.id=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/orgnummer-service/src/test/resources/bootstrap.yml b/apps/orgnummer-service/src/test/resources/bootstrap.yml
deleted file mode 100644
index 0451449ca23..00000000000
--- a/apps/orgnummer-service/src/test/resources/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
-  cloud:
-    vault:
-      enabled: false
\ No newline at end of file
diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle
index 56f05744c9a..78a1e547131 100644
--- a/apps/oversikt-frontend/build.gradle
+++ b/apps/oversikt-frontend/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
         mavenBom 'org.springframework.session:spring-session-bom:2021.2.0'
     }
 }
@@ -70,7 +70,7 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
diff --git a/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java
index a49293de860..b6101336dae 100644
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
@@ -21,12 +22,10 @@ public class SecurityConfig {
     @Bean
     public SecurityWebFilterChain configure(ServerHttpSecurity http) {
 
-        http.cors()
-                .and().csrf().disable()
-                .authorizeExchange()
-                .anyExchange()
-                .permitAll()
-                .and().oauth2ResourceServer().jwt(jwt -> jwtDecoder());
+        http.cors(Customizer.withDefaults())
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
+                .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.anyExchange().permitAll())
+                .oauth2ResourceServer(oAuth2ResourceServerSpec -> oAuth2ResourceServerSpec.jwt(jwtSpec -> jwtDecoder()));
         return http.build();
     }
 
diff --git a/apps/oversikt-frontend/src/main/js/package-lock.json b/apps/oversikt-frontend/src/main/js/package-lock.json
index 91ac933e96c..65c23a07960 100644
--- a/apps/oversikt-frontend/src/main/js/package-lock.json
+++ b/apps/oversikt-frontend/src/main/js/package-lock.json
@@ -35,7 +35,7 @@
         "path-browserify": "^1.0.1",
         "prettier": "^3.0.1",
         "typescript": "^5.0.2",
-        "vite": "^5.0.8",
+        "vite": "^5.0.12",
         "vite-plugin-svgr": "^4.0.0",
         "vite-tsconfig-paths": "^4.0.0",
         "webpack-bundle-analyzer": "^4.8.0"
@@ -3547,9 +3547,9 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/apps/oversikt-frontend/src/main/js/package.json b/apps/oversikt-frontend/src/main/js/package.json
index 8db39b1595a..e73fb19691a 100644
--- a/apps/oversikt-frontend/src/main/js/package.json
+++ b/apps/oversikt-frontend/src/main/js/package.json
@@ -30,7 +30,7 @@
     "path-browserify": "^1.0.1",
     "prettier": "^3.0.1",
     "typescript": "^5.0.2",
-    "vite": "^5.0.8",
+    "vite": "^5.0.12",
     "vite-plugin-svgr": "^4.0.0",
     "vite-tsconfig-paths": "^4.0.0",
     "webpack-bundle-analyzer": "^4.8.0"
diff --git a/apps/oversikt-frontend/src/main/resources/application.yml b/apps/oversikt-frontend/src/main/resources/application.yml
index 0c2c8d365ce..f65bec9fdf9 100644
--- 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/oversikt-frontend/src/test/resources/application-test.properties b/apps/oversikt-frontend/src/test/resources/application-test.properties
deleted file mode 100644
index f44e7773252..00000000000
--- a/apps/oversikt-frontend/src/test/resources/application-test.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle
index e65a5293da6..0d7415c8edc 100644
--- a/apps/pdl-forvalter/build.gradle
+++ b/apps/pdl-forvalter/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -84,8 +84,8 @@ dependencies {
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'org.postgresql:postgresql'
     implementation 'org.flywaydb:flyway-core'
diff --git a/apps/pdl-forvalter/config.test.yml b/apps/pdl-forvalter/config.test.yml
index b2ad098c034..e1f6c9d8949 100644
--- 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
index 0c2c84cabf1..a28f1a0bc6a 100644
--- 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/gradle/wrapper/gradle-wrapper.properties b/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java
index d4f60c563e8..45f34416ff3 100644
--- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java
+++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(PdlForvalterApplicationStarter.class, args);
     }
-}
\ No newline at end of file
+}
diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java
index 9f9066be3e2..eb23f852416 100644
--- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java
+++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java
@@ -111,7 +111,7 @@ private <T extends DbVersjonDTO> List<T> updateArtifact(List<T> artifacter, T ar
         artifact.setMaster(nonNull(artifact.getMaster()) ? artifact.getMaster() : DbVersjonDTO.Master.FREG);
 
         if (id.equals(0)) {
-            artifacter.add(0, initOpprett(artifacter, artifact));
+            artifacter.addFirst(initOpprett(artifacter, artifact));
             return artifacter;
 
         } else {
@@ -599,6 +599,7 @@ public void updateVergemaal(String ident, Integer id, VergemaalDTO oppdatertVerg
                 deletePerson(slettePerson, vergemaal.isEksisterendePerson());
 
                 oppdatertVergemaal.setId(id);
+                oppdatertVergemaal.setVergeIdent(null);
                 person.getPerson().getVergemaal().add(oppdatertVergemaal);
                 person.getPerson().getVergemaal().sort(Comparator.comparing(VergemaalDTO::getId).reversed());
             }
diff --git a/apps/pdl-forvalter/src/main/resources/application-dev.yaml b/apps/pdl-forvalter/src/main/resources/application-dev.yaml
index 23e6a6f3668..a3f1c096f27 100644
--- 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
diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yaml
index 9366e3d0546..76eb19897b0 100644
--- a/apps/pdl-forvalter/src/main/resources/application-local.yaml
+++ b/apps/pdl-forvalter/src/main/resources/application-local.yaml
@@ -1,3 +1,5 @@
+ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-pdl-forvalter-dev
+
 spring:
   application:
     name: testnav-pdl-forvalter
@@ -25,17 +27,6 @@ spring:
       hibernate:
         default-schema: public
         dialect: org.hibernate.dialect.PostgreSQLDialect
-  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
 
 consumers:
   adresse-service:
diff --git a/apps/pdl-forvalter/src/main/resources/application-prod.yaml b/apps/pdl-forvalter/src/main/resources/application-prod.yaml
index c442949585d..d4ae8ef89f2 100644
--- a/apps/pdl-forvalter/src/main/resources/application-prod.yaml
+++ b/apps/pdl-forvalter/src/main/resources/application-prod.yaml
@@ -18,14 +18,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
diff --git a/apps/pdl-forvalter/src/main/resources/application.yaml b/apps/pdl-forvalter/src/main/resources/application.yaml
index 552ef633914..af9ae59450b 100644
--- a/apps/pdl-forvalter/src/main/resources/application.yaml
+++ b/apps/pdl-forvalter/src/main/resources/application.yaml
@@ -1,6 +1,5 @@
 AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
 
-
 consumers:
   adresse-service:
     url: http://testnav-adresse-service.dolly.svc.cluster.local
@@ -37,6 +36,17 @@ spring:
   cloud:
     vault:
       enabled: false
+  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: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${ACCEPTED_AUDIENCE}
 
 springdoc:
   swagger-ui:
diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle
index 5973026c17e..ef925c5f87f 100644
--- a/apps/person-faste-data-service/build.gradle
+++ b/apps/person-faste-data-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -69,9 +69,9 @@ dependencies {
     implementation 'com.zaxxer:HikariCP'
     implementation 'org.postgresql:postgresql'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
 
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
diff --git a/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/person-faste-data-service/src/main/resources/application.yml b/apps/person-faste-data-service/src/main/resources/application.yml
index 9868e422af3..2515f413b99 100644
--- a/apps/person-faste-data-service/src/main/resources/application.yml
+++ b/apps/person-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-person-faste-data-service
 
 springdoc:
diff --git a/apps/person-faste-data-service/src/test/resources/application-test.properties b/apps/person-faste-data-service/src/test/resources/application-test.properties
index f44e7773252..e5e55886152 100644
--- a/apps/person-faste-data-service/src/test/resources/application-test.properties
+++ b/apps/person-faste-data-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle
index 9c53fedc230..19d0e6b8c9a 100644
--- a/apps/person-organisasjon-tilgang-service/build.gradle
+++ b/apps/person-organisasjon-tilgang-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -55,7 +55,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -76,7 +76,7 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2'
diff --git a/apps/person-organisasjon-tilgang-service/config.test.yml b/apps/person-organisasjon-tilgang-service/config.test.yml
index 335a4e36d27..54478aa5165 100644
--- a/apps/person-organisasjon-tilgang-service/config.test.yml
+++ b/apps/person-organisasjon-tilgang-service/config.test.yml
@@ -65,9 +65,5 @@ spec:
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: prod
-    - name: ACCEPTED_AUDIENCE
-      value: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service-dev
     - name: ALTINN_URL
       value: https://tt02.altinn.no
-    - name: TOKENDINGS_URL
-      value: https://tokenx.dev-gcp.nav.cloud.nais.io 
diff --git a/apps/person-organisasjon-tilgang-service/config.yml b/apps/person-organisasjon-tilgang-service/config.yml
index c05b383219b..9cf9e9e8286 100644
--- a/apps/person-organisasjon-tilgang-service/config.yml
+++ b/apps/person-organisasjon-tilgang-service/config.yml
@@ -60,9 +60,5 @@ spec:
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: prod
-    - name: ACCEPTED_AUDIENCE
-      value: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service
     - name: ALTINN_URL
-      value: https://altinn.no
-    - name: TOKENDINGS_URL
-      value: https://tokenx.dev-gcp.nav.cloud.nais.io 
\ No newline at end of file
+      value: https://altinn.no
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
index 619ed0070da..75b070dc5c2 100644
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
+++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
@@ -1,7 +1,8 @@
-ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-person-tilgang-service-dev
 ALTINN_URL: https://tt02.altinn.no
 
-TOKENDINGS_URL: dummy
+TOKEN_X_ISSUER: dummy
+OKEN_X_JWKS_URI: dummy
+TOKEN_X_CLIENT_ID: dummy
 ALTINN_API_KEY: dummy
 
 MASKINPORTEN_CLIENT_ID: dummy
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml
index 4ccf23a19b7..328010a8d87 100644
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml
+++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml
@@ -1,18 +1,12 @@
-spring:
-  security:
-    oauth2:
-      resourceserver:
-        tokenx:
-          issuer-uri: http://tokendings:8080
-          jwk-set-uri: http://tokendings:8080/jwks
-          accepted-audience: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service
+TOKEN_X_ISSUER: http://tokendings:8080
+OKEN_X_JWKS_URI: http://tokendings:8080/jwks
+TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service
+
 altinn:
   api:
     url: http://altinn:8080
     key: dummy-altinn-key
 
-
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service
 TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server
 
 MASKINPORTEN_CLIENT_ID: client-id
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
index eb37aab219f..749173ef3ec 100644
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
+++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
@@ -8,9 +8,9 @@ spring:
     oauth2:
       resourceserver:
         tokenx:
-          issuer-uri: ${TOKENDINGS_URL}
-          jwk-set-uri: ${TOKENDINGS_URL}/jwks
-          accepted-audience: ${ACCEPTED_AUDIENCE}
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   jackson:
     serialization:
       write_dates_as_timestamps: false
diff --git a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml b/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml
index 4498acd4c67..a52f05f20ca 100644
--- a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml
+++ b/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
-TOKENDINGS_URL: dummy
+TOKEN_X_ISSUER: dummy
 ALTINN_URL: dummy
 ALTINN_API_KEY: dummy
 MASKINPORTEN_CLIENT_ID: dummy
diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle
index d0d305b3ea6..7a8a1a3ab26 100644
--- a/apps/person-search-service/build.gradle
+++ b/apps/person-search-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -81,7 +81,7 @@ dependencies {
     implementation 'org.hibernate.validator:hibernate-validator'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
diff --git a/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/person-search-service/src/main/resources/application.yml b/apps/person-search-service/src/main/resources/application.yml
index 09d5349bba4..c98ec2ef19c 100644
--- a/apps/person-search-service/src/main/resources/application.yml
+++ b/apps/person-search-service/src/main/resources/application.yml
@@ -17,9 +17,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-person-search-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
diff --git a/apps/person-search-service/src/test/resources/application-test.yml b/apps/person-search-service/src/test/resources/application-test.yml
index 3a0f14cc6c1..6ddfd499610 100644
--- a/apps/person-search-service/src/test/resources/application-test.yml
+++ b/apps/person-search-service/src/test/resources/application-test.yml
@@ -1,13 +1,4 @@
-spring:
-  cloud:
-    vault:
-      token: dummy
-
-azure:
-  app:
-    client:
-      id: dummy
-      secret: dummy
+TOKEN_X_ISSUER: dummy
 
 elasticsearch:
   client:
diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle
index 44b1f6f19c8..a16642c3509 100644
--- a/apps/person-service/build.gradle
+++ b/apps/person-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -75,7 +75,7 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
 
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
diff --git a/apps/person-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/person-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/person-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/person-service/src/main/resources/application.yml b/apps/person-service/src/main/resources/application.yml
index 687c887834d..484075fff2e 100644
--- a/apps/person-service/src/main/resources/application.yml
+++ b/apps/person-service/src/main/resources/application.yml
@@ -19,9 +19,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-person-service
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   jackson:
     serialization:
       write_dates_as_timestamps: false
diff --git a/apps/person-service/src/test/resources/application-test.properties b/apps/person-service/src/test/resources/application-test.properties
index f44e7773252..e5e55886152 100644
--- a/apps/person-service/src/test/resources/application-test.properties
+++ b/apps/person-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/apps/person-service/src/test/resources/bootstrap-test.yml b/apps/person-service/src/test/resources/bootstrap-test.yml
deleted file mode 100644
index 0451449ca23..00000000000
--- a/apps/person-service/src/test/resources/bootstrap-test.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
-  cloud:
-    vault:
-      enabled: false
\ No newline at end of file
diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle
index 8dfa7e3a4b2..2f16346dc7a 100644
--- a/apps/profil-api/build.gradle
+++ b/apps/profil-api/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -68,7 +68,7 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
diff --git a/apps/profil-api/config.test.yml b/apps/profil-api/config.test.yml
index 677bc45707f..e686033e3fe 100644
--- a/apps/profil-api/config.test.yml
+++ b/apps/profil-api/config.test.yml
@@ -20,8 +20,6 @@ spec:
       enabled: true
       tenant: nav.no
   port: 8080
-  tracing:
-    enabled: true
   envFrom:
     - secret: user-encryption-dev
   accessPolicy:
diff --git a/apps/profil-api/config.yml b/apps/profil-api/config.yml
index 5621a7aefdb..f871865023d 100644
--- a/apps/profil-api/config.yml
+++ b/apps/profil-api/config.yml
@@ -20,8 +20,6 @@ spec:
       enabled: true
       tenant: nav.no
   port: 8080
-  tracing:
-    enabled: true
   envFrom:
     - secret: user-encryption-prod
   accessPolicy:
diff --git a/apps/profil-api/gradle/wrapper/gradle-wrapper.properties b/apps/profil-api/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/profil-api/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/profil-api/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/profil-api/src/main/resources/application-dev.yml b/apps/profil-api/src/main/resources/application-dev.yml
index b032d118d8e..67eeb473689 100644
--- a/apps/profil-api/src/main/resources/application-dev.yml
+++ b/apps/profil-api/src/main/resources/application-dev.yml
@@ -1,12 +1,3 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
-spring:
-  security:
-    oauth2:
-      resourceserver:
-        tokenx:
-          accepted-audience: dev-gcp:dolly:testnorge-profil-api-dev
-
 
 consumers:
   testnav-person-organisasjon-tilgang-service:
diff --git a/apps/profil-api/src/main/resources/application.yml b/apps/profil-api/src/main/resources/application.yml
index e5648b8b0f8..9290a3c1203 100644
--- a/apps/profil-api/src/main/resources/application.yml
+++ b/apps/profil-api/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: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
diff --git a/apps/profil-api/src/test/resources/application-test.yml b/apps/profil-api/src/test/resources/application-test.yml
index b77364d0b03..91377f25679 100644
--- a/apps/profil-api/src/test/resources/application-test.yml
+++ b/apps/profil-api/src/test/resources/application-test.yml
@@ -1,9 +1,4 @@
-spring.cloud.vault.token: dummy
-
-CLIENT_SECRET: dummy
-CLIENT_ID: dummy
-
-azure.app.client.id: dummy
+TOKEN_X_ISSUER: dummy
 
 consumers:
   testnav-person-organisasjon-tilgang-service:
diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle
index 375526e10a6..b01558ada5a 100644
--- a/apps/sykemelding-api/build.gradle
+++ b/apps/sykemelding-api/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -75,8 +75,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.3'
diff --git a/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/sykemelding-api/src/main/resources/application.yml b/apps/sykemelding-api/src/main/resources/application.yml
index 0349eb801bd..d6dfd75a4f4 100644
--- a/apps/sykemelding-api/src/main/resources/application.yml
+++ b/apps/sykemelding-api/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle
index d815abbe06f..3cf1ca8c9e5 100644
--- a/apps/synt-sykemelding-api/build.gradle
+++ b/apps/synt-sykemelding-api/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -68,7 +68,7 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
     implementation 'org.hibernate.validator:hibernate-validator'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'no.nav.testnav.libs:testing'
diff --git a/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/synt-sykemelding-api/src/main/resources/application.yml b/apps/synt-sykemelding-api/src/main/resources/application.yml
index b803e88ed52..f080bf7ac5f 100644
--- a/apps/synt-sykemelding-api/src/main/resources/application.yml
+++ b/apps/synt-sykemelding-api/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
diff --git a/apps/synt-sykemelding-api/src/test/resources/application-test.yml b/apps/synt-sykemelding-api/src/test/resources/application-test.yml
index 36f73fafe86..1f8e50d2449 100644
--- a/apps/synt-sykemelding-api/src/test/resources/application-test.yml
+++ b/apps/synt-sykemelding-api/src/test/resources/application-test.yml
@@ -2,19 +2,7 @@ wiremock:
   server:
     port: 0
 
-spring:
-  cloud:
-    vault:
-      enabled: false
-      token: dummy
-
-azure:
-  app:
-    client:
-      id: dummy
-      secret: dummy
-
-TOKEN_X_CLIENT_ID: test
+TOKEN_X_ISSUER: dummy
 
 consumers:
   synt-sykemelding:
diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle
index 743cdcb7409..8992d2aac37 100644
--- a/apps/synt-vedtakshistorikk-service/build.gradle
+++ b/apps/synt-vedtakshistorikk-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -71,7 +71,7 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
diff --git a/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties b/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml b/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml
index aae5c789dd2..c3803f91db5 100644
--- a/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml
+++ b/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml
@@ -1,13 +1,4 @@
-spring:
-  cloud:
-    vault:
-      token: dummy
-
-azure:
-  app:
-    client:
-      id: dummy
-      secret: dummy
+TOKEN_X_ISSUER: dummy
 
 consumers:
   synt-vedtakshistorikk:
diff --git a/apps/tenor-search-service/Dockerfile b/apps/tenor-search-service/Dockerfile
new file mode 100644
index 00000000000..11043b561a5
--- /dev/null
+++ b/apps/tenor-search-service/Dockerfile
@@ -0,0 +1,6 @@
+FROM ghcr.io/navikt/baseimages/temurin:21
+LABEL maintainer="Team Dolly"
+
+ADD build/libs/app.jar /app/app.jar
+
+EXPOSE 8080
\ No newline at end of file
diff --git a/apps/tenor-search-service/README.md b/apps/tenor-search-service/README.md
new file mode 100644
index 00000000000..db28fe607b5
--- /dev/null
+++ b/apps/tenor-search-service/README.md
@@ -0,0 +1,9 @@
+# Tenor Search Service
+
+Service som formidler søk til Tenor testdata hos Skatteetaten.
+
+## Swagger
+
+Swagger finnes
+under [/swagger-ui.html](https://testnav-tenor-search-service.intern.dev.nav.no/swagger-ui.html)
+-endepunktet til applikasjonen.
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/build.gradle b/apps/tenor-search-service/build.gradle
similarity index 73%
rename from proxies/kodeverk-proxy/build.gradle
rename to apps/tenor-search-service/build.gradle
index a4a936e3fb4..1e768192ae4 100644
--- a/proxies/kodeverk-proxy/build.gradle
+++ b/apps/tenor-search-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -23,23 +23,28 @@ sonarqube {
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.token", System.getenv("SONAR_TOKEN")
+        property "sonar.login", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
-        property "sonar.projectKey", "testnav-kodeverk-proxy"
-        property "sonar.projectName", "testnav-kodeverk-proxy"
+        property "sonar.projectKey", "testnav-tenor-search-service"
+        property "sonar.projectName", "testnav-tenor-search-service"
         property "sonar.sourceEncoding", "UTF-8"
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 bootJar {
     archiveFileName = "app.jar"
 }
-
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -49,29 +54,25 @@ repositories {
 }
 
 dependencies {
-
     implementation 'no.nav.testnav.libs:reactive-core'
-    implementation 'no.nav.testnav.libs:reactive-proxy'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
-    implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:reactive-security'
+    implementation 'no.nav.testnav.libs:security-core'
 
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
-    implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
-    
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.hibernate.validator:hibernate-validator'
 
-    annotationProcessor 'org.projectlombok:lombok'
-    implementation 'org.projectlombok:lombok'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-}
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
+    testImplementation 'no.nav.testnav.libs:integration-test'
+
+    implementation 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 }
diff --git a/proxies/kodeverk-proxy/config.yml b/apps/tenor-search-service/config.yml
similarity index 65%
rename from proxies/kodeverk-proxy/config.yml
rename to apps/tenor-search-service/config.yml
index 5e97803ef68..3243a5c47b5 100644
--- a/proxies/kodeverk-proxy/config.yml
+++ b/apps/tenor-search-service/config.yml
@@ -1,46 +1,38 @@
 apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
-  name: testnav-kodeverk-proxy
+  name: testnav-tenor-search-service
   namespace: dolly
   labels:
     team: dolly
 spec:
   image: "{{image}}"
   port: 8080
-  webproxy: true
-  tokenx:
-    enabled: true
   azure:
     application:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
+  tokenx:
+    enabled: true
+  maskinporten:
+    enabled: true
+    scopes:
+      consumes:
+        - name: "skatteetaten:testnorge/testdata.read"
   accessPolicy:
     inbound:
       rules:
-        - application: team-dolly-lokal-app
-          cluster: dev-gcp
+        - application: testnav-oversikt-frontend
         - application: dolly-frontend
-          cluster: dev-gcp
-        - application: dolly-idporten
-          cluster: dev-gcp
         - application: dolly-frontend-dev
-          cluster: dev-gcp
-        - application: dolly-backend
-          cluster: dev-gcp
-        - application: dolly-backend-dev
-          cluster: dev-gcp
-        - application: testnav-oversikt-frontend
-          cluster: dev-gcp
+        - application: dolly-idporten
+        - application: team-dolly-lokal-app
         - application: app-1
           namespace: plattformsikkerhet
-          cluster: dev-gcp
     outbound:
-      rules:
-        - application: kodeverk-dev
-          cluster: dev-fss
-          namespace: team-rocket
+      external:
+        - host: testdata.api.skatteetaten.no
   liveness:
     path: /internal/isAlive
     initialDelay: 4
@@ -51,6 +43,9 @@ spec:
     initialDelay: 4
     periodSeconds: 5
     failureThreshold: 500
+  prometheus:
+    enabled: true
+    path: /internal/metrics
   replicas:
     min: 1
     max: 1
@@ -61,4 +56,7 @@ spec:
     limits:
       memory: 2048Mi
   ingresses:
-    - "https://testnav-kodeverk-proxy.dev-fss-pub.nais.io"
\ No newline at end of file
+    - "https://testnav-tenor-search-service.intern.dev.nav.no"
+  env:
+    - name: SPRING_PROFILES_ACTIVE
+      value: prod
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.jar
similarity index 65%
rename from proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar
rename to apps/tenor-search-service/gradle/wrapper/gradle-wrapper.jar
index e708b1c023e..7454180f2ae 100644
Binary files a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar and b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties
rename to apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties
diff --git a/apps/tenor-search-service/gradlew b/apps/tenor-search-service/gradlew
new file mode 100755
index 00000000000..3da45c161b0
--- /dev/null
+++ b/apps/tenor-search-service/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright ? 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
+#           ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
+#         * compound commands having a testable exit status, especially ?case?;
+#         * various built-in commands including ?command?, ?set?, and ?ulimit?.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/proxies/kodeverk-proxy/gradlew.bat b/apps/tenor-search-service/gradlew.bat
similarity index 100%
rename from proxies/kodeverk-proxy/gradlew.bat
rename to apps/tenor-search-service/gradlew.bat
diff --git a/apps/tenor-search-service/gradlewUpdate.sh b/apps/tenor-search-service/gradlewUpdate.sh
new file mode 100755
index 00000000000..e5ee6361152
--- /dev/null
+++ b/apps/tenor-search-service/gradlewUpdate.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gradle wrapper
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/settings.gradle b/apps/tenor-search-service/settings.gradle
similarity index 72%
rename from proxies/kodeverk-proxy/settings.gradle
rename to apps/tenor-search-service/settings.gradle
index 293dee6938f..ba2ffdb377c 100644
--- a/proxies/kodeverk-proxy/settings.gradle
+++ b/apps/tenor-search-service/settings.gradle
@@ -2,18 +2,17 @@ plugins {
     id "com.gradle.enterprise" version "3.12.3"
 }
 
-rootProject.name = 'kodeverk-proxy'
+rootProject.name = 'tenor-search-service'
 
 
 includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-proxy'
-includeBuild '../../libs/data-transfer-objects'
-includeBuild '../../libs/security-core'
 includeBuild '../../libs/reactive-security'
+includeBuild '../../libs/security-core'
+includeBuild '../../libs/integration-test'
 
 gradleEnterprise {
     buildScan {
         termsOfServiceUrl = "https://gradle.com/terms-of-service"
         termsOfServiceAgree = "yes"
     }
-}
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java
new file mode 100644
index 00000000000..71bad56f418
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java
@@ -0,0 +1,21 @@
+package no.nav.testnav.apps.tenorsearchservice;
+
+import no.nav.testnav.libs.reactivecore.config.CoreConfig;
+import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
+import org.springframework.web.reactive.config.EnableWebFlux;
+
+@Import({
+        CoreConfig.class,
+        SecureOAuth2ServerToServerConfiguration.class
+})
+@EnableWebFlux
+@SpringBootApplication
+public class TenorSearchServiceApplicationStarter {
+
+    public static void main(String[] args) {
+        SpringApplication.run(TenorSearchServiceApplicationStarter.class, args);
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/Consumers.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/Consumers.java
new file mode 100644
index 00000000000..362117f9a83
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/Consumers.java
@@ -0,0 +1,20 @@
+package no.nav.testnav.apps.tenorsearchservice.config;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import static lombok.AccessLevel.PACKAGE;
+
+@Configuration
+@ConfigurationProperties(prefix = "consumers")
+@NoArgsConstructor(access = PACKAGE)
+@Getter
+@Setter(PACKAGE)
+public class Consumers {
+
+    private ServerProperties tenorSearchService;
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/LocalVaultConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/LocalVaultConfig.java
new file mode 100644
index 00000000000..4beafe1501b
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/LocalVaultConfig.java
@@ -0,0 +1,36 @@
+package no.nav.testnav.apps.tenorsearchservice.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.vault.annotation.VaultPropertySource;
+import org.springframework.vault.authentication.ClientAuthentication;
+import org.springframework.vault.authentication.TokenAuthentication;
+import org.springframework.vault.client.VaultEndpoint;
+import org.springframework.vault.config.AbstractVaultConfiguration;
+
+import static io.micrometer.common.util.StringUtils.isBlank;
+
+@Configuration
+@Profile("local")
+@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false)
+public class LocalVaultConfig extends AbstractVaultConfiguration {
+
+    private static final String VAULT_TOKEN = "spring.cloud.vault.token";
+
+    @Override
+    public VaultEndpoint vaultEndpoint() {
+        return VaultEndpoint.create("vault.adeo.no", 443);
+    }
+
+    @Override
+    public ClientAuthentication clientAuthentication() {
+        if (System.getenv().containsKey("VAULT_TOKEN")) {
+            System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));
+        }
+        var token = System.getProperty(VAULT_TOKEN);
+        if (isBlank(token)) {
+            throw new IllegalArgumentException("Påkrevet property '" + VAULT_TOKEN + "' er ikke satt.");
+        }
+        return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
+    }
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java
new file mode 100644
index 00000000000..bb3cbf35099
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java
@@ -0,0 +1,22 @@
+package no.nav.testnav.apps.tenorsearchservice.config;
+
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Getter
+@Configuration
+public class MaskinportenConfig {
+
+    @Value("${MASKINPORTEN_CLIENT_ID}")
+    private String clientId;
+
+    @Value("${MASKINPORTEN_CLIENT_JWK}")
+    private String jwkPrivate;
+
+    @Value("${MASKINPORTEN_SCOPES}")
+    private String scope;
+
+    @Value("${MASKINPORTEN_WELL_KNOWN_URL}")
+    private String wellKnownUrl;
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/OpenApiConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/OpenApiConfig.java
new file mode 100644
index 00000000000..5311ea12830
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/OpenApiConfig.java
@@ -0,0 +1,49 @@
+package no.nav.testnav.apps.tenorsearchservice.config;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Arrays;
+
+import no.nav.testnav.libs.reactivecore.config.ApplicationProperties;
+
+
+@Configuration
+public class OpenApiConfig {
+
+    @Bean
+    public OpenAPI openApi(ApplicationProperties applicationProperties) {
+        return new OpenAPI()
+                .components(new Components().addSecuritySchemes("bearer-jwt", new SecurityScheme()
+                        .type(SecurityScheme.Type.HTTP)
+                        .scheme("bearer")
+                        .bearerFormat("JWT")
+                        .in(SecurityScheme.In.HEADER)
+                        .name("Authorization")
+                ))
+                .addSecurityItem(
+                        new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write")))
+                .info(new Info()
+                        .title(applicationProperties.getName())
+                        .version(applicationProperties.getVersion())
+                        .description(applicationProperties.getDescription())
+                        .termsOfService("https://nav.no")
+                        .contact(new Contact()
+                                .url("https://nav-it.slack.com/archives/CA3P9NGA2")
+                                .email("dolly@nav.no")
+                                .name("Team Dolly")
+                        )
+                        .license(new License()
+                                .name("MIT License")
+                                .url("https://opensource.org/licenses/MIT")
+                        )
+                );
+    }
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/SecurityConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/SecurityConfig.java
new file mode 100644
index 00000000000..987897ac933
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/SecurityConfig.java
@@ -0,0 +1,40 @@
+package no.nav.testnav.apps.tenorsearchservice.config;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+
+
+@Slf4j
+@Configuration
+@EnableWebFluxSecurity
+@EnableReactiveMethodSecurity
+@RequiredArgsConstructor
+public class SecurityConfig {
+
+    private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager;
+
+    @Bean
+    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
+        return httpSecurity
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
+                .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
+                        "/internal/**",
+                        "/webjars/**",
+                        "/swagger-resources/**",
+                        "/v3/api-docs/**",
+                        "/swagger-ui/**",
+                        "/swagger",
+                        "/error",
+                        "/swagger-ui.html"
+                ).permitAll().anyExchange().authenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager)))
+                .build();
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java
new file mode 100644
index 00000000000..61bc44f20f1
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java
@@ -0,0 +1,92 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers;
+
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JOSEObjectType;
+import com.nimbusds.jose.JWSAlgorithm;
+import com.nimbusds.jose.JWSHeader;
+import com.nimbusds.jose.JWSSigner;
+import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.apps.tenorsearchservice.config.MaskinportenConfig;
+import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetAccessTokenCommand;
+import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetWellKnownCommand;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.AccessToken;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.server.ResponseStatusException;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
+import java.util.UUID;
+import java.util.function.Function;
+
+@Slf4j
+@Component
+public class MaskinportenClient {
+
+    private final WebClient webClient;
+    private final MaskinportenConfig maskinportenConfig;
+    private final Mono<AccessToken> accessToken;
+
+    public MaskinportenClient(MaskinportenConfig maskinportenConfig) {
+        this.webClient = WebClient.builder().build();
+        this.maskinportenConfig = maskinportenConfig;
+        var wellKnownMono = cache(
+                new GetWellKnownCommand(webClient, maskinportenConfig).call(),
+                value -> Duration.ofDays(7)
+        );
+        this.accessToken = cache(
+                wellKnownMono.flatMap(wellKnown -> new GetAccessTokenCommand(webClient, wellKnown, createJwtClaims(wellKnown.issuer())).call()),
+                value -> Duration.ofSeconds(value.expiresIn() - 10L)
+        );
+    }
+
+    private static <T> Mono<T> cache(Mono<T> value, Function<? super T, Duration> ttlForValue) {
+        return value.cache(
+                ttlForValue,
+                throwable -> Duration.ZERO,
+                () -> Duration.ZERO
+        );
+    }
+
+    public Mono<no.nav.testnav.apps.tenorsearchservice.domain.AccessToken> getAccessToken() {
+        return accessToken.map(no.nav.testnav.apps.tenorsearchservice.domain.AccessToken::new);
+    }
+
+    @SneakyThrows
+    private String createJwtClaims(String audience) {
+        Instant now = Instant.now();
+        var rsaKey = RSAKey.parse(maskinportenConfig.getJwkPrivate());
+        return createSignedJWT(rsaKey,
+                new JWTClaimsSet.Builder()
+                        .audience(audience)
+                        .claim("scope", maskinportenConfig.getScope())
+                        .issuer(maskinportenConfig.getClientId())
+                        .issueTime(Date.from(now))
+                        .expirationTime(Date.from(now.plusSeconds(119)))
+                        .jwtID(UUID.randomUUID().toString())
+                        .build())
+                .serialize();
+    }
+
+    private SignedJWT createSignedJWT(RSAKey rsaJwk, JWTClaimsSet claimsSet) {
+        try {
+            JWSHeader.Builder header = new JWSHeader.Builder(JWSAlgorithm.RS256)
+                    .keyID(rsaJwk.getKeyID())
+                    .type(JOSEObjectType.JWT);
+            SignedJWT signedJWT = new SignedJWT(header.build(), claimsSet);
+            JWSSigner signer = new RSASSASigner(rsaJwk.toPrivateKey());
+            signedJWT.sign(signer);
+            return signedJWT;
+        } catch (JOSEException e) {
+            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Failed to sign JWT", e);
+        }
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java
new file mode 100644
index 00000000000..80083b0abef
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java
@@ -0,0 +1,34 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers;
+
+import no.nav.testnav.apps.tenorsearchservice.config.Consumers;
+import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+@Service
+public class TenorClient {
+
+    private final WebClient webClient;
+    private final MaskinportenClient maskinportenClient;
+
+    public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) {
+
+        this.webClient = WebClient
+                .builder()
+                .baseUrl(consumers.getTenorSearchService().getUrl())
+                .codecs(configurer -> configurer.defaultCodecs()
+                        .maxInMemorySize(32 * 1024 * 1024))
+                .build();
+        this.maskinportenClient = maskinportenClient;
+    }
+
+    public Mono<TenorResponse> getTestdata(String query, Kilde kilde, InfoType type, String fields, Integer seed) {
+
+        return maskinportenClient.getAccessToken()
+                .flatMap(token -> new GetTenorTestdata(webClient, query, kilde, type, fields, seed, token.value()).call());
+    }
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetAccessTokenCommand.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetAccessTokenCommand.java
new file mode 100644
index 00000000000..b1a87765e13
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetAccessTokenCommand.java
@@ -0,0 +1,41 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.AccessToken;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.WellKnown;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetAccessTokenCommand implements Callable<Mono<AccessToken>> {
+
+    private final WebClient webClient;
+    private final WellKnown wellKnown;
+    private final String assertion;
+
+    @Override
+    public Mono<AccessToken> call() {
+        return webClient.post()
+                .uri(wellKnown.tokenEndpoint())
+                .body(BodyInserters
+                        .fromFormData("grant_type", wellKnown.grantTypesSupported().get(0))
+                        .with("assertion", assertion)
+                )
+                .retrieve()
+                .bodyToMono(AccessToken.class)
+                .doOnSuccess(value -> log.info("AccessToken hentet fra maskinporten."))
+                .doOnError(
+                        WebClientResponseException.class::isInstance,
+                        throwable -> log.error(
+                                "Feil ved  henting av AccessToken for maskinporten. \n{}",
+                                ((WebClientResponseException) throwable).getResponseBodyAsString()
+                        )
+                );
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java
new file mode 100644
index 00000000000..f2781a8ac9b
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java
@@ -0,0 +1,104 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers.command;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+import reactor.util.retry.Retry;
+
+import java.time.Duration;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+import static org.apache.logging.log4j.util.Strings.isNotBlank;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetTenorTestdata implements Callable<Mono<TenorResponse>> {
+
+    private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/{kilde}";
+
+    private final WebClient webClient;
+    private final String query;
+    private final Kilde kilde;
+    private final InfoType type;
+    private final String fields;
+    private final Integer seed;
+    private final String token;
+
+    @Override
+    public Mono<TenorResponse> call() {
+
+        log.info("Query-parameter: {}", query);
+        var requestParams = Map.of(
+                "kilde", getKilde(kilde).getTenorKilde(),
+                "query", query,
+                "alle", "*");
+
+        return webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path(TENOR_QUERY_URL)
+                        .queryParam("kql", "{query}")
+                        .queryParam("nokkelinformasjon", isNoekkelinfo(type))
+                        .queryParamIfPresent("seed", Optional.ofNullable(seed))
+                        .queryParamIfPresent("vis", Optional.ofNullable(getVisning(type)))
+                        .queryParamIfPresent("skjul", Optional.ofNullable(getSkjul(type)))
+                        .build(requestParams))
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .retrieve()
+                .bodyToMono(JsonNode.class)
+                .map(response -> TenorResponse.builder()
+                        .status(HttpStatus.OK)
+                        .data(response)
+                        .query(query)
+                        .build())
+                .doOnError(WebClientFilter::logErrorMessage)
+                .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
+                        .filter(WebClientFilter::is5xxException))
+                .onErrorResume(error -> Mono.just(TenorResponse.builder()
+                        .status(WebClientFilter.getStatus(error))
+                        .error(WebClientFilter.getMessage(error))
+                        .query(query)
+                        .build()));
+    }
+
+    private String getSkjul(InfoType type) {
+
+        return isNull(type) || type != InfoType.Kildedata ?
+                "*.kildedata" : null;
+    }
+
+    private String getVisning(InfoType type) {
+
+        if (nonNull(type)) {
+            return switch (type) {
+                case Kildedata -> "*.kildedata";
+                case AlleFelter -> "{alle}";
+                case Spesifikt -> isNotBlank(fields) ? fields : "id";
+                default -> null;
+            };
+        } else {
+            return null;
+        }
+    }
+
+    private Kilde getKilde(Kilde kilde) {
+
+        return isNull(kilde) ? Kilde.FREG : kilde;
+    }
+
+    private boolean isNoekkelinfo(InfoType type) {
+
+        return nonNull(type) && type == InfoType.Noekkelinfo;
+    }
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetWellKnownCommand.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetWellKnownCommand.java
new file mode 100644
index 00000000000..17bb387ff68
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetWellKnownCommand.java
@@ -0,0 +1,35 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.apps.tenorsearchservice.config.MaskinportenConfig;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.WellKnown;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetWellKnownCommand implements Callable<Mono<WellKnown>> {
+
+    private final WebClient webClient;
+    private final MaskinportenConfig maskinportenConfig;
+
+    @Override
+    public Mono<WellKnown> call() {
+        return webClient.get()
+                .uri(maskinportenConfig.getWellKnownUrl())
+                .retrieve()
+                .bodyToMono(WellKnown.class)
+                .doOnSuccess(value -> log.info("WellKnown hentet for maskinporten."))
+                .doOnError(
+                        WebClientResponseException.class::isInstance,
+                        throwable -> log.error(
+                                "Feil ved  henting av well known for maskinporten. \n{}",
+                                ((WebClientResponseException) throwable).getResponseBodyAsString()
+                        )
+                );
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/AccessToken.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/AccessToken.java
new file mode 100644
index 00000000000..4081addc17e
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/AccessToken.java
@@ -0,0 +1,16 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record AccessToken(
+        @JsonProperty("access_token")
+        String accessToken,
+        @JsonProperty("token_type")
+        String tokenType,
+        @JsonProperty("expires_in")
+        Integer expiresIn,
+        @JsonProperty("scope")
+        String scope
+) {
+
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java
new file mode 100644
index 00000000000..1c38ab34e20
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java
@@ -0,0 +1,10 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers.dto;
+
+@SuppressWarnings("java:S115")
+public enum InfoType {
+    IdenterKun,
+    Noekkelinfo,
+    Kildedata,
+    AlleFelter,
+    Spesifikt
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java
new file mode 100644
index 00000000000..2dd7f055213
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java
@@ -0,0 +1,16 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers.dto;
+
+import lombok.Getter;
+
+@Getter
+public enum Kilde {
+
+    FREG("freg"),
+    FORETAKSREGISTRET("brreg-er-fr");
+
+    private final String tenorKilde;
+
+    Kilde(String tenorKilde) {
+        this.tenorKilde = tenorKilde;
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/WellKnown.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/WellKnown.java
new file mode 100644
index 00000000000..eb091c0745a
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/WellKnown.java
@@ -0,0 +1,18 @@
+package no.nav.testnav.apps.tenorsearchservice.consumers.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public record WellKnown(
+        String issuer,
+        @JsonProperty("token_endpoint")
+        String tokenEndpoint,
+        @JsonProperty("jwks_uri")
+        String jwksUri,
+        @JsonProperty("token_endpoint_auth_methods_supported")
+        List<String> tokenEndpointAuthMethodsSupported,
+        @JsonProperty("grant_types_supported")
+        List<String> grantTypesSupported
+) {
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/AccessToken.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/AccessToken.java
new file mode 100644
index 00000000000..c933e7c4f56
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/AccessToken.java
@@ -0,0 +1,7 @@
+package no.nav.testnav.apps.tenorsearchservice.domain;
+
+public record AccessToken(String value) {
+    public AccessToken(no.nav.testnav.apps.tenorsearchservice.consumers.dto.AccessToken accessToken) {
+        this(accessToken.accessToken());
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java
new file mode 100644
index 00000000000..35e200d7c54
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java
@@ -0,0 +1,50 @@
+package no.nav.testnav.apps.tenorsearchservice.domain;
+
+@SuppressWarnings("java:S115")
+public enum Hendelse {
+
+    EndringIAdressebeskyttelse,
+    EndringIBostedsadresse,
+    EndringIBostedsadresseUtenFlytting,
+    EndringIBrukAvSamiskSpraak,
+    EndringIDeltBosted,
+    EndringIDoedsfall,
+    EndringIFalskIdentitet,
+    EndringIFamilierelasjon,
+    EndringIFoedsel,
+    EndringIFoedselINorge,
+    EndringIForeldreansvar,
+    EndringIFratattRettsligHandleevne,
+    EndringIIdentifikasjonsnummer,
+    EndringIIdentitetsgrunnlag,
+    EndringIInnflytting,
+    EndringIKjoenn,
+    EndringIKontaktinformasjon,
+    EndringIKontaktopplysningerForDoedsbo,
+    EndringILegitimasjonsdokument,
+    EndringINavn,
+    EndringIOpphold,
+    EndringIOppholdPaaSvalbard,
+    EndringIOppholdsadresse,
+    EndringIPerson,
+    EndringIRettsligHandleevne,
+    EndringISametingetsValgmanntall,
+    EndringISivilstand,
+    EndringIStatsborgerskap,
+    EndringIStatus,
+    EndringIUtenlandskPersonidentifikasjon,
+    EndringIUtflytting,
+    EndringIUtlendingsmyndighetenesIdentifikasjonsnummer,
+    EndringIVergemaal,
+    PersonErBosatt,
+    PersonErDoed,
+    PersonErEndretVedSplitting,
+    PersonErGjenopprettetVedSplitting,
+    PersonErOppdatert,
+    PersonErOpphoert,
+    PersonErOpphoertSomDublett,
+    PersonErOpprettet,
+    PersonErReaktivert,
+    PersonErUtflyttet,
+    PersonErViderefoertSomGjeldendeVedSammenslaaing
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java
new file mode 100644
index 00000000000..a06f4026e49
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java
@@ -0,0 +1,37 @@
+package no.nav.testnav.apps.tenorsearchservice.domain;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@SuppressWarnings("java:S115")
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum Lookups {
+
+    AOrdningBeskrivelse(TenorRequest.AOrdningBeskrivelse.class),
+    AdresseGradering(TenorRequest.AdresseGradering.class),
+    Adressebeskyttelse(TenorRequest.Adressebeskyttelse.class),
+    Arbeidsforholdstype(TenorRequest.Arbeidsforholdstype.class),
+    Forskuddstrekk(TenorRequest.Forskuddstrekk.class),
+    Hendelse(no.nav.testnav.apps.tenorsearchservice.domain.Hendelse.class),
+    IdentifikatorType(TenorRequest.IdentifikatorType.class),
+    IdentitetsgrunnlagStatus(TenorRequest.IdentitetsgrunnlagStatus.class),
+    Inntektstype(TenorRequest.Inntektstype.class),
+    Kjoenn(TenorRequest.Kjoenn.class),
+    Oppgjoerstype(TenorRequest.Oppgjoerstype.class),
+    Personstatus(TenorRequest.Personstatus.class),
+    Relasjon(TenorRequest.Relasjon.class),
+    Roller(TenorRequest.Roller.class),
+    SaerskiltSkatteplikt(TenorRequest.SaerskiltSkatteplikt.class),
+    Sivilstatus(TenorRequest.Sivilstatus.class),
+    Skattemeldingstype(TenorRequest.Skattemeldingstype.class),
+    Skattepliktstype(TenorRequest.Skattepliktstype.class),
+    Spesifiseringstype(no.nav.testnav.apps.tenorsearchservice.domain.Spesifiseringstype.class),
+    Stadietype(TenorRequest.Stadietype.class),
+    TekniskNavn(no.nav.testnav.apps.tenorsearchservice.domain.TekniskNavn.class),
+    TilleggsskattType(TenorRequest.TilleggsskattType.class),
+    UtenlandskPersonIdentifikasjon(TenorRequest.UtenlandskPersonIdentifikasjon.class);
+
+    private final Class<?> value;
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java
new file mode 100644
index 00000000000..d8ea58a86bc
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java
@@ -0,0 +1,35 @@
+package no.nav.testnav.apps.tenorsearchservice.domain;
+
+@SuppressWarnings("java:S115")
+public enum Spesifiseringstype {
+
+    AksjeIkkeIAksjonaerregisteret,
+    Aksjesparekonto,
+    AndreBeloepKnyttetTilBoligOgEiendeler,
+    AnnenKapitalkostnad,
+    AnnetFinansprodukt,
+    DeltakersAndelAvFormueOgInntekt,
+    Eiendom,
+    Fondskonto,
+    Fordring,
+    FritidsbaatMedSalgsverdiOverSalgsverdigrense,
+    Generisk,
+    GrunnlagKnyttetTilLottaker,
+    KapitalisertFesteavgift,
+    Kjoeretoey,
+    KollektivPensjonsordning,
+    Konto,
+    Livsforsikring,
+    LoennOgTilsvarendeYtelser,
+    Naeringsopplysninger,
+    ObligasjonOgSertifikat,
+    OekonomiskeForholdKnyttetTilBoligsameieEllerBoligselskap,
+    PrivatGjeldsforholdUtenforVirksomhet,
+    SamletGjeldOgFormuesobjekterINaering,
+    Skadeforsikring,
+    SkyldigRestskatt,
+    SykepengerOgAnnenInntektMvFraOppgavegiver,
+    Verdipapirfond,
+    VirtuellEiendel,
+    VirtuellValuta
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java
new file mode 100644
index 00000000000..1295be4f517
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java
@@ -0,0 +1,430 @@
+package no.nav.testnav.apps.tenorsearchservice.domain;
+
+@SuppressWarnings("java:S115")
+public enum TekniskNavn {
+    AaretsFremfoerbareNegativPersoninntekt,
+    AarsavgiftForKontoIVerdipapirregister,
+    AlderspensjonFraFolketrygden,
+    AlderspensjonFraIPAOgIPS,
+    AlminneligInntektFoerSaerfradrag,
+    AndelAvFellesgjeldISDF,
+    AndelAvUnderskuddFraTidligereAarVedDriftAvVaaningshusSomAnvendesIAaret,
+    AndelIFellesTapVedSalgAvAndelISDF,
+    AndelIFellesTilleggIAlminneligInntektFraSDF,
+    AndelIFellesTilleggIAlminneligInntektFraSDFInnenAnnenNaering,
+    AndelIFellesTilleggIAlminneligInntektFraSDFInnenBarnepassIBarnepasserensHjem,
+    AndreFradragsberettigedeKostnader,
+    AnnenArbeidsinntekt,
+    AnnenGjeld,
+    AnnenPensjonFoerAlderspensjon,
+    AnnenSkattepliktigKapitalinntektFraAnnetFinansprodukt,
+    AnnenSkattepliktigKapitalinntektFraVirtuellValuta,
+    AnnetInntektsfradrag,
+    Arbeidsavklaringspenger,
+    ArbeidsinntektFraKompensasjonsytelseUtbetaltAvNav,
+    AvkortetFordelVedElektroniskKommunikasjon,
+    BarnepensjonFraAndreEnnFolketrygden,
+    BarnepensjonFraFolketrygden,
+    BarnepensjonFraIPAOgIPS,
+    BetaltPremieTilSykeOgUlykkesforsikringForNaeringsdrivende,
+    BetaltUnderholdsbidrag,
+    BetalteForsinkelsesrenter,
+    Bruttoformue,
+    DagpengerForFisker,
+    DagpengerForNaeringsdrivende,
+    DagpengerForNaeringsdrivendeOgFisker,
+    DagpengerVedSykehusoppholdMvFraBarneforsikring,
+    EktefelletilleggTilPensjon,
+    EktefelletilleggTilUfoeretrygd,
+    EngangsutbetalingFraIPSIPA,
+    EtterlattepensjonFraFolketrygden,
+    Foederaad,
+    FormuesverdiAvPrivatUtestaaendeFordring,
+    FormuesverdiAvUtestaaendeFordring,
+    FormuesverdiForAndelIRentedelIVerdipapirfond,
+    FormuesverdiForAnnenFastEiendom,
+    FormuesverdiForAnnenFastEiendomInnenforInntektsgivendeAktivitet,
+    FormuesverdiForAnnenFastEiendomUtenforInntektsgivendeAktivitet,
+    FormuesverdiForAnnetFinansprodukt,
+    FormuesverdiForBorett,
+    FormuesverdiForBuskap,
+    FormuesverdiForEgenFritaksbehandletBolig,
+    FormuesverdiForFormuesobjekterINaeringIkkeOmfattetAvVerdsettingsrabatt,
+    FormuesverdiForFritidsbaatMedSalgsverdiOverSalgsverdigrense,
+    FormuesverdiForGaardsbruk,
+    FormuesverdiForInnboLoesoereOgFritidsbaatUnderSalgsverdigrense,
+    FormuesverdiForKjoeretoey,
+    FormuesverdiForKontanterIAksjesparekonto,
+    FormuesverdiForKontanterMvIFondskonto,
+    FormuesverdiForNaeringseiendom,
+    FormuesverdiForObligasjon,
+    FormuesverdiForObligasjonerOpsjonerMvIkkeRegistrertIVerdipapirsentralen,
+    FormuesverdiForObligasjonerOpsjonerMvRegistrertIVerdipapirsentralen,
+    FormuesverdiForPrimaerbolig,
+    FormuesverdiForRegnskapsbehandletBolig,
+    FormuesverdiForRegnskapsbehandletFritidseiendom,
+    FormuesverdiForSekundaerbolig,
+    FormuesverdiForSkogeiendom,
+    FormuesverdiForTomt,
+    FormuesverdiForUbetingetOpsjonIArbeidsforhold,
+    FormuesverdiForUtestaaendeFordringerINaering,
+    FormuesverdiForUtleidFlerboligbygning,
+    FormuesverdiForVarelager,
+    FormuesverdiForVirtuellValuta,
+    Fortsettelsesforsikring,
+    ForvaltningskostnadKnyttetTilAksjesparekonto,
+    ForvaltningskostnadKnyttetTilFondskonto,
+    ForvaltningskostnadKnyttetTilVerdipapirfond,
+    ForvaltningskostnaderFinans,
+    FradragForFagforeningskontingent,
+    FradragForGaverTilFrivilligeOrganisasjoner,
+    FradragForIndividuellSparingTilPensjon,
+    FradragForKostnaderKnyttetTilArbeid,
+    FradragForMerkostnadVedArbeidsoppholdUtenforHjemmet,
+    FradragForPengetilskudd,
+    FradragForVergegodtgjoerelse,
+    FradragsberettigedeFoederaadsytelserOgUnderholdsbidragTilAnnenPerson,
+    FradragsberettigetTapPaaKapitalforsikringsavtale,
+    FradragsberettigetTapVedRealisasjonAvFastEiendom,
+    FradragsberettigetTapVedRealisasjonAvFastEiendomIUtlandet,
+    FremfoerbartUnderskuddIEnkeltpersonforetak,
+    GevinstOgAnnenInntektFraVirtuellEiendel,
+    GevinstValutalaan,
+    GevinstVedRealisasjonAvAksje,
+    GevinstVedRealisasjonAvAksjeOgVerdipapirfondAksjedel,
+    GevinstVedRealisasjonAvAksjesparekonto,
+    GevinstVedRealisasjonAvAndelIAksjedelIVerdipapirfond,
+    GevinstVedRealisasjonAvAndelIRentedelIVerdipapirfond,
+    GevinstVedRealisasjonAvAnnetFinansprodukt,
+    GevinstVedRealisasjonAvFastEiendomMv,
+    GevinstVedRealisasjonAvFastEiendomMvIUtlandet,
+    GevinstVedRealisasjonAvObligasjonVerdipapirfondRentedelMv,
+    GevinstVedRealisasjonAvObligasjonerSertifikaterMv,
+    GevinstVedRealisasjonAvOgUttakFraAksjedelIFondskonto,
+    GevinstVedRealisasjonAvOgUttakFraRentedelIFondskonto,
+    GevinstVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel,
+    GevinstVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel,
+    GevinstVedRealisasjonAvVirtuellValuta,
+    GevinstVedSalgAvAndelINOKUS,
+    GevinstVedSalgAvAndelISDF,
+    GjeldIInnenlandskeBanker,
+    GjeldINaering,
+    GjeldIUtlandet,
+    GjeldPaaAnnetFinansprodukt,
+    GjeldsfradragForKapitalisertFesteavgift,
+    GjeldsreduksjonForFastEiendomIUtlandetUnntattBeskatningINorgeEtterSkatteavtale,
+    GjeldsreduksjonForFastEiendomUtenforSvalbardUnntattBeskatningPaaSvalbard,
+    GjeldsrentereduksjonForFormueIUtlandetUnntattBeskatningINorgeEtterSkatteavtale,
+    GjeldsrentereduksjonForFormueUtenforSvalbardUnntattBeskatningPaaSvalbard,
+    GjenkjoepsverdiForLivsforsikring,
+    GrunnlagForKildeskattPaaPensjonOgUfoereytelser,
+    GrunnlagForSkattPaaAlminneligInntektSvalbard,
+    GrunnlagForSkattPaaNaeringsoverskuddSvalbard,
+    Innskudd,
+    InnskuddIUtlandet,
+    InntektFraGevinstOgTapskonto,
+    InntektFraLottEllerPartTilFiskerOgFangstmann,
+    InntektVedUtleieAvFritidseiendomSomSkattepliktigeHarBrukt,
+    InntektsfoeringAvNegativSaldo,
+    InntektsfradragAvRentefordelPaaLaanIArbeidsforhold,
+    InntektsfradragAvRentefordelPaaLaanIPensjonsforhold,
+    InntektsfradragFraGevinstOgTapskonto,
+    InntektsreduksjonVedAvkastningAvEngangserstatning,
+    Introduksjonsstoenad,
+    InvesteringIOppstartsselskap,
+    KaarytelseUtenforJordOgSkogbruksvirksomhet,
+    KapitalinntektFraSkogbruk,
+    KapitalkostnadFraSkogbruk,
+    KompensasjonsytelseUtbetaltAvNavInnenFiskeOgFangst,
+    Kontantbeloep,
+    Kvalifiseringsstoenad,
+    LatentEllerRealisertGevinstPaaAksjeAndelMvVedUtflytting,
+    LatentEllerRealisertGevinstPaaAnnetFinansproduktMvVedUtflytting,
+    LatentEllerRealisertTapPaaAksjeAndelMvVedUtflytting,
+    LatentEllerRealisertTapPaaAnnetFinansproduktMvVedUtflytting,
+    LivrenterIArbeidsforhold,
+    LivrenterUtenforArbeidsforhold,
+    LoennsinntektMedTrygdeavgiftspliktOmfattetAvLoennstrekkordningen,
+    LoennsinntektPaaSvalbardOver12G,
+    LoennsinntektTilBarn,
+    LoennsinntektUtenTrygdeavgiftspliktOgMedTrekkplikt,
+    LoennsinntektUtenTrygdeavgiftspliktOmfattetAvLoennstrekkordningen,
+    MinstefradragIBarnepensjon,
+    MinstefradragIBarnepensjonTilBarn,
+    MinstefradragIEktefelletillegg,
+    MinstefradragIInntekt,
+    MinstefradragIInntektTilBarn,
+    MottattFesteavgift,
+    NaeringsinntektFraKompensasjonsytelseUtbetaltAvNavInnenAnnenNaering,
+    NaeringsinntektFraKompensasjonsytelseUtbetaltAvNavInnenBarnepassIBarnepasserensHjem,
+    NaeringsinntektFraKompensasjonsytelseUtbetaltAvNavInnenFiskeOgFangst,
+    NegativAlminneligInntektOverfoertFraEktefelle,
+    NegativAlminneligInntektOverfoertTilEktefelle,
+    NegativFormueOverfoertFraEktefelle,
+    NettoLoennsinntektFraArbeidINorge,
+    Nettoformue,
+    NettoinntektVedUtleieAvFastEiendomMv,
+    OevrigInntekt,
+    OppjustertTilleggTilAndelIFellesTapVedSalgAvAndelISDF,
+    OppjustertTilleggTilAndelIFellesTilleggIAlminneligInntektFraSDF,
+    OppjustertTilleggTilAndelIFellesTilleggIAlminneligInntektFraSDFInnenAnnenNaering,
+    OppjustertTilleggTilAndelIFellesTilleggIAlminneligInntektFraSDFInnenBarnepassIBarnepasserensHjem,
+    OppjustertTilleggTilGevinstVedRealisasjonAvAksje,
+    OppjustertTilleggTilGevinstVedRealisasjonAvAksjeOgVerdipapirfondAksjedel,
+    OppjustertTilleggTilGevinstVedRealisasjonAvAksjesparekonto,
+    OppjustertTilleggTilGevinstVedRealisasjonAvAndelIAksjedelIVerdipapirfond,
+    OppjustertTilleggTilGevinstVedRealisasjonAvOgUttakFraAksjedelIFondskonto,
+    OppjustertTilleggTilGevinstVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel,
+    OppjustertTilleggTilGevinstVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel,
+    OppjustertTilleggTilGevinstVedSalgAvAndelINOKUS,
+    OppjustertTilleggTilGevinstVedSalgAvAndelISDF,
+    OppjustertTilleggTilLatentEllerRealisertGevinstPaaAksjeAndelMvVedUtflytting,
+    OppjustertTilleggTilLatentEllerRealisertTapPaaAksjeAndelMvVedUtflytting,
+    OppjustertTilleggTilRenteinntektMedEkstrabeskatningForLaanTilSelskap,
+    OppjustertTilleggTilSkattepliktigAksjegevinst,
+    OppjustertTilleggTilSkattepliktigUtbytteFraAksjeINOKUSIkkeRegistrertIVerdipapirsentralen,
+    OppjustertTilleggTilSkattepliktigUtbytteFraAksjeIkkeRegistrertIVerdipapirsentralen,
+    OppjustertTilleggTilSkattepliktigUtbytteFraAksjeOgVerdipapirfondAksjedel,
+    OppjustertTilleggTilSkattepliktigUtbytteFraAksjerRegistrertIVerdipapirsentralen,
+    OppjustertTilleggTilSkattepliktigUtbytteFraVerdipapirfondsandel,
+    OppjustertTilleggTilSkattepliktigUtbytteFraVerdipapirfondsandelTilBarn,
+    OppjustertTilleggTilTapVedRealisajonAvOgUttakFraAksjedelIFondskonto,
+    OppjustertTilleggTilTapVedRealisasjonAvAksje,
+    OppjustertTilleggTilTapVedRealisasjonAvAksjeOgVerdipapirfondAksjedel,
+    OppjustertTilleggTilTapVedRealisasjonAvAksjesparekonto,
+    OppjustertTilleggTilTapVedRealisasjonAvAndelIAksjedelIVerdipapirfond,
+    OppjustertTilleggTilTapVedRealisasjonAvOgUttakFraAksjedelIFondskonto,
+    OppjustertTilleggTilTapVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel,
+    OppjustertTilleggTilTapVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel,
+    OppjustertTilleggTilTapVedSalgAvAndelINOKUS,
+    OppjustertTilleggTilUtbytteFraAksje,
+    OppjustertTilleggTilUtbytteFraAksjesparekonto,
+    OppjustertTilleggTilUtbytteFraVerdipapirfond,
+    OpptjenteRenterFraPrivatUtestaaendeFordring,
+    OpptjenteRenterFraUtestaaendeFordring,
+    OvergangsstoenadTilEnsligForelder,
+    OverskuddAvEnkeltpersonforetakInnenAnnenNaeringUtenTrygdeavgiftsplikt,
+    OverskuddAvEnkeltpersonforetakInnenJordbrukGartneriPelsdyrMv,
+    OverskuddAvEnkeltpersonforetakInnenReindrift,
+    OverskuddAvEnkeltpersonforetakInnenSkiferproduksjon,
+    OverskuddAvEnkeltpersonforetakInnenSkogbruk,
+    OverskuddAvSDF,
+    OverskuddAvUtgiftsgodtgjoerelseVedSmusstillegg,
+    OverskuddFraNaeringsinntekt,
+    PaaloepteRenterFraAnnenGjeld,
+    PaaloepteRenterFraInkassoselskap,
+    PaaloepteRenterFraPrivatGjeld,
+    PensjonFraUtlandetSkattefriINorge,
+    PensjonFraUtlandetSkattepliktigINorge,
+    Pensjonsinnbetaling,
+    PensjonsinntektFritattForSkattEtterSkatteavtale,
+    PensjonsinntektIEOESTilsvarendeAlderspensjonEllerAFP,
+    PensjonsinntektOmfattetAvLoennstrekkordningen,
+    PersoninntektFraKompensasjonsytelseUtbetaltAvNavInnenAnnenNaering,
+    PersoninntektFraKompensasjonsytelseUtbetaltAvNavInnenBarnepassIBarnepasserensHjem,
+    PersoninntektFraKompensasjonsytelseUtbetaltAvNavInnenFiskeOgFangst,
+    PersoninntektFraSDFInnenAnnenNaering,
+    PersoninntektFraSDFInnenFiskeEllerBarnepassIBarnepasserensHjem,
+    PersoninntektFraSkattefriLottMedTrygdeavgiftspliktForUtenlandskFisker,
+    PositivPersoninntektFraEnkeltpersonforetakPaaSvalbard,
+    PremieTilEgenTilleggstrygdForNaeringsdrivende,
+    Premiefond,
+    PremiefondIndividuellPensjonsavtale,
+    PremiefondLivsforsikring,
+    PrivatGjeldsbeloep,
+    Reisefradrag,
+    RenteinntektAvAnnetFinansprodukt,
+    RenteinntektAvLivsforsikring,
+    RenteinntektAvObligasjon,
+    RenteinntektAvObligasjonVerdipapirfondRentedelMv,
+    RenteinntektAvObligasjonVerdipapirfondRentedelMvIUtlandet,
+    RenteinntektAvSkadeforsikring,
+    RenteinntektAvVerdipapirfondsandel,
+    RenteinntektMedEkstrabeskatningForLaanTilSelskap,
+    ReturAvPremieFraIndividuellPensjonssparing,
+    ReturprovisjonKnyttetTilAksjesparekonto,
+    ReturprovisjonKnyttetTilFondskonto,
+    ReturprovisjonKnyttetTilVerdipapirfond,
+    SaerfradragForEnsligForsoerger,
+    SaerfradragOverfoertFraBarn,
+    SaerfradragOverfoertFraEktefelle,
+    SaerfradragOverfoertTilEktefelle,
+    SaerfradragOverfoertTilForelder,
+    SaerskiltFradragForFiskereOgFangstfolk,
+    SaerskiltFradragForSjoefolk,
+    SaerskiltInntektsfradragIBarnsInntekt,
+    SamledeAndreOpptjenteRenter,
+    SamledeAndrePaaloepteRenter,
+    SamledeOpptjenteRenterIInnenlandskeBanker,
+    SamledeOpptjenteRenterIUtenlandskeBanker,
+    SamledeOpptjenteRenterIUtlandet,
+    SamledePaaloepteRenter,
+    SamledePaaloepteRenterPaaGjeldIInnenlandskeBanker,
+    SamledePaaloepteRenterPaaGjeldIUtlandet,
+    SamledeUfoererenterOgLivrenter,
+    SamledeUnderholdsbidrag,
+    SamletAndelAvFellesgjeldIBoligselskapEllerBoligsameie,
+    SamletAndelAvFradragsberettigetFelleskostnadForBoligselskapEllerBoligsameie,
+    SamletAndelAvInntektIBoligselskapEllerBoligsameie,
+    SamletAnnenGjeld,
+    SamletAnnenInntektForForskudd,
+    SamletAnnenPensjonMedTrekkpliktEksklusiveEktefelletillegg,
+    SamletAnnenPensjonUtenTrekkplikt,
+    SamletAnnenRenteinntekt,
+    SamletAvkastningAvKapitalforsikringsavtale,
+    SamletAvtalefestetPensjon,
+    SamletBarnepensjonOgLivrente,
+    SamletBarnepensjonOgLivrenteTilBarn,
+    SamletFormuesverdiAvPrivatUtestaaendeFordring,
+    SamletFormuesverdiAvUtestaaendeFordring,
+    SamletFormuesverdiForAndelAnnenFormueIBoligselskapEllerBoligsameie,
+    SamletFormuesverdiForAndelerIRentedelAvVerdipapirfond,
+    SamletFormuesverdiForAnnenFastEiendom,
+    SamletFormuesverdiForFastEiendomIUtlandet,
+    SamletFormuesverdiForOevrigFormue,
+    SamletFormuesverdiForOevrigFormueIUtlandet,
+    SamletFormuesverdiForSekundaerbolig,
+    SamletFormuesverdiForSelveidFritidseiendomEllerAndelIFritidsboligselskap,
+    SamletFradragsberettigetKostnadTilknyttetArbeidMv,
+    SamletFradragsberettigetUnderskuddVedUtleieAvFastEiendom,
+    SamletFremfoerbartUnderskuddFraTidligereAar,
+    SamletGevinstVedRealisasjonAvAndreFinansprodukter,
+    SamletGevinstVedRealisasjonAvVerdipapirfondsandelKnyttetTilRentedel,
+    SamletGjeld,
+    SamletGjenkjoepsverdiForLivsforsikring,
+    SamletGrunnlagForInntektsskattTilKommuneOgFylkeskommuneStatsskattOgFellesskatt,
+    SamletInnenlandskGjeld,
+    SamletInnskuddIInnenlandskeBanker,
+    SamletInntektSomGirRettTilSaerskiltFradragForSjoefolk,
+    SamletLoennsinntektMedTrygdeavgiftspliktOgMedTrekkplikt,
+    SamletLoennsinntektUtenTrygdeavgiftspliktOgMedTrekkplikt,
+    SamletLoennsinntektUtenTrygdeavgiftspliktOgUtenTrekkplikt,
+    SamletMerkostnadVedArbeidsoppholdUtenforHjem,
+    SamletOverskuddAvEnkeltpersonforetakInnenAnnenNaering,
+    SamletOverskuddAvEnkeltpersonforetakInnenFamiliebarnehageEllerDagmammaIEgetHjem,
+    SamletOverskuddAvEnkeltpersonforetakInnenFiskeOgFangst,
+    SamletOverskuddAvSDFInnenAnnenNaering,
+    SamletOverskuddAvSDFInnenFiskeEllerFamiliebarnehage,
+    SamletOverskuddPaaUtgiftsgodtgjoerelse,
+    SamletPensjonFraFolketrygden,
+    SamletPensjonsinnbetalingTilIndividuellPensjonsordning,
+    SamletPersoninntektFraEnkeltpersonforetakInnenFamiliebarnehageEllerDagmammaIEgetHjem,
+    SamletPersoninntektFraEnkeltpersonforetakInnenFiskeOgFangst,
+    SamletPersoninntektFraEnkeltpersonforetakInnenJordbrukReindriftSkiferproduksjonOgAnnenNaering,
+    SamletPremiefond,
+    SamletSaerfradrag,
+    SamletSaerfradragForStoreSykdomsutgifter,
+    SamletSaerfradragForUfoerhetIhtOvergangsregel,
+    SamletSaerskiltFradragForJordbrukReindriftOgSkiferproduksjon,
+    SamletSkattefriDelAvFormue,
+    SamletSkattepliktigGevinstVedRealisasjonAvObligasjonEllerVerdipapirfondsandel,
+    SamletSkattepliktigOverskuddFraUtleieAvFastEiendom,
+    SamletSkattepliktigOverskuddFraUtleieAvFastEiendomIUtlandet,
+    SamletTapVedRealisasjonAvVerdipapirfondsandelKnyttetTilRentedel,
+    SamletUfoeretrygdFraFolketrygdenEksklusiveEktefelletillegg,
+    SamletUfoereytelseFraAndreEnnFolketrygden,
+    SamletUnderskuddAvSDF,
+    SamletUnderskuddAvSDFPaaSvalbard,
+    SamletUnderskuddINaeringsvirksomhet,
+    SamletUnderskuddINaeringsvirksomhetPaaSvalbard,
+    SamletUtgiftsgodtgjoerelseMedTrekkplikt,
+    SkattefradragForFormuesskattBetaltIUtlandet,
+    SkattefriLoennsinntektMedTrygdeavgiftspliktOgMedTrekkplikt,
+    SkattepliktigAksjegevinst,
+    SkattepliktigAvkastningEllerKundeutbytte,
+    SkattepliktigEtterloennOgEtterpensjon,
+    SkattepliktigUtbytteFraAksjeINOKUSIkkeRegistrertIVerdipapirsentralen,
+    SkattepliktigUtbytteFraAksjeIkkeRegistrertIVerdipapirsentralen,
+    SkattepliktigUtbytteFraAksjeOgVerdipapirfondAksjedel,
+    SkattepliktigUtbytteFraAksjerRegistrertIVerdipapirsentralen,
+    SkattepliktigUtbytteFraVerdipapirfondsandel,
+    SkattepliktigUtbytteFraVerdipapirfondsandelTilBarn,
+    Skjermingsfradrag,
+    SkjermingstilleggTilAlderspensjon,
+    SkyldigRestskatt,
+    SkyldigUnderholdsbidrag,
+    Slitertillegg,
+    Standardfradrag,
+    StyrehonorarFraNorskSelskapTilSkattepliktigBosattIUtlandet,
+    SumFradragIAlminneligInntekt,
+    SumGjeldsreduksjon,
+    SumInntekterIAlminneligInntektFoerFordelingsfradrag,
+    SumMinstefradrag,
+    SumVerdsettingsrabatt,
+    SupplerendeStoenad,
+    SupplerendeStoenadTilUfoerFlyktning,
+    TapOgAnnenKostnadFraVirtuellEiendel,
+    TapValutalaan,
+    TapVedRealisajonAvOgUttakFraAksjedelIFondskonto,
+    TapVedRealisasjonAvAksje,
+    TapVedRealisasjonAvAksjeOgVerdipapirfondAksjedel,
+    TapVedRealisasjonAvAksjesparekonto,
+    TapVedRealisasjonAvAndelIAksjedelIVerdipapirfond,
+    TapVedRealisasjonAvAndelIRentedelIVerdipapirfond,
+    TapVedRealisasjonAvAnnetFinansprodukt,
+    TapVedRealisasjonAvObligasjonVerdipapirfondRentedelMv,
+    TapVedRealisasjonAvObligasjoner,
+    TapVedRealisasjonAvOgUttakFraAksjedelIFondskonto,
+    TapVedRealisasjonAvOgUttakFraRentedelIFondskonto,
+    TapVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel,
+    TapVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel,
+    TapVedRealisasjonAvVirtuellValuta,
+    TapVedSalgAvAndelINOKUS,
+    UfoererenterOgLivrenterUtenforArbeidsforhold,
+    UfoeretrygdFoerAlderspensjon,
+    UfoeretrygdOmfattetAvLoennstrekkordningen,
+    UfoereytelseFraIPAOgIPS,
+    UfoereytelseFraUtlandet,
+    UnderholdsbidragFraTidligereEktefelle,
+    UnderholdsbidragTilGode,
+    UnderskuddAvEnkeltpersonforetakFordeltFraEktefelle,
+    UnderskuddAvEnkeltpersonforetakPaaSvalbard,
+    UnderskuddFraSDF,
+    UnderskuddOverfoertFraBarnOgFordelt,
+    UnderskuddOverfoertTilForeldre,
+    UnderskuddVedUtleieMvAvFastEiendomUtenforNaering,
+    UtbetalingFraAvtaleOmSkattefavorisertIndividuellSparingTilPensjonTegnetFomNov2017,
+    UtbetalingFraSkadeforsikring,
+    UtbytteFraAksje,
+    UtbytteFraAksjesparekonto,
+    UtbytteFraVerdipapirfond,
+    UtgiftVedRefinansieringAvLaan,
+    UtgifterTilPassOgStellAvHjemmevaerendeBarn,
+    VerdiFoerVerdsettingsrabattForAksje,
+    VerdiFoerVerdsettingsrabattForAksjeIUtlandet,
+    VerdiFoerVerdsettingsrabattForAksjeIVPS,
+    VerdiFoerVerdsettingsrabattForAksjeIkkeIVPS,
+    VerdiFoerVerdsettingsrabattForAksjeOgAksjefondIFondskonto,
+    VerdiFoerVerdsettingsrabattForAksjedelIAksjesparekonto,
+    VerdiFoerVerdsettingsrabattForAndelIAksjedelIVerdipapirfond,
+    VerdiFoerVerdsettingsrabattForAndelIFellesNettoformueISDF,
+    VerdiFoerVerdsettingsrabattForAndelINOKUS,
+    VerdiFoerVerdsettingsrabattForAnnenFormueFraDriftsmidlerAndelISDFMvGenerell,
+    VerdiFoerVerdsettingsrabattForAnnenFormueInnenforInntektsgivendeAktivitet,
+    VerdiFoerVerdsettingsrabattForBilerMaskinerOgInventar,
+    VerdiFoerVerdsettingsrabattForFormuesobjekterINaeringOmfattetAvVerdsettingsrabatt,
+    VerdiFoerVerdsettingsrabattForInventarLoesoereVedUtleie,
+    VerdiFoerVerdsettingsrabattForKapitalisertFesteavgift,
+    VerdiFoerVerdsettingsrabattForRettigheterKnyttetTilSkogUtmark,
+    VerdiFoerVerdsettingsrabattForSkipFiskeOgFangstfartoey,
+    VerdiFoerVerdsettingsrabattForVerdipapirfondsandel,
+    VerdiFoerVerdsettingsrabattForVerdipapirfondsandelTilBarn,
+    VerdsettingsrabattForAksje,
+    VerdsettingsrabattForAksjeIUtlandet,
+    VerdsettingsrabattForAksjeIVPS,
+    VerdsettingsrabattForAksjeIkkeIVPS,
+    VerdsettingsrabattForAksjeOgAksjefondIFondskonto,
+    VerdsettingsrabattForAksjedelIAksjesparekonto,
+    VerdsettingsrabattForAndelIAksjedelIVerdipapirfond,
+    VerdsettingsrabattForAndelIFellesNettoformueISDF,
+    VerdsettingsrabattForAndelINOKUS,
+    VerdsettingsrabattForAnnenFormueInnenforInntektsgivendeAktivitet,
+    VerdsettingsrabattForBilerMaskinerOgInventar,
+    VerdsettingsrabattForFormuesobjekterINaeringOmfattetAvVerdsettingsrabatt,
+    VerdsettingsrabattForInventarLoesoereVedUtleie,
+    VerdsettingsrabattForKapitalisertFesteavgift,
+    VerdsettingsrabattForRettigheterKnyttetTilSkogUtmark,
+    VerdsettingsrabattForSkipFiskeOgFangstfartoey,
+    VerdsettingsrabattForVerdipapirfondsandel,
+    VerdsettingsrabattForVerdipapirfondsandelTilBarn
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java
new file mode 100644
index 00000000000..0245a60314a
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java
@@ -0,0 +1,355 @@
+package no.nav.testnav.apps.tenorsearchservice.domain;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+
+@Data
+@NoArgsConstructor
+@SuppressWarnings("java:S115")
+public class TenorRequest {
+
+    public enum IdentifikatorType {Foedselsnummer, DNummer, DNummerOgFoedselsnr}
+
+    public enum Kjoenn {Mann, Kvinne}
+
+    public enum Roller {DagligLeder}
+
+    public enum Personstatus {Bosatt, Doed, Forsvunnet, Foedselsregistrert, IkkeBosatt, Inaktiv, Midlertidig, Opphoert, Utflyttet}
+
+    public enum Sivilstatus {EnkeEllerEnkemann, Gift, GjenlevendePartner, RegistrertPartner, Separert, SeparertPartner, Skilt, SkiltPartner, Ugift, Uoppgitt}
+
+    public enum UtenlandskPersonIdentifikasjon {UtenlandskIdentifikasjonsnummer, TaxIdentificationNumber, SocialSecurityNumber, UtlendingsmyndighetenesIdentifikasjonsnummer}
+
+    public enum IdentitetsgrunnlagStatus {IkkeKontrollert, IngenStatus, Kontrollert}
+
+    public enum Adressebeskyttelse {Fortrolig, StrengtFortrolig}
+
+    public enum AdresseGradering {Ugradert, Klientadresse, Fortrolig}
+
+    public enum Relasjon {Barn, Far, Medmor, Mor, Partner}
+
+    public enum Skattemeldingstype {KunUtkast, UtkastOgFastsatt}
+
+    public enum Inntektstype {Loennsinntekt, Naeringsinntekt, PensjonEllerTrygd, YtelseFraOffentlige}
+
+    public enum AOrdningBeskrivelse {
+        Alderspensjon, AlderspensjonSkjermingstillegg, AndreBeskrivelser,
+        Arbeidsavklaringspenger, AvtalefestetPensjon, Bil, Bonus, DagpengerVedArbeidsloeshet, Ektefelletillegg,
+        ElektroniskKommunikasjon, Fagforeningskontingent, FastBilgodtgjoerelse, Fastloenn, FastTillegg, Feriepenger,
+        Foreldrepenger, IpaEllerIpsPeriodiskeYtelser, Kvalifiseringsstoenad, NyAvtalefestetPensjonPrivatSektor,
+        PensjonOgLivrenterIArbeidsforhold, ReiseKostMedOvernattingPaaHybelMedKokEllerPrivat,
+        ReiseKostMedOvernattingPaaHybelUtenKokEllerPensjonatEllerBrakke, Sykepenger, Timeloenn, Ufoeretrygd
+    }
+
+    public enum Forskuddstrekk {
+        OrdinaertForskuddstrekk, Barnepensjon, KildeskattPaaPensjon, Svalbard,
+        JanMayenOgBilandene, BetaltTrygdeavgiftTilJanMayen
+    }
+
+    public enum Skattepliktstype {SkattepliktTilNorge, SkattepliktTilSvalbard}
+
+    public enum SaerskiltSkatteplikt {
+        KildeskattepliktPaaLoenn, KildeskattepliktPaaPensjon,
+        SkattepliktAvNaeringsdriftEiendomMv, SkattepliktEtterPetroleumsskatteloven,
+        SkattepliktPaaLoennFraDenNorskeStatOpptjentIUtlandet, SkattepliktSomSjoemann,
+        SkattepliktSomUtenrikstjenestemann, SkattepliktVedUtenriksoppholdINorskStatstjenesteEllerNato
+    }
+
+    public enum TilleggsskattType {
+        FradragForTvangsmulkt, SkjerpetTilleggsskattFraUriktigeOpplysninger, TilleggsskattFraUriktigeOpplysninger,
+        TilleggsskattFraManglendeInnlevering, SkjerpetTilleggsskattFraManglendeInnlevering
+    }
+
+    public enum Arbeidsforholdstype {
+        OrdinaertArbeidsforhold, MaritimtArbeidsforhold, FrilanserOppdragstakerHonorarPersonerMm
+    }
+
+    public enum Oppgjoerstype {Fastland, Svalbard, KildeskattPaaLoenn}
+
+    public enum Stadietype {Utkast, Fastsatt, Oppgjoer}
+
+    @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer")
+    private String identifikator;
+    private IdentifikatorType identifikatorType;
+    private DatoIntervall foedselsdato;
+    private DatoIntervall doedsdato;
+    private Kjoenn kjoenn;
+    private Personstatus personstatus;
+    private Sivilstatus sivilstatus;
+    private List<UtenlandskPersonIdentifikasjon> utenlandskPersonIdentifikasjon;
+    private IdentitetsgrunnlagStatus identitetsgrunnlagStatus;
+    private Adressebeskyttelse adressebeskyttelse;
+    private Boolean harLegitimasjonsdokument;
+    private Boolean harFalskIdentitet;
+    private Boolean harNorskStatsborgerskap;
+    private Boolean harFlereStatsborgerskap;
+    private Navn navn;
+    private Adresser adresser;
+    private Relasjoner relasjoner;
+    private Hendelser hendelser;
+
+    private List<Roller> roller;
+    private Tjenestepensjonsavtale tjenestepensjonsavtale;
+    private Skattemelding skattemelding;
+    private InntektAordningen inntektAordningen;
+    private Skatteplikt skatteplikt;
+    private Tilleggsskatt tilleggsskatt;
+    private Arbeidsforhold arbeidsforhold;
+    private BeregnetSkatt beregnetSkatt;
+    private OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe;
+    private SamletReskontroInnsyn samletReskontroInnsyn;
+    private SummertSkattegrunnlag summertSkattegrunnlag;
+    private SpesisfisertSummertSkattegrunnlag spesisfisertSummertSkattegrunnlag;
+
+    public List<UtenlandskPersonIdentifikasjon> getUtenlandskPersonIdentifikasjon() {
+
+        if (isNull(utenlandskPersonIdentifikasjon)) {
+            utenlandskPersonIdentifikasjon = new ArrayList<>();
+        }
+        return utenlandskPersonIdentifikasjon;
+    }
+
+    public List<Roller> getRoller() {
+
+        if (isNull(roller)) {
+            roller = new ArrayList<>();
+        }
+        return roller;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class DatoIntervall {
+
+        @Schema(type = "string", format = "YYYY-MM-DD", example = "2018-07-01")
+        private LocalDate fraOgMed;
+        @Schema(type = "string", format = "YYYY-MM-DD", example = "2020-07-01")
+        private LocalDate tilOgMed;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Intervall {
+
+        private Integer fraOgMed;
+        private Integer tilOgMed;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Navn {
+
+        private Intervall navnLengde;
+        private Boolean harFlereFornavn;
+        private Boolean harMellomnavn;
+        private Boolean harNavnSpesialtegn;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Adresser {
+
+        @Schema(description = "Adressesøk, fritekst")
+        private AdresseGradering adresseGradering;
+        private Integer kommunenummer;
+        private Boolean harBostedsadresse;
+        private Boolean harOppholdAnnetSted;
+        private Boolean harPostadresseNorge;
+        private Boolean harPostadresseUtland;
+        private Boolean harKontaktadresseDoedsbo;
+        private Boolean harAdresseSpesialtegn;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Relasjoner {
+
+        private Relasjon relasjon;
+        private Intervall antallBarn;
+        private Boolean harForeldreAnsvar;
+        private Intervall relasjonMedFoedselsaar;
+        private Boolean harDeltBosted;
+        private Boolean harVergemaalEllerFremtidsfullmakt;
+        private Boolean borMedMor;
+        private Boolean borMedFar;
+        private Boolean borMedMedmor;
+        private Boolean foreldreHarSammeAdresse;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Hendelser {
+
+        private Hendelse hendelse;
+        private Hendelse sisteHendelse;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Tjenestepensjonsavtale {
+
+        @Schema(description = "Pensjonsinnretningen organisasjonsnummer, 9 siffre")
+        private String pensjonsinnretningOrgnr;
+        @Schema(type = "string", format = "YYYY-MM", example = "2020-07")
+        private YearMonth periode;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Skattemelding {
+
+        @Schema(description = "Inntektsår, 4 siffre, årene 2018, 2019, 2020, 2021, 2022 ... osv opptil i forfjor")
+        private Integer inntektsaar;
+        private Skattemeldingstype skattemeldingstype;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class InntektAordningen {
+
+        private MonthInterval periode;
+        private Integer opplysningspliktig;
+        private List<Inntektstype> inntektstyper;
+        private AOrdningBeskrivelse beskrivelse;
+        private List<Forskuddstrekk> forskuddstrekk;
+        private Boolean harHistorikk;
+
+        public List<Inntektstype> getInntektstyper() {
+
+            if (isNull(inntektstyper)) {
+                inntektstyper = new ArrayList<>();
+            }
+            return inntektstyper;
+        }
+
+        public List<Forskuddstrekk> getForskuddstrekk() {
+
+            if (isNull(forskuddstrekk)) {
+                forskuddstrekk = new ArrayList<>();
+            }
+            return forskuddstrekk;
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class MonthInterval {
+
+        @Schema(type = "string", format = "YYYY-MM", example = "2020-07")
+        private YearMonth fraOgMed;
+        @Schema(type = "string", format = "YYYY-MM", example = "2020-07")
+        private YearMonth tilOgMed;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Skatteplikt {
+
+        @Schema(description = "Inntektsår, 4 siffre, årene 2019, 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor")
+        private Integer inntektsaar;
+        private List<Skattepliktstype> skattepliktstyper;
+        private SaerskiltSkatteplikt saerskiltSkatteplikt;
+
+        public List<Skattepliktstype> getSkattepliktstyper() {
+
+            if (isNull(skattepliktstyper)) {
+                skattepliktstyper = new ArrayList<>();
+            }
+            return skattepliktstyper;
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Tilleggsskatt {
+
+        private Integer inntektsaar;
+        private List<TilleggsskattType> tilleggsskattTyper;
+
+        public List<TilleggsskattType> getTilleggsskattTyper() {
+
+            if (isNull(tilleggsskattTyper)) {
+                tilleggsskattTyper = new ArrayList<>();
+            }
+            return tilleggsskattTyper;
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class Arbeidsforhold {
+
+        private DatoIntervall startDatoPeriode;
+        private DatoIntervall sluttDatoPeriode;
+        private Boolean harPermisjoner;
+        private Boolean harPermitteringer;
+        private Boolean harArbeidsgiver;
+        private Boolean harTimerMedTimeloenn;
+        private Boolean harUtenlandsopphold;
+        private Boolean harHistorikk;
+        private Arbeidsforholdstype arbeidsforholdstype;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class BeregnetSkatt {
+
+        @Schema(description = "Inntektsår, 4 siffre, årene 2018, 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor")
+        private Integer inntektsaar;
+        private Oppgjoerstype oppgjoerstype;
+        private Boolean pensjonsgivendeInntekt;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class OpplysningerFraSkatteetatensInnsendingsmiljoe {
+
+        @Schema(description = "Inntektsår, 4 siffre, årene 2020, 2021, 2022, 2023 ... osv opptil i fjor")
+        private Integer inntektsaar;
+        @Schema(description = "Skattemelding utkast, merk at false indikerer har ikke skatteMeldingUtkast")
+        private Boolean harSkattemeldingUtkast;
+        @Schema(description = "Skattemelding fastsatt, merk at false indikerer har ikke skatteMeldingFastsatt")
+        private Boolean harSkattemeldingFastsatt;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class SamletReskontroInnsyn {
+
+        private Boolean harKrav;
+        private Boolean harInnbetaling;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class SummertSkattegrunnlag {
+
+        @Schema(description = "Inntektsår, 4 siffre, årene 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor")
+        private Integer inntektsaar;
+        private Stadietype stadietype;
+        private Oppgjoerstype oppgjoerstype;
+        private TekniskNavn tekniskNavn;
+        private Intervall alminneligInntektFoerSaerfradragBeloep;
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class SpesisfisertSummertSkattegrunnlag {
+
+        @Schema(description = "Inntektsår, 4 siffre, årene 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor")
+        private Integer inntektsaar;
+        private Stadietype stadietype;
+        private Oppgjoerstype oppgjoerstype;
+        private TekniskNavn tekniskNavn;
+        private Spesifiseringstype spesifiseringstype;
+        private Intervall alminneligInntektFoerSaerfradragBeloep;
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java
new file mode 100644
index 00000000000..1aa52d3d7da
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java
@@ -0,0 +1,20 @@
+package no.nav.testnav.apps.tenorsearchservice.domain;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TenorResponse {
+
+    private HttpStatus status;
+    private JsonNode data;
+    private String query;
+    private String error;
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java
new file mode 100644
index 00000000000..3407bbf1f97
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java
@@ -0,0 +1,66 @@
+package no.nav.testnav.apps.tenorsearchservice.provider;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.testnav.apps.tenorsearchservice.consumers.MaskinportenClient;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde;
+import no.nav.testnav.apps.tenorsearchservice.domain.AccessToken;
+import no.nav.testnav.apps.tenorsearchservice.domain.Lookups;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse;
+import no.nav.testnav.apps.tenorsearchservice.service.LookupService;
+import no.nav.testnav.apps.tenorsearchservice.service.TenorSearchService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/tenor")
+@RequiredArgsConstructor
+public class TenorSearchController {
+
+    private final TenorSearchService tenorSearchService;
+    private final MaskinportenClient maskinportenClient;
+    private final LookupService lookupService;
+
+    @GetMapping("/testdata/raw")
+    public Mono<TenorResponse> getTestdata(@RequestParam(required = false) String searchData,
+                                           @RequestParam(required = false) Kilde kilde,
+                                           @RequestParam(required = false) InfoType type,
+                                           @RequestParam(required = false) String fields,
+                                           @RequestParam(required = false) Integer seed) {
+
+        return tenorSearchService
+                .getTestdata(searchData, kilde, type, fields, seed);
+    }
+
+    @PostMapping("/testdata")
+    public Mono<TenorResponse> getTestdata(@RequestBody TenorRequest searchData,
+                                           @RequestParam(required = false) Kilde kilde,
+                                           @RequestParam(required = false) InfoType type,
+                                           @RequestParam(required = false) String fields,
+                                           @RequestParam(required = false) Integer seed) {
+
+        return tenorSearchService
+                .getTestdata(searchData, kilde, type, fields, seed);
+    }
+
+    @GetMapping("/testdata/domain")
+    public List<String> getTestdataDomain(@RequestParam Lookups lookup) {
+
+        return lookupService.getLookup(lookup);
+    }
+
+    @GetMapping("/testdata/token")
+    public Mono<String> getToken() {
+
+        return maskinportenClient.getAccessToken()
+                .map(AccessToken::value);
+    }
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java
new file mode 100644
index 00000000000..36582b04335
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java
@@ -0,0 +1,18 @@
+package no.nav.testnav.apps.tenorsearchservice.service;
+
+import no.nav.testnav.apps.tenorsearchservice.domain.Lookups;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class LookupService {
+
+    public List<String> getLookup(Lookups lookup) {
+
+        return Arrays.stream(lookup.getValue().getEnumConstants())
+                .map(Object::toString)
+                .toList();
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java
new file mode 100644
index 00000000000..66d4934cd23
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java
@@ -0,0 +1,71 @@
+package no.nav.testnav.apps.tenorsearchservice.service;
+
+import lombok.experimental.UtilityClass;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest;
+
+import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.BooleanUtils.isFalse;
+import static org.apache.commons.lang3.BooleanUtils.isNotTrue;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+@UtilityClass
+public class TenorConverterUtility {
+
+    private static final String NOT_OPERATOR = " not ";
+
+    public static String convertBooleanSpecial(String navn, Boolean verdi) {
+
+        return isNull(verdi) ? "" : " and %s%s:*".formatted(convertNotOperator(verdi), navn);
+    }
+
+    private static String convertNotOperator(Boolean verdi) {
+
+        return isFalse(verdi) ? NOT_OPERATOR : "";
+    }
+
+    public static String convertObject(String navn, Object verdi) {
+
+        return isNull(verdi) || verdi instanceof String string && isBlank(string) ? "" : " and %s:%s".formatted(navn, verdi);
+    }
+
+    public static String convertIntervall(String intervallNavn, TenorRequest.Intervall intervall) {
+
+        return isNull(intervall) ? "" : " and %s:[%s to %s]"
+                .formatted(intervallNavn,
+                        convertObjectWildCard(intervall.getFraOgMed()),
+                        convertObjectWildCard(intervall.getTilOgMed()));
+    }
+
+    public static String convertPeriode(TenorRequest.MonthInterval intervall) {
+
+        return isNull(intervall) ? "" : " and periode:[%s to %s]"
+                .formatted(
+                        convertObjectWildCard(intervall.getFraOgMed()),
+                        convertObjectWildCard(intervall.getTilOgMed()));
+    }
+
+    public static String convertEnum(String enumNavn, Enum<?> enumVerdi) {
+
+        return isNull(enumVerdi) ? "" : " and %s:%s%s".formatted(enumNavn,
+                enumVerdi.name().substring(0,1).toLowerCase(),
+                enumVerdi.name().substring(1));
+    }
+
+    public static String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) {
+
+        return isNull(datoIntervall) ? "" :
+                " and %s:[%s to %s]".formatted(datoNavn,
+                        convertObjectWildCard(datoIntervall.getFraOgMed()),
+                        convertObjectWildCard(datoIntervall.getTilOgMed()));
+    }
+
+    public static String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) {
+
+        return isNotTrue(booleanVerdi) ? "" : " and %s:*".formatted(booleanNavn);
+    }
+
+    public static String convertObjectWildCard(Object object) {
+
+        return isNull(object) ? "*" : object.toString();
+    }
+}
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java
new file mode 100644
index 00000000000..76c0a845060
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java
@@ -0,0 +1,216 @@
+package no.nav.testnav.apps.tenorsearchservice.service;
+
+import lombok.experimental.UtilityClass;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.isNull;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertBooleanSpecial;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertBooleanWildcard;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertDatoer;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnum;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertPeriode;
+import static org.apache.commons.lang3.BooleanUtils.isNotTrue;
+
+@UtilityClass
+public class TenorEksterneRelasjonerUtility {
+
+    private static final String INNTEKTSAAR = "inntektsaar";
+    private static final String TYPE_OPPGJOER = "typeOppgjoer";
+    private static final String AND = " and ";
+
+
+    public static String getEksterneRelasjoner(TenorRequest searchData) {
+
+        var builder = new StringBuilder()
+                .append(getRoller(searchData.getRoller()))
+                .append(getTjenestepensjonsavtale(searchData.getTjenestepensjonsavtale()))
+                .append(getSkattemelding(searchData.getSkattemelding()))
+                .append(getInntektAordningen(searchData.getInntektAordningen()))
+                .append(getSkatteplikt(searchData.getSkatteplikt()))
+                .append(getTilleggsskatt(searchData.getTilleggsskatt()))
+                .append(getArbeidsforhold(searchData.getArbeidsforhold()))
+                .append(getBeregnetSkatt(searchData.getBeregnetSkatt()))
+                .append(getOpplysningerFraSkatteetatensInnsendingsMiljoe(searchData.getOpplysningerFraSkatteetatensInnsendingsmiljoe()))
+                .append(getSamletReskontroInnsyn(searchData.getSamletReskontroInnsyn()))
+                .append(getSummertSkattegrunnlag(searchData.getSummertSkattegrunnlag()))
+                .append(getSpesifisertSummertSkattegrunnlag(searchData.getSpesisfisertSummertSkattegrunnlag()));
+
+        return builder.toString();
+    }
+
+    private String getSpesifisertSummertSkattegrunnlag(TenorRequest.SpesisfisertSummertSkattegrunnlag spesisfisertSummertSkattegrunnlag) {
+
+        return isNull(spesisfisertSummertSkattegrunnlag) ? "" :
+                " and tenorRelasjoner.spesifisertSummertSkattegrunnlag:{%s}".formatted(new StringBuilder()
+                        .append(convertObject(INNTEKTSAAR, spesisfisertSummertSkattegrunnlag.getInntektsaar()))
+                        .append(convertEnum("stadie", spesisfisertSummertSkattegrunnlag.getStadietype()))
+                        .append(convertEnum(TYPE_OPPGJOER, spesisfisertSummertSkattegrunnlag.getOppgjoerstype()))
+                        .append(convertEnum("tekniskNavn", spesisfisertSummertSkattegrunnlag.getTekniskNavn()))
+                        .append(convertEnum("spesifiseringstype", spesisfisertSummertSkattegrunnlag.getSpesifiseringstype()))
+                        .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep",
+                                spesisfisertSummertSkattegrunnlag.getAlminneligInntektFoerSaerfradragBeloep()))
+                        .substring(5));
+    }
+
+    private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summertSkattegrunnlag) {
+
+        return isNull(summertSkattegrunnlag) ? "" :
+                " and tenorRelasjoner.summertSkattegrunnlag:{%s}".formatted(new StringBuilder()
+                        .append(convertObject(INNTEKTSAAR, summertSkattegrunnlag.getInntektsaar()))
+                        .append(convertEnum("stadie", summertSkattegrunnlag.getStadietype()))
+                        .append(convertEnum(TYPE_OPPGJOER, summertSkattegrunnlag.getOppgjoerstype()))
+                        .append(convertEnum("tekniskNavn", summertSkattegrunnlag.getTekniskNavn()))
+                        .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep",
+                                summertSkattegrunnlag.getAlminneligInntektFoerSaerfradragBeloep()))
+                        .substring(5));
+    }
+
+    private String getSamletReskontroInnsyn(TenorRequest.SamletReskontroInnsyn samletReskontroInnsyn) {
+
+        return isNull(samletReskontroInnsyn) ||
+                (isNotTrue(samletReskontroInnsyn.getHarKrav()) && isNotTrue(samletReskontroInnsyn.getHarInnbetaling())) ? "" :
+                " and tenorRelasjoner.samletReskontroinnsyn:{%s}".formatted(new StringBuilder()
+                        .append(convertBooleanWildcard("harKrav", samletReskontroInnsyn.getHarKrav()))
+                        .append(convertBooleanWildcard("harInnbetaling", samletReskontroInnsyn.getHarInnbetaling()))
+                        .substring(5));
+    }
+
+    private String getOpplysningerFraSkatteetatensInnsendingsMiljoe(TenorRequest.OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe) {
+
+        return isNull(opplysningerFraSkatteetatensInnsendingsmiljoe) ? "" :
+                " and tenorRelasjoner.testinnsendingSkattPerson:{%s}".formatted(new StringBuilder()
+                        .append(convertObject(INNTEKTSAAR, opplysningerFraSkatteetatensInnsendingsmiljoe.getInntektsaar()))
+                        .append(convertBooleanSpecial("harSkattemeldingUtkast", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingUtkast()))
+                        .append(convertBooleanSpecial("harSkattemeldingFastsatt", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingFastsatt()))
+                        .substring(5));
+    }
+
+    private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) {
+
+        return isNull(beregnetSkatt) ? "" :
+                " and tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder()
+                        .append(convertObject(INNTEKTSAAR, beregnetSkatt.getInntektsaar()))
+                        .append(convertEnum(TYPE_OPPGJOER, beregnetSkatt.getOppgjoerstype()))
+                        .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt()))
+                        .substring(5));
+    }
+
+    private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) {
+
+        return isNull(arbeidsforhold) ? "" :
+                " and tenorRelasjoner.arbeidsforhold:{%s}".formatted(new StringBuilder()
+                        .append(convertDatoer("startDato", arbeidsforhold.getStartDatoPeriode()))
+                        .append(convertDatoer("sluttDato", arbeidsforhold.getSluttDatoPeriode()))
+                        .append(convertObject("harPermisjoner", arbeidsforhold.getHarPermisjoner()))
+                        .append(convertObject("harPermitteringer", arbeidsforhold.getHarPermitteringer()))
+                        .append(convertObject("harArbeidsgiver", arbeidsforhold.getHarArbeidsgiver()))
+                        .append(convertObject("harTimerMedTimeloenn", arbeidsforhold.getHarTimerMedTimeloenn()))
+                        .append(convertObject("harUtenlandsopphold", arbeidsforhold.getHarUtenlandsopphold()))
+                        .append(convertObject("harHistorikk", arbeidsforhold.getHarHistorikk()))
+                        .append(convertEnum("arbeidsforholdtype", arbeidsforhold.getArbeidsforholdstype()))
+                        .substring(5));
+    }
+
+    private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) {
+
+        return isNull(tilleggsskatt) ? "" :
+                " and tenorRelasjoner.tilleggsskatt:{%s}".formatted(
+                        new StringBuilder()
+                                .append(convertObject(INNTEKTSAAR, tilleggsskatt.getInntektsaar()))
+                                .append(getTilleggsskattTyper(tilleggsskatt.getTilleggsskattTyper()))
+                                .substring(5));
+    }
+
+    private String getInntektAordningen(TenorRequest.InntektAordningen inntektAordningen) {
+
+        return (isNull(inntektAordningen)) ? "" :
+                " and tenorRelasjoner.inntekt:{%s}".formatted(new StringBuilder()
+                        .append(convertPeriode(inntektAordningen.getPeriode()))
+                        .append(convertObject("opplysningspliktig", inntektAordningen.getOpplysningspliktig()))
+                        .append(getInntektstyper(inntektAordningen.getInntektstyper()))
+                        .append(convertEnum("beskrivelse", inntektAordningen.getBeskrivelse()))
+                        .append(getForskuddstrekk(inntektAordningen.getForskuddstrekk()))
+                        .append(convertObject("harHistorikk", inntektAordningen.getHarHistorikk()))
+                        .substring(5));
+    }
+
+    private String getForskuddstrekk(List<TenorRequest.Forskuddstrekk> forskuddstrekk1) {
+
+        return forskuddstrekk1.isEmpty() ? "" : " and forskuddstrekk:(%s)"
+                .formatted(forskuddstrekk1.stream()
+                        .map(Enum::name)
+                        .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1)))
+                        .collect(Collectors.joining(AND)));
+    }
+
+    private String getInntektstyper(List<TenorRequest.Inntektstype> inntektstyper) {
+
+        return inntektstyper.isEmpty() ? "" : " and inntektstype:(%s)"
+                .formatted(inntektstyper.stream()
+                        .map(Enum::name)
+                        .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1)))
+                        .collect(Collectors.joining(AND)));
+    }
+
+    private String getSkattemelding(TenorRequest.Skattemelding skattemelding) {
+
+        return isNull(skattemelding) ? "" :
+                " and tenorRelasjoner.skattemelding:{%s}".formatted(new StringBuilder()
+                        .append(convertObject(INNTEKTSAAR, skattemelding.getInntektsaar()))
+                        .append(convertEnum("skattemeldingstype", skattemelding.getSkattemeldingstype()))
+                        .substring(5));
+    }
+
+    private String getTjenestepensjonsavtale(TenorRequest.Tjenestepensjonsavtale tjenestepensjonsavtale) {
+
+        return isNull(tjenestepensjonsavtale) ? "" :
+                " and tenorRelasjoner.tjenestepensjonavtale:{%s}".formatted(new StringBuilder()
+                        .append(convertObject("pensjonsinnretningOrgnr", tjenestepensjonsavtale.getPensjonsinnretningOrgnr()))
+                        .append(convertObject("periode", tjenestepensjonsavtale.getPeriode()))
+                        .substring(5));
+    }
+
+    private String getRoller(List<TenorRequest.Roller> roller) {
+
+        return (roller.isEmpty()) ? "" : " and tenorRelasjoner.brreg-er-fr:{%s}".formatted(roller.stream()
+                .map(Enum::name)
+                .map(type -> "%s%s:*".formatted(type.substring(0,1).toLowerCase(), type.substring(1)))
+                .collect(Collectors.joining(AND)));
+    }
+
+    private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) {
+
+        return isNull(skatteplikt) ? "" :
+                " and tenorRelasjoner.skatteplikt:{%s}".formatted(
+                        new StringBuilder()
+                                .append(convertObject(INNTEKTSAAR, skatteplikt.getInntektsaar()))
+                                .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper()))
+                                .append(convertEnum("saerskiltSkatteplikt", skatteplikt.getSaerskiltSkatteplikt()))
+                                .substring(5));
+    }
+
+    private String getTilleggsskattTyper(List<TenorRequest.TilleggsskattType> tilleggsskattTyper) {
+
+        return tilleggsskattTyper.isEmpty() ? "" : AND +
+                tilleggsskattTyper.stream()
+                        .map(Enum::name)
+                        .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1)))
+                        .map("%s:*"::formatted)
+                        .collect(Collectors.joining(AND));
+    }
+
+    private String getSkattepliktstyper(List<TenorRequest.Skattepliktstype> skattepliktstyper) {
+
+        return skattepliktstyper.isEmpty() ? "" : AND +
+                skattepliktstyper.stream()
+                        .map(Enum::name)
+                        .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1)))
+                        .map("%s:*"::formatted)
+                        .collect(Collectors.joining(AND));
+    }
+}
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java
new file mode 100644
index 00000000000..9c22a38b598
--- /dev/null
+++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java
@@ -0,0 +1,111 @@
+package no.nav.testnav.apps.tenorsearchservice.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType;
+import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest;
+import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertBooleanWildcard;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertDatoer;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnum;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall;
+import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class TenorSearchService {
+    private final TenorClient tenorClient;
+
+    public Mono<TenorResponse> getTestdata(String testDataQuery, Kilde kilde, InfoType type, String fields, Integer seed) {
+
+        return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : "", kilde, type, fields, seed);
+    }
+
+    public Mono<TenorResponse> getTestdata(TenorRequest searchData, Kilde kilde, InfoType type, String fields, Integer seed) {
+
+        var builder = new StringBuilder()
+                .append(convertObject("identifikator", searchData.getIdentifikator()))
+                .append(convertDatoer("foedselsdato", searchData.getFoedselsdato()))
+                .append(convertDatoer("doedsdato", searchData.getDoedsdato()))
+                .append(convertEnum("identifikatorType", searchData.getIdentifikatorType()))
+                .append(convertEnum("kjoenn", searchData.getKjoenn()))
+                .append(convertEnum("personstatus", searchData.getPersonstatus()))
+                .append(convertEnum("sivilstatus", searchData.getSivilstatus()))
+                .append(getUtenlandskPersonidentifikasjon(searchData.getUtenlandskPersonIdentifikasjon()))
+                .append(convertEnum("identitetsgrunnlagStatus", searchData.getIdentitetsgrunnlagStatus()))
+                .append(convertEnum("adresseBeskyttelse", searchData.getAdressebeskyttelse()))
+                .append(convertBooleanWildcard("legitimasjonsdokument", searchData.getHarLegitimasjonsdokument()))
+                .append(convertObject("falskIdentitet", searchData.getHarFalskIdentitet()))
+                .append(convertObject("norskStatsborgerskap", searchData.getHarNorskStatsborgerskap()))
+                .append(convertObject("flereStatsborgerskap", searchData.getHarFlereStatsborgerskap()));
+
+        if (nonNull(searchData.getNavn())) {
+            builder.append(convertObject("flereFornavn", searchData.getNavn().getHarFlereFornavn()))
+                    .append(convertIntervall("navnLengde", searchData.getNavn().getNavnLengde()))
+                    .append(convertBooleanWildcard("mellomnavn", searchData.getNavn().getHarMellomnavn()))
+                    .append(convertObject("navnSpesialtegn", searchData.getNavn().getHarNavnSpesialtegn()));
+        }
+
+        if (nonNull(searchData.getAdresser())) {
+            builder.append(convertEnum("adresseGradering", searchData.getAdresser().getAdresseGradering()))
+                    .append(convertObject("kommunenr", searchData.getAdresser().getKommunenummer()))
+                    .append(convertBooleanWildcard("bostedsadresse", searchData.getAdresser().getHarBostedsadresse()))
+                    .append(convertBooleanWildcard("oppholdAnnetSted", searchData.getAdresser().getHarOppholdAnnetSted()))
+                    .append(convertBooleanWildcard("postadresse", searchData.getAdresser().getHarPostadresseNorge()))
+                    .append(convertBooleanWildcard("postadresseUtland", searchData.getAdresser().getHarPostadresseUtland()))
+                    .append(convertBooleanWildcard("kontaktinfoDoedsbo", searchData.getAdresser().getHarKontaktadresseDoedsbo()))
+                    .append(convertObject("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn()));
+        }
+
+        if (nonNull(searchData.getRelasjoner())) {
+            builder.append(getFregRelasjoner(searchData.getRelasjoner()))
+                    .append(convertIntervall("antallBarn", searchData.getRelasjoner().getAntallBarn()))
+                    .append(convertBooleanWildcard("foreldreansvar", searchData.getRelasjoner().getHarForeldreAnsvar()))
+                    .append(convertBooleanWildcard("deltBosted", searchData.getRelasjoner().getHarDeltBosted()))
+                    .append(convertBooleanWildcard("vergemaalType", searchData.getRelasjoner().getHarVergemaalEllerFremtidsfullmakt()))
+                    .append(convertObject("borMedFar", searchData.getRelasjoner().getBorMedFar()))
+                    .append(convertObject("borMedMor", searchData.getRelasjoner().getBorMedMor()))
+                    .append(convertObject("borMedMedmor", searchData.getRelasjoner().getBorMedMedmor()))
+                    .append(convertObject("foreldreHarSammeAdresse", searchData.getRelasjoner().getForeldreHarSammeAdresse()));
+        }
+
+        if (nonNull(searchData.getHendelser())) {
+            builder.append(convertEnum("hendelserMedSekvens.hendelse", searchData.getHendelser().getHendelse()))
+                    .append(convertEnum("sisteHendelse", searchData.getHendelser().getSisteHendelse()));
+        }
+        builder.append(TenorEksterneRelasjonerUtility.getEksterneRelasjoner(searchData));
+
+        var query = builder.substring(builder.isEmpty() ? 0 : 5, builder.length());
+        return tenorClient.getTestdata(query, kilde, type, fields, seed);
+    }
+
+    private String getFregRelasjoner(TenorRequest.Relasjoner relasjoner) {
+
+        return isNull(relasjoner.getRelasjon()) && isNull(relasjoner.getRelasjonMedFoedselsaar()) ? "" :
+                " and tenorRelasjoner.freg:{%s}"
+                        .formatted(new StringBuilder()
+                                .append(convertObject("tenorRelasjonsnavn", relasjoner.getRelasjon()))
+                                .append(convertIntervall("foedselsdato", relasjoner.getRelasjonMedFoedselsaar()))
+                                .substring(5));
+    }
+
+    private String getUtenlandskPersonidentifikasjon(List<TenorRequest.UtenlandskPersonIdentifikasjon> utenlandskPersonIdentifikasjon) {
+
+        return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : " and utenlandskPersonidentifikasjon:(%s)"
+                .formatted(utenlandskPersonIdentifikasjon.stream()
+                        .map(Enum::name)
+                        .collect(Collectors.joining(" and ")));
+    }
+}
diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..8807d8c105a
--- /dev/null
+++ b/apps/tenor-search-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+TOKEN_X_ISSUER: dummy
+
+MASKINPORTEN_CLIENT_ID: dummy
+MASKINPORTEN_CLIENT_JWK: dummy
+MASKINPORTEN_SCOPES: dummy
+MASKINPORTEN_WELL_KNOWN_URL: dummy
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml
new file mode 100644
index 00000000000..ae8b30ef805
--- /dev/null
+++ b/apps/tenor-search-service/src/main/resources/application.yml
@@ -0,0 +1,56 @@
+AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
+spring:
+  application:
+    version: 1
+    name: testnav-tenor-search-service
+    desciption: Tjeneste som formidler søk til Tenor testdata hos Skatteetaten
+  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: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
+  jackson:
+    serialization:
+      write_dates_as_timestamps: false
+  cloud:
+    vault:
+      enabled: false
+
+springdoc:
+  swagger-ui:
+    disable-swagger-default-url: true
+    url: /v3/api-docs
+
+management:
+  endpoints:
+    enabled-by-default: true
+    web:
+      base-path: /internal
+      exposure.include: prometheus,heapdump,health
+      path-mapping:
+        prometheus: metrics
+  endpoint:
+    prometheus.enabled: true
+    heapdump.enabled: true
+  prometheus:
+    metrics:
+      export:
+        enabled: true
+server:
+  servlet:
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+      force-request: true
+      force-response: true
+
+consumers:
+  tenor-search-service:
+    url: https://testdata.api.skatteetaten.no
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml
similarity index 82%
rename from proxies/kodeverk-proxy/src/main/resources/logback-spring.xml
rename to apps/tenor-search-service/src/main/resources/logback-spring.xml
index 88192306725..2ca797bad5e 100644
--- a/proxies/kodeverk-proxy/src/main/resources/logback-spring.xml
+++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml
@@ -8,11 +8,8 @@
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
                     <maxLength>10280</maxLength>
                     <shortenedClassNameLength>20</shortenedClassNameLength>
-                    <rootCauseFirst>true</rootCauseFirst>
-                    <exclude>^sun\.</exclude>
-                    <exclude>^net\.sf\.cglib\.</exclude>
-                    <exclude>^java\.lang\.Thread\.</exclude>
-                    <exclude>^java\.io\.</exclude>
+                    <exclude>^sun\.reflect\..*\.invoke</exclude>
+                    <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
                     <exclude>java\.util\.concurrent\..*</exclude>
                     <exclude>org\.apache\.catalina\..*</exclude>
                     <exclude>org\.apache\.coyote\..*</exclude>
@@ -25,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
@@ -39,5 +36,5 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
 </configuration>
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java b/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java
similarity index 82%
rename from proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java
rename to apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java
index 9697893ce69..058647bcc69 100644
--- a/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java
+++ b/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java
@@ -1,4 +1,4 @@
-package no.nav.testnav.proxies.kodeverkproxy;
+package no.nav.testnav.apps.tenorsearchservice;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -11,7 +11,7 @@
 class ApplicationContextTest {
 
     @MockBean
-    public ReactiveJwtDecoder reactiveJwtDecoder;
+    public ReactiveJwtDecoder jwtDecoder;
 
     @Test
     @SuppressWarnings("java:S2699")
diff --git a/apps/tenor-search-service/src/test/resources/application-test.yml b/apps/tenor-search-service/src/test/resources/application-test.yml
new file mode 100644
index 00000000000..dee4ed64372
--- /dev/null
+++ b/apps/tenor-search-service/src/test/resources/application-test.yml
@@ -0,0 +1,5 @@
+TOKEN_X_ISSUER: dummy
+MASKINPORTEN_CLIENT_ID: dummy
+MASKINPORTEN_CLIENT_JWK: dummy
+MASKINPORTEN_SCOPES: dummy
+MASKINPORTEN_WELL_KNOWN_URL: dummy
\ No newline at end of file
diff --git a/apps/tenor-search-service/src/test/resources/logback-spring.xml b/apps/tenor-search-service/src/test/resources/logback-spring.xml
new file mode 100644
index 00000000000..328f2de802b
--- /dev/null
+++ b/apps/tenor-search-service/src/test/resources/logback-spring.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProfile name="test">
+        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder>
+                <pattern>
+                    %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
+                </pattern>
+                <charset>utf8</charset>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
+
+    <logger level="TRACE" name="no.nav.testnav.apps.brukerservice.controller.BrukerController" />
+</configuration>
\ No newline at end of file
diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle
index f7a80aba2bd..51147fc5e50 100644
--- a/apps/testnav-ident-pool/build.gradle
+++ b/apps/testnav-ident-pool/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -101,7 +101,7 @@ dependencies {
     implementation 'org.postgresql:postgresql'
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
diff --git a/apps/testnav-ident-pool/config.yml b/apps/testnav-ident-pool/config.yml
index 518b26819ac..64c3d600750 100644
--- a/apps/testnav-ident-pool/config.yml
+++ b/apps/testnav-ident-pool/config.yml
@@ -72,4 +72,4 @@ spec:
         databases:
           - name: testnav-identpool
         tier: db-custom-1-3840
-        autoBackupTime: "02:00"
\ No newline at end of file
+        autoBackupHour: 2
\ No newline at end of file
diff --git a/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties b/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/testnav-ident-pool/src/main/resources/application.yaml b/apps/testnav-ident-pool/src/main/resources/application.yaml
index f1c6abaf7c5..baa41b6593b 100644
--- a/apps/testnav-ident-pool/src/main/resources/application.yaml
+++ b/apps/testnav-ident-pool/src/main/resources/application.yaml
@@ -46,8 +46,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}
 
 
diff --git a/apps/testnav-ident-pool/src/test/resources/application.properties b/apps/testnav-ident-pool/src/test/resources/application.properties
index 38a61f770b5..1691598aacc 100644
--- a/apps/testnav-ident-pool/src/test/resources/application.properties
+++ b/apps/testnav-ident-pool/src/test/resources/application.properties
@@ -3,5 +3,5 @@ spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.url=jdbc:h2:mem:testdb;MODE=Postgresql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;
 
 tps-forvalteren.rest.api.url=dummy
-client_id=dummy
-client_secret=dummy
\ No newline at end of file
+
+TOKEN_X_ISSUER= dummy
\ No newline at end of file
diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle
index 66b242897e8..5feada3534d 100644
--- a/apps/testnorge-statisk-data-forvalter/build.gradle
+++ b/apps/testnorge-statisk-data-forvalter/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -35,7 +35,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -91,8 +91,8 @@ dependencies {
     implementation 'org.hibernate.validator:hibernate-validator'
    
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
 
     implementation 'org.projectlombok:lombok'
diff --git a/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
index c5394d92d07..31f1b7a4632 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
+++ b/apps/testnorge-statisk-data-forvalter/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-fss:dolly:testnorge-statisk-data-forvalter
 
 springdoc:
@@ -63,11 +63,11 @@ consumers:
     url: https://krr-stub-%s.dev.intern.nav.no/api
   synthdata-aareg:
     url: http://nais-synthdata-aareg.dolly.svc.nais.local
-  kodeverk:
-    cluster: dev-fss
-    name: testnav-kodeverk-proxy
-    namespace: dolly
-    url: https://kodeverk.dev.intern.nav.no
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
+    url: https://kodeverk-api.nav.no
+    cluster: prod-gcp
   testnav-aareg-proxy:
     name: testnav-aareg-proxy
     namespace: dolly
diff --git a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
index 796bbf785f2..645c29acb45 100644
--- a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
@@ -58,4 +58,6 @@ controller.staticdata.cache.hours: 24
 azure.app.client.id: dummy
 
 KAFKA_SCHEMA_REGISTRY: http://localhost:9009
-kafka.groupid: organisasjon-forvalter-v1
\ No newline at end of file
+kafka.groupid: organisasjon-forvalter-v1
+
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle
index 8b94d1455ae..7ab7a060c86 100644
--- a/apps/tilbakemelding-api/build.gradle
+++ b/apps/tilbakemelding-api/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -61,7 +61,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
 
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
diff --git a/apps/tilbakemelding-api/config.yml b/apps/tilbakemelding-api/config.yml
index 72c2f5fba89..2b5804db849 100644
--- a/apps/tilbakemelding-api/config.yml
+++ b/apps/tilbakemelding-api/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/tilbakemelding-api/src/main/resources/application.yml b/apps/tilbakemelding-api/src/main/resources/application.yml
index 5987913b666..f6eaecb9bc1 100644
--- a/apps/tilbakemelding-api/src/main/resources/application.yml
+++ b/apps/tilbakemelding-api/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:testnorge-tilbakemelding-api
 
 springdoc:
diff --git a/apps/tilbakemelding-api/src/test/resources/application-test.properties b/apps/tilbakemelding-api/src/test/resources/application-test.properties
index 3f367f2b39c..b03ff5a1383 100644
--- a/apps/tilbakemelding-api/src/test/resources/application-test.properties
+++ b/apps/tilbakemelding-api/src/test/resources/application-test.properties
@@ -1,3 +1,3 @@
-spring.cloud.vault.token=dummy
 SLACK_TOKEN=dummy
-SLACK_CHANNEL=dummy
\ No newline at end of file
+SLACK_CHANNEL=dummy
+TOKEN_X_ISSUER= dummy
\ No newline at end of file
diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle
index 56993ecbac9..105780efca3 100644
--- a/apps/tps-messaging-service/build.gradle
+++ b/apps/tps-messaging-service/build.gradle
@@ -1,9 +1,10 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
+    id("org.openrewrite.rewrite") version("6.6.4")
 }
 
 test {
@@ -11,6 +12,10 @@ test {
     jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
 }
 
+rewrite {
+    activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2")
+}
+
 jacocoTestReport {
     reports {
         xml.required = true
@@ -34,13 +39,14 @@ sonarqube {
 }
 
 bootJar {
+    duplicatesStrategy(DuplicatesStrategy.INCLUDE)
     archiveFileName = "app.jar"
 }
 
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -69,6 +75,7 @@ configurations.implementation {
 }
 
 dependencies {
+    rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0")
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:servlet-security'
@@ -81,16 +88,14 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
 
+
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
-    implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.3'
-    implementation 'com.ibm.icu:icu4j:72.1'
-
-    implementation 'javax.xml.bind:jaxb-api:2.3.1'
-    implementation 'javax.json.bind:javax.json.bind-api:1.0'
-    implementation 'javax.activation:activation:1.1.1'
-    implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.0'
-    implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
+    implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.1'
+    implementation 'com.ibm.icu:icu4j:74.2'
+
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
+    implementation 'com.sun.xml.bind:jaxb-core'
     implementation 'org.glassfish.jaxb:jaxb-runtime'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
 
@@ -102,14 +107,16 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
     implementation 'org.hibernate.validator:hibernate-validator'
-    implementation 'org.aspectj:aspectjweaver:1.9.7'
+    implementation 'org.aspectj:aspectjweaver:1.9.19'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     implementation 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
+
+    testImplementation "org.junit.jupiter:junit-jupiter:5.10.1"
 }
\ No newline at end of file
diff --git a/apps/tps-messaging-service/config.yml b/apps/tps-messaging-service/config.yml
index ceaf793c812..2f0439c1dab 100644
--- a/apps/tps-messaging-service/config.yml
+++ b/apps/tps-messaging-service/config.yml
@@ -82,11 +82,7 @@ spec:
       external:
         - host: b27apvl221.preprod.local
           ports:
-            - name: MQ Q-env
-              port: 1413
-              protocol: TCP
+            - port: 1413
         - host: d26apvl300.test.local
           ports:
-            - name: MQ T-env
-              port: 1412
-              protocol: TCP
\ No newline at end of file
+            - port: 1412
\ No newline at end of file
diff --git a/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties b/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/XmlMapperConfig.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/XmlMapperConfig.java
deleted file mode 100644
index 7d460b03a45..00000000000
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/XmlMapperConfig.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package no.nav.testnav.apps.tpsmessagingservice.config;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class XmlMapperConfig {
-
-    @Bean
-    public XmlMapper xmlMapper() {
-        return XmlMapper
-                .builder()
-                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true)
-                .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true)
-                .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-                .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
-                .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
-                .build();
-    }
-
-}
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java
index 2daa6bfeff5..7ee998ff96a 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java
@@ -7,8 +7,8 @@
 import no.nav.testnav.apps.tpsmessagingservice.factory.ConnectionFactoryFactory;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.io.StringWriter;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
@@ -29,7 +29,7 @@ public EndringsmeldingConsumer(ConnectionFactoryFactory connectionFactoryFactory
     protected String getQueueName(String queue, String miljoe) {
 
         return isBlank(queue) ?
-                String.format("%s%s_%s", PREFIX_MQ_QUEUES, miljoe.toUpperCase(),
+                "%s%s_%s".formatted(PREFIX_MQ_QUEUES, miljoe.toUpperCase(),
                         XML_REQUEST_QUEUE_ENDRINGSMELDING_ALIAS) :
                 queue;
     }
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java
index e103af7f94e..18d8c4df27e 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java
@@ -6,8 +6,8 @@
 import no.nav.testnav.apps.tpsmessagingservice.factory.ConnectionFactoryFactory;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.io.StringWriter;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
@@ -28,7 +28,7 @@ public ServicerutineConsumer(ConnectionFactoryFactory connectionFactoryFactory)
     protected String getQueueName(String queue, String miljoe) {
 
         return isBlank(queue) ?
-                String.format("%s%s_%s", PREFIX_MQ_QUEUES, miljoe.toUpperCase(),
+                "%s%s_%s".formatted(PREFIX_MQ_QUEUES, miljoe.toUpperCase(),
                         XML_REQUEST_QUEUE_SERVICE_RUTINE_ALIAS) :
                 queue;
     }
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java
index 77436bca314..c72482156b9 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java
@@ -11,7 +11,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java
index 184dbd9f56f..4a3544ce01c 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java
@@ -63,14 +63,14 @@ public String call() throws JMSException, JmqiException {
                         producer.send(requestMessage);
                     }
                 } catch (JMSException e) {
-                    log.warn(String.format("%s: %s", FEIL_KOENAVN, e.getMessage()), e);
+                    log.warn("%s: %s".formatted(FEIL_KOENAVN, e.getMessage()), e);
                     return e.getMessage();
                 }
 
                 TextMessage responseMessage;
 
                 /* Wait for response */
-                String attributes = String.format("JMSCorrelationID='%s'", requestMessage.getJMSMessageID());
+                String attributes = "JMSCorrelationID='%s'".formatted(requestMessage.getJMSMessageID());
 
                 try (MessageConsumer consumer = session.createConsumer(responseDestination, attributes)) {
 
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java
index 7f20c5ba373..625ca635bfa 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java
@@ -5,8 +5,8 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java
index e89d3d659b3..5257989293b 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java
@@ -5,7 +5,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java
index 44ec5360fc0..f001d0bea9b 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java
@@ -5,8 +5,8 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java
index 48c2da1de5e..df3d5fda5c8 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java
@@ -5,7 +5,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java
index fa76006c75b..eb2ae56008e 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java
@@ -8,8 +8,8 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java
index 0b00c236c02..36692c2e025 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java
@@ -6,7 +6,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java
index 7b1242956d0..da30f78b05c 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java
@@ -9,8 +9,8 @@
 import lombok.experimental.SuperBuilder;
 import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import java.util.List;
 
 @Data
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java
index 95ae53feec1..56560c6fa47 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java
@@ -6,7 +6,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java
index 39cc3575ac6..f73b95052f5 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java
@@ -3,7 +3,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @SuperBuilder
 @NoArgsConstructor
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java
index 77773276e19..9f78c0345a9 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java
@@ -8,8 +8,8 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java
index c8f81bcf8f5..d05bfa0d0a6 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java
@@ -6,7 +6,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java
index 19d1d4ce522..3690473446c 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java
@@ -5,8 +5,8 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java
index 5802c76f163..9767b645e7c 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java
@@ -5,7 +5,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java
index 2f35e528205..845e026accd 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java
@@ -6,7 +6,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @SuperBuilder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java
index bc301ea802e..2715f3a8fbb 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java
@@ -5,7 +5,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Builder
 @NoArgsConstructor
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java
index 24f0a28ccb8..c6901b839c5 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java
@@ -5,7 +5,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @Builder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java
index 4edca47fde4..e0d4bf2febb 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java
@@ -10,8 +10,8 @@
 import lombok.NoArgsConstructor;
 import no.nav.tps.ctg.m201.domain.TpsServiceRutineType;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java
index 22f7ce43e54..4a9f69f5fe5 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java
@@ -6,7 +6,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @Data
 @Builder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java
index d94489562fe..fa2e3dc3c6c 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java
@@ -5,7 +5,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @Data
 @Builder
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java
index 03bc6870493..7d26e78d43c 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java
@@ -34,7 +34,7 @@ public ConnectionFactory createConnectionFactory(QueueManager queueManager) thro
         factory.setChannel(queueManager.channel());
 
         if (log.isInfoEnabled()) {
-            log.info(String.format("Creating connection factory '%s@%s:%d' on channel '%s' using transport type '%d'",
+            log.info("Creating connection factory '%s@%s:%d' on channel '%s' using transport type '%d'".formatted(
                     factory.getQueueManager(),
                     factory.getHostName(),
                     factory.getPort(),
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java
index abeb720d1bd..dcd08fd69ec 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java
@@ -16,7 +16,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import static java.lang.String.format;
 import static java.util.Objects.nonNull;
 import static no.nav.testnav.libs.data.tpsmessagingservice.v1.AdresseDTO.Adressetype.GATE;
 import static no.nav.testnav.libs.data.tpsmessagingservice.v1.AdresseDTO.Adressetype.MATR;
@@ -52,7 +51,7 @@ public void mapAtoB(PostAdresseType source, PostadresseDTO target, MappingContex
 
                         if (POST_NORGE.equals(source.getAdresseType())) {
 
-                            target.setPostLinje3(format("%s %s", source.getPostnr(), source.getPoststed()));
+                            target.setPostLinje3("%s %s".formatted(source.getPostnr(), source.getPoststed()));
                             target.setPostLand(NORGE);
 
                         } else {
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java
index 9f541362384..3e98c52cb54 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java
@@ -11,7 +11,6 @@
 
 import java.time.LocalDate;
 
-import static java.lang.String.format;
 import static java.util.Objects.isNull;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -70,7 +69,7 @@ public void mapAtoB(BankkontonrNorskDTO source, BankkontoNorskRequest.BrukerIden
                     public void mapAtoB(BankkontoNorgeType source, BankkontonrNorskDTO target, MappingContext context) {
 
                         target.setKontonummer(isBlank(source.getKontoNummer()) ? null :
-                                format("%s.%s.%s", source.getKontoNummer().substring(0, 4),
+                                "%s.%s.%s".formatted(source.getKontoNummer().substring(0, 4),
                                         source.getKontoNummer().substring(4, 6), source.getKontoNummer().substring(6)));
 
                         target.setKontoRegdato(isBlank(source.getRegTidspunkt()) ? null :
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java
index 05c38a36872..d06c15fb25b 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java
@@ -12,8 +12,8 @@
 import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java
index 26b6ca28743..2c4b34fdb11 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java
@@ -12,8 +12,8 @@
 import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java
index e1a30666c4b..c802a804804 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java
@@ -12,8 +12,8 @@
 import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java
index 73c6c471d7b..e162d75ff61 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java
@@ -1,6 +1,12 @@
 package no.nav.testnav.apps.tpsmessagingservice.service;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.apps.tpsmessagingservice.consumer.ServicerutineConsumer;
@@ -15,8 +21,7 @@
 import no.nav.tps.ctg.m201.domain.TpsServiceRutineType;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.List;
@@ -42,23 +47,21 @@ public class IdentService {
     private final XmlMapper xmlMapper;
 
     public IdentService(ServicerutineConsumer servicerutineConsumer,
-                        TestmiljoerServiceConsumer testmiljoerServiceConsumer,
-                        XmlMapper xmlMapper) throws JAXBException {
+                        TestmiljoerServiceConsumer testmiljoerServiceConsumer)
+            throws JAXBException {
         this.servicerutineConsumer = servicerutineConsumer;
         this.testmiljoerServiceConsumer = testmiljoerServiceConsumer;
         this.requestContext = JAXBContext.newInstance(TpsPersonData.class);
-        this.xmlMapper = xmlMapper;
-    }
-
-    @SneakyThrows
-    public static String marshallToXML(JAXBContext requestContext, TpsPersonData endringsmelding) {
-
-        var marshaller = requestContext.createMarshaller();
-
-        var writer = new StringWriter();
-        marshaller.marshal(endringsmelding, writer);
-
-        return writer.toString();
+        this.xmlMapper = XmlMapper
+                .builder()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true)
+                .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true)
+                .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+                .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
+                .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+                .build();
+        ;
     }
 
     public List<TpsIdentStatusDTO> getIdenter(List<String> identer, List<String> miljoer, Boolean includeProd) {
@@ -89,6 +92,18 @@ public List<TpsIdentStatusDTO> getIdenter(List<String> identer, List<String> mil
                 .toList();
     }
 
+    @SneakyThrows
+    public static String marshallToXML(JAXBContext requestContext, TpsPersonData endringsmelding) {
+
+        var marshaller = requestContext.createMarshaller();
+
+        var writer = new StringWriter();
+        JAXBElement<TpsPersonData> element = new JAXBElement<>(new QName("", "tpsPersonData"), TpsPersonData.class, endringsmelding);
+        marshaller.marshal(element, writer);
+
+        return writer.toString();
+    }
+
     private boolean exists(String ident, TpsServicerutineM201Response response) {
 
         return nonNull(response.getTpsSvar()) &&
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java
index 544bb512ede..580f1c9852f 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java
@@ -26,8 +26,8 @@
 import org.json.XML;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java
index 230e9b6db06..eaa2b56b79b 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java
@@ -12,8 +12,8 @@
 import no.nav.testnav.libs.data.tpsmessagingservice.v1.SikkerhetTiltakDTO;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java
index 5a7fd206873..60054cfe769 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java
@@ -1,5 +1,7 @@
 package no.nav.testnav.apps.tpsmessagingservice.service;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
 import ma.glasnost.orika.MappingContext;
@@ -12,8 +14,6 @@
 import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java
index b3ef9da96f7..a2e85aa1be0 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java
@@ -7,8 +7,8 @@
 import no.nav.testnav.apps.tpsmessagingservice.dto.EndringsmeldingResponse;
 import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.io.StringReader;
 import java.io.StringWriter;
 
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java
index a1e1238c7a6..5833499e2f0 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java
@@ -4,7 +4,7 @@
 import lombok.experimental.UtilityClass;
 import no.nav.testnav.apps.tpsmessagingservice.dto.TpsServicerutineRequest;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 import java.io.StringWriter;
 
 @UtilityClass
diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java
index f076ecae919..8e6383d5fbb 100644
--- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java
+++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java
@@ -53,9 +53,9 @@ public String translitterer(String str) {
             return null;
         }
 
-        val prepared = preprocess(str);
-        val normalized = pattern.matcher(Normalizer.normalize(prepared, Normalizer.Form.NFD)).replaceAll("");
-        val processed = postprocess(normalized);
+        final var prepared = preprocess(str);
+        final var normalized = pattern.matcher(Normalizer.normalize(prepared, Normalizer.Form.NFD)).replaceAll("");
+        final var processed = postprocess(normalized);
         String text = convertKnownCharactersNotHandledByNormalization(processed);
         return cyrillicToLatinTrans.transliterate(text);
     }
diff --git a/apps/tps-messaging-service/src/main/resources/application-local.yaml b/apps/tps-messaging-service/src/main/resources/application-local.yaml
index cdcdcf65c9f..449f2fdb185 100644
--- a/apps/tps-messaging-service/src/main/resources/application-local.yaml
+++ b/apps/tps-messaging-service/src/main/resources/application-local.yaml
@@ -1,4 +1,4 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-tps-messaging-service
+TOKEN_X_ISSUER: dummy
 
 config:
   mq:
diff --git a/apps/tps-messaging-service/src/main/resources/application.yaml b/apps/tps-messaging-service/src/main/resources/application.yaml
index 4e145094f38..3e415e2e3d7 100644
--- a/apps/tps-messaging-service/src/main/resources/application.yaml
+++ b/apps/tps-messaging-service/src/main/resources/application.yaml
@@ -13,9 +13,12 @@ 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:
+      enabled: false
 
 springdoc:
   swagger-ui:
diff --git a/apps/tps-messaging-service/src/test/Resources/application-test.yaml b/apps/tps-messaging-service/src/test/Resources/application-test.yaml
index c26aab17ea7..9996130350b 100644
--- a/apps/tps-messaging-service/src/test/Resources/application-test.yaml
+++ b/apps/tps-messaging-service/src/test/Resources/application-test.yaml
@@ -12,4 +12,10 @@ consumers:
       url: http://not.actually.used
       cluster: dev-gcp
       namespace: dolly
-      name: testnav-miljoer-service
\ No newline at end of file
+      name: testnav-miljoer-service
+
+TOKEN_X_ISSUER: dummy
+spring:
+  cloud:
+    vault:
+      enabled: false
\ No newline at end of file
diff --git a/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java b/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java
index 5d23958f274..bdd45254bf4 100644
--- a/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java
+++ b/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java
@@ -1,5 +1,6 @@
 package no.nav.testnav.apps.tpsmessagingservice;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -9,6 +10,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
+@Disabled
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle
index 0e96a301760..37dd5dae595 100644
--- a/apps/udi-stub/build.gradle
+++ b/apps/udi-stub/build.gradle
@@ -1,9 +1,10 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java'
-    id "uk.co.boothen.gradle.wsimport" version "0.18"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "uk.co.boothen.gradle.wsimport" version "0.21"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
+    id("org.openrewrite.rewrite") version("6.6.4")
     id "jacoco"
 }
 
@@ -18,6 +19,10 @@ jacocoTestReport {
     }
 }
 
+rewrite {
+    activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2")
+}
+
 sonarqube {
     properties {
         property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
@@ -37,7 +42,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -51,6 +56,7 @@ configurations {
 }
 
 bootJar {
+    duplicatesStrategy(DuplicatesStrategy.INCLUDE)
     archiveFileName = "app.jar"
 }
 
@@ -74,8 +80,11 @@ repositories {
 }
 dependencies {
 
+    rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0")
+
     implementation platform('org.testcontainers:testcontainers-bom:1.19.1')
 
+    implementation "com.sun.xml.ws:jaxws-rt:4.0.2"
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:servlet-security'
     implementation 'no.nav.testnav.libs:database'
@@ -100,17 +109,18 @@ dependencies {
 
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'com.h2database:h2'
+    testImplementation "org.junit.jupiter:junit-jupiter:5.10.1"
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-    testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5
+    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' //TODO upgrade to JUnit5
 
+    testImplementation "org.mockito:mockito-junit-jupiter:4.11.0"
     implementation 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
diff --git a/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties b/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
index b6eb3a1b723..d8870907b9a 100644
--- a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
+++ b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
@@ -15,4 +15,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(UdiStubApplicationStarter.class, args);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java b/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java
index 3cd1c00c271..8668160175a 100644
--- a/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java
+++ b/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java
@@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
         }
         var token = System.getProperty(VAULT_PROPERTY);
         if (isBlank(token)) {
-            throw new IllegalArgumentException(String.format("Påkrevet property '%s' er ikke satt.", VAULT_PROPERTY));
+            throw new IllegalArgumentException("Påkrevet property '%s' er ikke satt.".formatted(VAULT_PROPERTY));
         }
         return new TokenAuthentication(System.getProperty(VAULT_PROPERTY));
     }
diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java b/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java
index 0d1ba54a8de..7b4060542a7 100644
--- a/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java
+++ b/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java
@@ -30,7 +30,7 @@ public List<Kodeverk> finnAlleMedType(String type) {
     public Kodeverk finnMedKode(String kode) {
         return kodeverkRepository.findByKode(kode).orElseThrow(() ->
                 new HttpClientErrorException(HttpStatus.NOT_FOUND,
-                        String.format("Kunne ikke finne kode: %s i kodeverket", kode))
+                        "Kunne ikke finne kode: %s i kodeverket".formatted(kode))
         );
     }
 
diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java b/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java
index b58dfc9eb62..f9e00975643 100644
--- a/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java
+++ b/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java
@@ -45,14 +45,14 @@ public UdiPerson finnPerson(String ident) {
 
         return personRepository.findByIdent(ident)
                 .map(person -> mapperFacade.map(person, UdiPerson.class))
-                .orElseThrow(() -> new NotFoundException(String.format(IKKE_FUNNET, ident)));
+                .orElseThrow(() -> new NotFoundException(IKKE_FUNNET.formatted(ident)));
     }
 
     @Transactional
     public void deletePerson(String ident) {
 
         var slettePerson = personRepository.findByIdent(ident)
-                .orElseThrow(() -> new NotFoundException(String.format(IKKE_FUNNET, ident)));
+                .orElseThrow(() -> new NotFoundException(IKKE_FUNNET.formatted(ident)));
         personRepository.deleteById(slettePerson.getId());
     }
 }
diff --git a/apps/udi-stub/src/main/resources/application.yml b/apps/udi-stub/src/main/resources/application.yml
index 0fe4b83b6f8..0649406cfed 100644
--- a/apps/udi-stub/src/main/resources/application.yml
+++ b/apps/udi-stub/src/main/resources/application.yml
@@ -24,8 +24,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:testnav-udi-stub
 
 springdoc:
diff --git a/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd b/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd
index 36a3145f8b5..1e5d9306ab4 100755
--- a/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd
+++ b/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd
@@ -1,58 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2011 rel. 3 sp1 (x64) (http://www.altova.com) by Utlendingsdirektoratet (Utlendingsdirektoratet) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://udi.no/Common/Headers/v2" targetNamespace="http://udi.no/Common/Headers/v2" elementFormDefault="qualified">
-  <xs:element name="RequestHeader" type="RequestHeaderType" nillable="true" />
-  <xs:complexType name="RequestHeaderType">
-    <xs:annotation>
-      <xs:documentation>Headeren som blir brukt av alle tjenester</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="UoW" type="UoWType" minOccurs="0" />
-      <xs:element name="Opphav" type="OpphavType" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="UoWType">
-    <xs:annotation>
-      <xs:documentation>Unit of Work. Benyttes i headers</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Id" type="xs:string" minOccurs="0">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://udi.no/Common/Headers/v2"
+           targetNamespace="http://udi.no/Common/Headers/v2" elementFormDefault="qualified">
+    <xs:element name="RequestHeader" type="RequestHeaderType" nillable="true"/>
+    <xs:complexType name="RequestHeaderType">
         <xs:annotation>
-          <xs:documentation>Id til den logiske transaksjonen.</xs:documentation>
+            <xs:documentation>Headeren som blir brukt av alle tjenester</xs:documentation>
         </xs:annotation>
-      </xs:element>
-      <xs:element name="MeldingsId" type="xs:string" minOccurs="0">
+        <xs:sequence>
+            <xs:element name="UoW" type="UoWType" minOccurs="0"/>
+            <xs:element name="Opphav" type="OpphavType" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UoWType">
         <xs:annotation>
-          <xs:documentation>Id til meldingen.</xs:documentation>
+            <xs:documentation>Unit of Work. Benyttes i headers</xs:documentation>
         </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="OpphavType">
-    <xs:annotation>
-      <xs:documentation>Informasjon om kallets opphav. Benyttes i headers</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Brukernavn" type="xs:string" minOccurs="0">
+        <xs:sequence>
+            <xs:element name="Id" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Id til den logiske transaksjonen.</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="MeldingsId" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Id til meldingen.</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="OpphavType">
         <xs:annotation>
-          <xs:documentation>Active Directory brukernavn på formatet domain\user</xs:documentation>
+            <xs:documentation>Informasjon om kallets opphav. Benyttes i headers</xs:documentation>
         </xs:annotation>
-      </xs:element>
-      <xs:element name="Systemtjenestenavn" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Navn på systemtjenesten som utførte det opprinnelige kallet</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Nettadresse" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>IP eller DNS -navn  til maskinen som utførte det opprinnelige kallet</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Tidspunkt" type="xs:dateTime" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Tidspunktet for det opprinnelige kallet</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
+        <xs:sequence>
+            <xs:element name="Brukernavn" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Active Directory brukernavn på formatet domain user</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Systemtjenestenavn" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Navn på systemtjenesten som utførte det opprinnelige kallet</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Nettadresse" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>IP eller DNS -navn til maskinen som utførte det opprinnelige kallet
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Tidspunkt" type="xs:dateTime" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Tidspunktet for det opprinnelige kallet</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java b/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java
index 921fa3c9636..3ba545f12ae 100644
--- a/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java
+++ b/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java
@@ -1,7 +1,6 @@
 package no.nav.udistub.converter;
 
 import no.nav.udistub.converter.ws.ArbeidsadgangWsConverter;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -10,6 +9,7 @@
 import static no.nav.udistub.converter.DefaultTestData.TEST_ARBEIDOMGANGKATEGORI;
 import static no.nav.udistub.converter.DefaultTestData.TEST_ARBEIDSADGANG;
 import static no.nav.udistub.converter.DefaultTestData.TEST_ARBEIDSADGANG_TYPE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -23,9 +23,9 @@ class ArbeidsadgangPersonConverterTest extends ConverterTestBase {
     void convertFromPersonToArbeidsadgangIfPresent() {
         no.udi.mt_1067_nav_data.v1.Arbeidsadgang result = arbeidsadgangConverter.convert(defaultTestPerson.getArbeidsadgang());
         assertNotNull(result);
-        Assertions.assertEquals(TEST_ARBEIDSADGANG, result.getHarArbeidsadgang());
-        Assertions.assertEquals(TEST_ARBEIDOMGANGKATEGORI, result.getArbeidsOmfang());
-        Assertions.assertEquals(TEST_ARBEIDSADGANG_TYPE, result.getTypeArbeidsadgang());
+        assertEquals(TEST_ARBEIDSADGANG, result.getHarArbeidsadgang());
+        assertEquals(TEST_ARBEIDOMGANGKATEGORI, result.getArbeidsOmfang());
+        assertEquals(TEST_ARBEIDSADGANG_TYPE, result.getTypeArbeidsadgang());
     }
 
     @Test
diff --git a/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java b/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java
index bb42fb13e75..89502df793f 100644
--- a/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java
+++ b/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java
@@ -6,7 +6,6 @@
 import no.udi.mt_1067_nav_data.v1.EOSellerEFTAGrunnlagskategoriOppholdstillatelse;
 import no.udi.mt_1067_nav_data.v1.IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisum;
 import no.udi.mt_1067_nav_data.v1.OppholdsgrunnlagKategori;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -28,10 +27,10 @@ void convertFromPersonToIkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisum
                 defaultTestPerson.getOppholdStatus().getIkkeOppholdstilatelseIkkeVilkaarIkkeVisum());
 
         assertNotNull(result);
-        Assertions.assertEquals(DefaultTestData.TEST_ovrigIkkeOppholdsKategori, result.getOvrigIkkeOpphold().getArsak());
+        assertEquals(DefaultTestData.TEST_ovrigIkkeOppholdsKategori, result.getOvrigIkkeOpphold().getArsak());
 
-        Assertions.assertEquals(DefaultTestData.TEST_INNREISEFORBUD, result.getUtvistMedInnreiseForbud().getInnreiseForbud());
-        Assertions.assertEquals(DefaultTestData.TEST_VARIGHET_UDI, result.getUtvistMedInnreiseForbud().getVarighet());
+        assertEquals(DefaultTestData.TEST_INNREISEFORBUD, result.getUtvistMedInnreiseForbud().getInnreiseForbud());
+        assertEquals(DefaultTestData.TEST_VARIGHET_UDI, result.getUtvistMedInnreiseForbud().getVarighet());
 
         AvslagEllerBortfallAvPOBOSellerTilbakekallEllerFormeltVedtak avslagEllerBortfall = result.getAvslagEllerBortfallAvPOBOSellerTilbakekallEllerFormeltVedtak();
         assertEquals(EOSellerEFTAGrunnlagskategoriOppholdsrett.FAMILIE, avslagEllerBortfall.getAvslagPaSoknadOmOppholdsrettRealitetsBehandlet().getAvslagsGrunnlagEOS());
diff --git a/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java b/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java
index 7f93be643d8..54170daf2a5 100644
--- a/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java
+++ b/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java
@@ -67,7 +67,7 @@ class UdiStubITest {
     private Flyway flyway;
 
     @BeforeEach
-    public void setUp() throws IOException {
+    void setUp() throws IOException {
 
 
         flyway.migrate();
diff --git a/apps/udi-stub/src/test/resources/application-test.yml b/apps/udi-stub/src/test/resources/application-test.yml
index 8edb78eaf38..7e72df27c24 100644
--- a/apps/udi-stub/src/test/resources/application-test.yml
+++ b/apps/udi-stub/src/test/resources/application-test.yml
@@ -14,3 +14,5 @@ spring:
       ddl-auto: create
   flyway:
     enabled: false
+
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle
index b5d7fb05948..fd914d5d157 100644
--- a/apps/varslinger-service/build.gradle
+++ b/apps/varslinger-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -73,7 +73,7 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties b/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml
index 954b7376811..ff0bb76a278 100644
--- a/apps/varslinger-service/src/main/resources/application-local.yml
+++ b/apps/varslinger-service/src/main/resources/application-local.yml
@@ -1,5 +1,3 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
 
 spring:
   h2:
diff --git a/apps/varslinger-service/src/main/resources/application.yml b/apps/varslinger-service/src/main/resources/application.yml
index 9de42b0129a..11ce8b758f9 100644
--- a/apps/varslinger-service/src/main/resources/application.yml
+++ b/apps/varslinger-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: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
diff --git a/apps/varslinger-service/src/test/resources/application-test.properties b/apps/varslinger-service/src/test/resources/application-test.properties
index 08706a33278..483fe127f1f 100644
--- a/apps/varslinger-service/src/test/resources/application-test.properties
+++ b/apps/varslinger-service/src/test/resources/application-test.properties
@@ -1,2 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
\ No newline at end of file
+TOKEN_X_ISSUER= dummy
\ No newline at end of file
diff --git a/docs/_config.yml b/docs/_config.yml
index e1c8d0dff2c..d2958df9953 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -3,7 +3,6 @@ remote_theme: pmarsceill/just-the-docs
 logo: "assets/logo.ico"
 
 exclude: [
-    "applications/avhengighetsanalyse.md",
     "applications/endringsmelding.md",
     "applications/oppsummeringsdokument.md",
     "solution-description/index.md",
diff --git a/docs/applications/avhengighetsanalyse.md b/docs/applications/avhengighetsanalyse.md
deleted file mode 100644
index d62c8a232b4..00000000000
--- a/docs/applications/avhengighetsanalyse.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: default
-title: Avhengighetsanalyse
-parent: Applikasjoner
-has_children: true
----
-
-# Avhengighetsanalyse
-
-Det er laget en applikasjon som analyserer avhengighetene mellom applikasjonene i testnorge-repoet.
-
-### Lenker
-* [Frontend]( https://testnav-applikasjonsanalyse.dev.intern.nav.no/)
-* [Swagger API](https://testnav-applikasjonsanalyse-service.dev.intern.nav.no/swagger)
diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle
index 7690696c88d..a491cd0e734 100644
--- a/examples/reactive-rest-example/build.gradle
+++ b/examples/reactive-rest-example/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -66,7 +66,7 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     runtimeOnly 'com.h2database:h2'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
diff --git a/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties b/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/reactive-rest-example/src/main/resources/application-local.yml b/examples/reactive-rest-example/src/main/resources/application-local.yml
index ff9e565d327..94f1ea3900a 100644
--- a/examples/reactive-rest-example/src/main/resources/application-local.yml
+++ b/examples/reactive-rest-example/src/main/resources/application-local.yml
@@ -1,6 +1,3 @@
-# Rename from vault name to AzureAd name
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
 
 spring:
   application:
diff --git a/examples/reactive-rest-example/src/main/resources/application.yml b/examples/reactive-rest-example/src/main/resources/application.yml
index 15f281e1f60..6842695513b 100644
--- a/examples/reactive-rest-example/src/main/resources/application.yml
+++ b/examples/reactive-rest-example/src/main/resources/application.yml
@@ -13,6 +13,6 @@ 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-person-service
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cf58316ee06..3499ded5c11 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
\ No newline at end of file
+zipStorePath=wrapper/dists
diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle
index f27a00dc5eb..be001c4a993 100644
--- a/libs/avro-schema/build.gradle
+++ b/libs/avro-schema/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'maven-publish'
     id 'com.github.davidmc24.gradle.plugin.avro' version '1.9.1'
diff --git a/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties b/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle
index 146c350740c..aae4cd207d5 100644
--- a/libs/commands/build.gradle
+++ b/libs/commands/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/commands/gradle/wrapper/gradle-wrapper.properties b/libs/commands/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/commands/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/commands/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle
index b3bf815ce1d..9dcca559493 100644
--- a/libs/csv-converter/build.gradle
+++ b/libs/csv-converter/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties b/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle
index c951fe168e5..82d0916d53b 100644
--- a/libs/data-transfer-objects/build.gradle
+++ b/libs/data-transfer-objects/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'maven-publish'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -31,7 +31,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
@@ -54,7 +54,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'jakarta.validation:jakarta.validation-api'
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
diff --git a/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties b/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle
index 9810aaba515..a1d90446323 100644
--- a/libs/data-transfer-search-objects/build.gradle
+++ b/libs/data-transfer-search-objects/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'maven-publish'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -31,7 +31,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
@@ -54,7 +54,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
     implementation 'jakarta.validation:jakarta.validation-api'
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
diff --git a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/database/build.gradle b/libs/database/build.gradle
index 1183d6d9700..23331ecf655 100644
--- a/libs/database/build.gradle
+++ b/libs/database/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -29,8 +29,8 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/libs/database/gradle/wrapper/gradle-wrapper.properties b/libs/database/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/database/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/database/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle
index c5cf6dd5e00..828fd8d0d12 100644
--- a/libs/domain/build.gradle
+++ b/libs/domain/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/domain/gradle/wrapper/gradle-wrapper.properties b/libs/domain/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/domain/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/domain/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle
index fb6b34bd21b..77fd838f1c7 100644
--- a/libs/integration-test/build.gradle
+++ b/libs/integration-test/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -34,7 +34,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/integration-test/gradle/wrapper/gradle-wrapper.properties b/libs/integration-test/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/integration-test/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/integration-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle
index 317acb22b43..a4ad2028083 100644
--- a/libs/kafka-config/build.gradle
+++ b/libs/kafka-config/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties b/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle
index 777db157abc..5fc831d14a3 100644
--- a/libs/kafka-producers/build.gradle
+++ b/libs/kafka-producers/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 group = 'no.nav.testnav.libs'
diff --git a/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties b/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle
index 61415c833b4..fef07c915bf 100644
--- a/libs/reactive-core/build.gradle
+++ b/libs/reactive-core/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'maven-publish'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -35,7 +35,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java b/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java
index 0dce08f6c4c..fd9dbea0fab 100644
--- a/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java
+++ b/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java
@@ -26,13 +26,9 @@ class UriStrippingClientRequestObservationConventionTest {
     void testUriStripping()
             throws URISyntaxException {
 
-        var context = new ClientRequestObservationContext();
+        var context = new ClientRequestObservationContext(ClientRequest
+                .create(GET, new URI(BASE_URI + PATH_AND_PARAMETERS)));
         context.setUriTemplate(BASE_URI + PATH_AND_PARAMETERS_AND_TEMPLATE);
-        context.setRequest(
-                ClientRequest
-                        .create(GET, new URI(BASE_URI + PATH_AND_PARAMETERS))
-                        .build()
-        );
         context.setResponse(
                 ClientResponse
                         .create(HttpStatusCode.valueOf(200))
diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle
index 2797d91860c..40d3be8c44e 100644
--- a/libs/reactive-frontend/build.gradle
+++ b/libs/reactive-frontend/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'maven-publish'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,8 +39,8 @@ repositories {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle
index 449a20ba5c8..491e147d573 100644
--- a/libs/reactive-proxy/build.gradle
+++ b/libs/reactive-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'maven-publish'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,8 +38,8 @@ repositories {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle
index a4005a8861b..014c507e35c 100644
--- a/libs/reactive-security/build.gradle
+++ b/libs/reactive-security/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'maven-publish'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -79,14 +79,14 @@ publishing {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
 dependencies {
 
     implementation 'no.nav.testnav.libs:security-core'
-    implementation 'com.auth0:java-jwt:4.3.0'
+    implementation 'com.auth0:java-jwt:4.4.0'
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
diff --git a/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle
index a1c8f0a023f..584dfa31f23 100644
--- a/libs/reactive-session-security/build.gradle
+++ b/libs/reactive-session-security/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
         mavenBom 'org.springframework.session:spring-session-bom:2021.0.3'
     }
 }
diff --git a/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle
index be95e8dd1ca..96758b46d52 100644
--- a/libs/security-core/build.gradle
+++ b/libs/security-core/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/security-core/gradle/wrapper/gradle-wrapper.properties b/libs/security-core/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/security-core/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/security-core/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle
index 2ec98ef8949..5e3a390c8f7 100644
--- a/libs/security-token-service/build.gradle
+++ b/libs/security-token-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties b/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle
index 6c48d7c5b2e..5e13b31a316 100644
--- a/libs/servlet-core/build.gradle
+++ b/libs/servlet-core/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -34,7 +34,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
@@ -53,7 +53,7 @@ java {
 
 dependencies {
 
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
diff --git a/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle
index 14015ae5f5b..133fea9f923 100644
--- a/libs/servlet-insecure-security/build.gradle
+++ b/libs/servlet-insecure-security/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -32,7 +32,7 @@ group = 'no.nav.testnav.libs'
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle
index 8abd3e1b81c..8ed2b4007a5 100644
--- a/libs/servlet-security/build.gradle
+++ b/libs/servlet-security/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -30,7 +30,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle
index e18e9f283a4..dfd824ab17b 100644
--- a/libs/slack/build.gradle
+++ b/libs/slack/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -29,7 +29,7 @@ sonarqube {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/slack/gradle/wrapper/gradle-wrapper.properties b/libs/slack/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/slack/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/slack/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle
index 0291fd18bc1..e145e2b28aa 100644
--- a/libs/testing/build.gradle
+++ b/libs/testing/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -37,8 +37,8 @@ repositories {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1'
     }
 }
 
diff --git a/libs/testing/gradle/wrapper/gradle-wrapper.properties b/libs/testing/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/libs/testing/gradle/wrapper/gradle-wrapper.properties
+++ b/libs/testing/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle
index 59b4e7ffcd9..7487f6dab72 100644
--- a/mocks/maskinporten-mock/build.gradle
+++ b/mocks/maskinporten-mock/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
 }
 
 bootJar {
@@ -11,7 +11,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -33,7 +33,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
 
     compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
 
diff --git a/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties b/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties
+++ b/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle
index 2cc6860008a..ac535e04b82 100644
--- a/mocks/tokendings-mock/build.gradle
+++ b/mocks/tokendings-mock/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
 }
 
 bootJar {
@@ -11,7 +11,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
@@ -34,7 +34,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
 
     compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
     implementation 'org.projectlombok:lombok'
diff --git a/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties b/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties
+++ b/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/navikt/dolly-assets/package-lock.json b/navikt/dolly-assets/package-lock.json
index c91876fd156..1a17910daee 100644
--- a/navikt/dolly-assets/package-lock.json
+++ b/navikt/dolly-assets/package-lock.json
@@ -1933,9 +1933,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/navikt/dolly-komponenter/package-lock.json b/navikt/dolly-komponenter/package-lock.json
index 79d5760079c..ace602c2c80 100644
--- a/navikt/dolly-komponenter/package-lock.json
+++ b/navikt/dolly-komponenter/package-lock.json
@@ -59,7 +59,7 @@
         "rollup-plugin-svg": "^2.0.0",
         "storybook": "^7.4.6",
         "typescript": "^5.1.5",
-        "vite": "^5.0.8"
+        "vite": "^5.0.12"
       },
       "peerDependencies": {
         "react": ">=18.0.0",
@@ -15646,9 +15646,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz",
-      "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/navikt/dolly-komponenter/package.json b/navikt/dolly-komponenter/package.json
index e690f63c9ca..f860668c667 100644
--- a/navikt/dolly-komponenter/package.json
+++ b/navikt/dolly-komponenter/package.json
@@ -74,7 +74,7 @@
     "rollup-plugin-svg": "^2.0.0",
     "storybook": "^7.4.6",
     "typescript": "^5.1.5",
-    "vite": "^5.0.8"
+    "vite": "^5.0.12"
   },
   "repository": "https://github.com/navikt/testnorge.git",
   "prettier": {
diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle
index 562ead1f4be..b69c373e4df 100644
--- a/proxies/aareg-proxy/build.gradle
+++ b/proxies/aareg-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties
index 744c64d1277..3499ded5c11 100644
--- a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/aareg-proxy/src/main/resources/application-local.yaml b/proxies/aareg-proxy/src/main/resources/application-local.yaml
index c228d5d75c5..7d3efcea59b 100644
--- a/proxies/aareg-proxy/src/main/resources/application-local.yaml
+++ b/proxies/aareg-proxy/src/main/resources/application-local.yaml
@@ -1,4 +1,4 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-aareg-proxy
+TOKEN_X_ISSUER: dummy
 
 management:
   endpoint:
diff --git a/proxies/aareg-proxy/src/main/resources/application.yaml b/proxies/aareg-proxy/src/main/resources/application.yaml
index 155fc2463c4..581167fdfe9 100644
--- a/proxies/aareg-proxy/src/main/resources/application.yaml
+++ b/proxies/aareg-proxy/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:
     gateway:
diff --git a/proxies/aareg-proxy/src/test/resources/application-test.properties b/proxies/aareg-proxy/src/test/resources/application-test.properties
new file mode 100644
index 00000000000..e5e55886152
--- /dev/null
+++ b/proxies/aareg-proxy/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle
index d5bc875f65a..4795d92f1e0 100644
--- a/proxies/aareg-synt-services-proxy/build.gradle
+++ b/proxies/aareg-synt-services-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application.yml
index 1a19b871615..c071ceed37d 100644
--- a/proxies/aareg-synt-services-proxy/src/main/resources/application.yml
+++ b/proxies/aareg-synt-services-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties b/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties
index f44e7773252..e5e55886152 100644
--- a/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties
+++ b/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle
index a65de00fba6..2aa4801eb40 100644
--- a/proxies/arbeidsplassencv-proxy/build.gradle
+++ b/proxies/arbeidsplassencv-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties
index 15bc9344b74..c64ee91b762 100644
--- a/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml
index 2ebbe70f171..e9ee116ac3c 100644
--- a/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml
+++ b/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml
@@ -12,9 +12,9 @@ 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
-          accepted-audience: dev-gcp:dolly:testnav-arbeidsplassencv-proxy
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
       httpclient:
diff --git a/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml b/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml
index c84ad4a48ba..f00334410e1 100644
--- a/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml
+++ b/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
-azure.app.client.id: dummy
+TOKEN_X_ISSUER: dummy
 
 consumers:
   arbeidsplassencv:
diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle
index 4a6df72441c..88cd1b74d17 100644
--- a/proxies/arena-forvalteren-proxy/build.gradle
+++ b/proxies/arena-forvalteren-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml
index d1eee5e812a..0ce1e194fba 100644
--- a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml
+++ b/proxies/arena-forvalteren-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml b/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml
index 8f6f189803a..57492dbb248 100644
--- a/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml
+++ b/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml
@@ -4,4 +4,6 @@ app:
       name: arena-dummy
       namespace: teamarenanais
       url: http://arena-dummy.dummy.no
-      cluster: dev-fss
\ No newline at end of file
+      cluster: dev-fss
+
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle
index 19cfcbd172a..42f21702748 100644
--- a/proxies/batch-adeo-proxy/build.gradle
+++ b/proxies/batch-adeo-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/batch-adeo-proxy/src/main/resources/application.yml b/proxies/batch-adeo-proxy/src/main/resources/application.yml
index e8389f54b3f..2254c5bf0bf 100644
--- a/proxies/batch-adeo-proxy/src/main/resources/application.yml
+++ b/proxies/batch-adeo-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/batch-adeo-proxy/src/test/resources/application-test.properties b/proxies/batch-adeo-proxy/src/test/resources/application-test.properties
index f44e7773252..483fe127f1f 100644
--- a/proxies/batch-adeo-proxy/src/test/resources/application-test.properties
+++ b/proxies/batch-adeo-proxy/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER= dummy
\ No newline at end of file
diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle
index f5fc098e409..45fe91852b7 100644
--- a/proxies/brregstub-proxy/build.gradle
+++ b/proxies/brregstub-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/brregstub-proxy/src/main/resources/application.yml b/proxies/brregstub-proxy/src/main/resources/application.yml
index cd8ac31ae01..65a307c0448 100644
--- a/proxies/brregstub-proxy/src/main/resources/application.yml
+++ b/proxies/brregstub-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/brregstub-proxy/src/test/resources/application-test.yml b/proxies/brregstub-proxy/src/test/resources/application-test.yml
index 45a7f438eb7..f05debbd219 100644
--- a/proxies/brregstub-proxy/src/test/resources/application-test.yml
+++ b/proxies/brregstub-proxy/src/test/resources/application-test.yml
@@ -1 +1 @@
-azure.app.client.id: dummy
\ No newline at end of file
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle
index 7ff998bb680..e3cac85e57d 100644
--- a/proxies/dokarkiv-proxy/build.gradle
+++ b/proxies/dokarkiv-proxy/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id "jacoco"
 }
@@ -33,7 +33,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/dokarkiv-proxy/src/main/resources/application.yml b/proxies/dokarkiv-proxy/src/main/resources/application.yml
index 557541271a9..f7ffec35e2d 100644
--- a/proxies/dokarkiv-proxy/src/main/resources/application.yml
+++ b/proxies/dokarkiv-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/dokarkiv-proxy/src/test/resources/application-test.yml b/proxies/dokarkiv-proxy/src/test/resources/application-test.yml
index fb5da8c5127..24e4a7df170 100644
--- a/proxies/dokarkiv-proxy/src/test/resources/application-test.yml
+++ b/proxies/dokarkiv-proxy/src/test/resources/application-test.yml
@@ -1,6 +1,4 @@
-spring.cloud.vault.token: dummy
-azure.app.client.id: dummy
-azure.app.client.secret: dummy
+TOKEN_X_ISSUER: dummy
 
 consumers:
   dokarkiv:
diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle
index 758415a786b..f099ff99afd 100644
--- a/proxies/ereg-proxy/build.gradle
+++ b/proxies/ereg-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/ereg-proxy/src/main/resources/application.yml b/proxies/ereg-proxy/src/main/resources/application.yml
index 84051a419df..7f2ae7279b8 100644
--- a/proxies/ereg-proxy/src/main/resources/application.yml
+++ b/proxies/ereg-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/ereg-proxy/src/test/resources/application-test.properties b/proxies/ereg-proxy/src/test/resources/application-test.properties
index f44e7773252..e5e55886152 100644
--- a/proxies/ereg-proxy/src/test/resources/application-test.properties
+++ b/proxies/ereg-proxy/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle
index f092aeb2e13..f7110211300 100644
--- a/proxies/histark-proxy/build.gradle
+++ b/proxies/histark-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/histark-proxy/src/main/resources/application.yml b/proxies/histark-proxy/src/main/resources/application.yml
index 0fa64ae1791..38fd86cbaf9 100644
--- a/proxies/histark-proxy/src/main/resources/application.yml
+++ b/proxies/histark-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/histark-proxy/src/test/resources/application-test.yml b/proxies/histark-proxy/src/test/resources/application-test.yml
index 737a427b9cc..6c4ae555764 100644
--- a/proxies/histark-proxy/src/test/resources/application-test.yml
+++ b/proxies/histark-proxy/src/test/resources/application-test.yml
@@ -1,2 +1 @@
-azure.app.client.id: dummy
-azure.app.client.secret: dummy
+TOKEN_X_ISSUER: dummy
diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle
index 787c19d21e6..145829eb3f1 100644
--- a/proxies/inntektstub-proxy/build.gradle
+++ b/proxies/inntektstub-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/inntektstub-proxy/src/main/resources/application.yml b/proxies/inntektstub-proxy/src/main/resources/application.yml
index fa886061fdd..d341f86a4e5 100644
--- a/proxies/inntektstub-proxy/src/main/resources/application.yml
+++ b/proxies/inntektstub-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/inntektstub-proxy/src/test/resources/application-test.yml b/proxies/inntektstub-proxy/src/test/resources/application-test.yml
index 45a7f438eb7..f05debbd219 100644
--- a/proxies/inntektstub-proxy/src/test/resources/application-test.yml
+++ b/proxies/inntektstub-proxy/src/test/resources/application-test.yml
@@ -1 +1 @@
-azure.app.client.id: dummy
\ No newline at end of file
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle
index ff5c166e8c1..5ead66b7022 100644
--- a/proxies/inst-proxy/build.gradle
+++ b/proxies/inst-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/inst-proxy/src/main/resources/application.yml b/proxies/inst-proxy/src/main/resources/application.yml
index a3275a98eb8..838ce3ffad1 100644
--- a/proxies/inst-proxy/src/main/resources/application.yml
+++ b/proxies/inst-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
diff --git a/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java
index 8eb36dcd572..a306f7e9271 100644
--- a/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java
+++ b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 class ApplicationContextTest {
 
     @MockBean
diff --git a/proxies/inst-proxy/src/test/resources/application-test.properties b/proxies/inst-proxy/src/test/resources/application-test.properties
new file mode 100644
index 00000000000..e5e55886152
--- /dev/null
+++ b/proxies/inst-proxy/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/Dockerfile b/proxies/kodeverk-proxy/Dockerfile
deleted file mode 100644
index 4a36f93546f..00000000000
--- a/proxies/kodeverk-proxy/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ghcr.io/navikt/baseimages/temurin:21
-LABEL maintainer="Team Dolly"
-
-ENV JAVA_OPTS="-Dspring.profiles.active=prod"
-
-ADD /build/libs/app.jar /app/app.jar
-
-EXPOSE 8080
diff --git a/proxies/kodeverk-proxy/gradlew b/proxies/kodeverk-proxy/gradlew
deleted file mode 100755
index 4f906e0c811..00000000000
--- a/proxies/kodeverk-proxy/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/Consumers.java b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/Consumers.java
deleted file mode 100644
index 506a9d32909..00000000000
--- a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/Consumers.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package no.nav.testnav.proxies.kodeverkproxy;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import static lombok.AccessLevel.PACKAGE;
-
-/**
- * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}.
- * <br/><br/>
- * Husk at Spring Boot bruker <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding">relaxed binding</a>
- * mellom configuration properties og field names.
- *
- * @see ServerProperties
- */
-@Configuration
-@ConfigurationProperties(prefix = "consumers")
-@NoArgsConstructor(access = PACKAGE)
-@Getter
-@Setter(PACKAGE)
-public class Consumers {
-
-    private ServerProperties kodeverk;
-}
diff --git a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java
deleted file mode 100644
index fac642b1d5b..00000000000
--- a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package no.nav.testnav.proxies.kodeverkproxy;
-
-import no.nav.testnav.libs.reactivecore.config.CoreConfig;
-import no.nav.testnav.libs.reactiveproxy.config.DevConfig;
-import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
-import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
-import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange;
-import no.nav.testnav.libs.securitycore.domain.AccessToken;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-
-@Import({
-        CoreConfig.class,
-        DevConfig.class,
-        SecurityConfig.class,
-        SecureOAuth2ServerToServerConfiguration.class
-})
-@SpringBootApplication
-public class KodeverkProxyApplicationStarter {
-    @Bean
-    public RouteLocator customRouteLocator(
-            RouteLocatorBuilder builder,
-            TokenExchange tokenExchange,
-            Consumers consumers
-    ) {
-        var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory
-                .bearerAuthenticationHeaderFilter(
-                        () -> tokenExchange
-                                .exchange(consumers.getKodeverk())
-                                .map(AccessToken::getTokenValue));
-        return builder
-                .routes()
-                .route(spec -> spec
-                        .path("/**")
-                        .filters(filterSpec -> filterSpec.filter(addAuthenticationHeaderDevFilter))
-                        .uri(consumers.getKodeverk().getUrl())
-                )
-                .build();
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(KodeverkProxyApplicationStarter.class, args);
-    }
-}
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/StatusController.java b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/StatusController.java
deleted file mode 100644
index 1c50d065a73..00000000000
--- a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/StatusController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package no.nav.testnav.proxies.kodeverkproxy;
-
-import no.nav.testnav.libs.dto.status.v1.TestnavStatusResponse;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-import java.util.Map;
-
-@RestController
-public class StatusController {
-    private static final String TEAM = "org";
-
-    @GetMapping(value = "/internal/status", produces = MediaType.APPLICATION_JSON_VALUE)
-    public Map<String, TestnavStatusResponse> getStatus() {
-        var statusWebClient = WebClient.builder().build();
-
-        var pensjonStatus = checkConsumerStatus(
-                "http://kodeverk.org.svc.nais.local/internal/isAlive",
-                "http://kodeverk.org.svc.nais.local/internal/isReady",
-                statusWebClient);
-
-        return Map.of(
-                "kodeverk", pensjonStatus
-        );
-    }
-
-    public TestnavStatusResponse checkConsumerStatus(String aliveUrl, String readyUrl, WebClient webClient) {
-        TestnavStatusResponse status = TestnavStatusResponse.builder().team(TEAM).build();
-
-        Thread blockingThread = new Thread(() -> {
-            status.setAlive(
-                    checkStatus(webClient, aliveUrl)
-                            .blockOptional()
-                            .orElse("Error: Empty response")
-            );
-            status.setReady(
-                    checkStatus(webClient, readyUrl)
-                            .blockOptional()
-                            .orElse("Error: Empty response")
-            );
-        });
-        blockingThread.start();
-        try {
-            blockingThread.join();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-
-        return status;
-    }
-
-    private Mono<String> checkStatus(WebClient webClient, String url) {
-        return webClient.get().uri(url)
-                .retrieve()
-                .bodyToMono(String.class)
-                .defaultIfEmpty("OK")
-                .onErrorResume(Exception.class, error -> Mono.just("Error: " + error.getMessage()))
-                .doOnSuccess(result -> Mono.just("OK"))
-                .map(result -> result.startsWith("Error:") ? result : "OK");
-    }
-}
diff --git a/proxies/kodeverk-proxy/src/main/resources/application.yml b/proxies/kodeverk-proxy/src/main/resources/application.yml
deleted file mode 100644
index bedf1d6543a..00000000000
--- a/proxies/kodeverk-proxy/src/main/resources/application.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
-spring:
-  application:
-    name: testnav-kodeverk-proxy
-    description: Proxy for kodeverk som legger på sikkerhet.
-  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: ${TOKEN_X_CLIENT_ID}
-  cloud:
-    gateway:
-      httpclient:
-        response-timeout: 240s
-    vault:
-      enabled: false
-
-consumers:
-  kodeverk:
-    name: kodeverk-dev
-    namespace: team-rocket
-    url: http://kodeverk.org.svc.nais.local
-    cluster: dev-fss
diff --git a/proxies/kodeverk-proxy/src/test/resources/application-test.properties b/proxies/kodeverk-proxy/src/test/resources/application-test.properties
deleted file mode 100644
index 18ea64dc24a..00000000000
--- a/proxies/kodeverk-proxy/src/test/resources/application-test.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
-proxy.url=http://localhost
\ No newline at end of file
diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle
index 23d60690e26..05dd251679b 100644
--- a/proxies/kontoregister-person-proxy/build.gradle
+++ b/proxies/kontoregister-person-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application.yml b/proxies/kontoregister-person-proxy/src/main/resources/application.yml
index 3150f6b602c..da810748166 100644
--- a/proxies/kontoregister-person-proxy/src/main/resources/application.yml
+++ b/proxies/kontoregister-person-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml b/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml
index a45d3c87283..6c4ae555764 100644
--- a/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml
+++ b/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml
@@ -1 +1 @@
-azure.app.client.id: dummy
+TOKEN_X_ISSUER: dummy
diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle
index 26793591028..eed7e2de074 100644
--- a/proxies/krrstub-proxy/build.gradle
+++ b/proxies/krrstub-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/krrstub-proxy/src/main/resources/application.yml b/proxies/krrstub-proxy/src/main/resources/application.yml
index c17b2fce09a..ff8220fce27 100644
--- a/proxies/krrstub-proxy/src/main/resources/application.yml
+++ b/proxies/krrstub-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/krrstub-proxy/src/test/resources/application-test.yml b/proxies/krrstub-proxy/src/test/resources/application-test.yml
index 45a7f438eb7..f05debbd219 100644
--- a/proxies/krrstub-proxy/src/test/resources/application-test.yml
+++ b/proxies/krrstub-proxy/src/test/resources/application-test.yml
@@ -1 +1 @@
-azure.app.client.id: dummy
\ No newline at end of file
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle
index 98f419a895e..b05186d822d 100644
--- a/proxies/medl-proxy/build.gradle
+++ b/proxies/medl-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/medl-proxy/src/main/resources/application.yml b/proxies/medl-proxy/src/main/resources/application.yml
index 91d852e5fac..83dedfa1672 100644
--- a/proxies/medl-proxy/src/main/resources/application.yml
+++ b/proxies/medl-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/medl-proxy/src/test/resources/application-test.yml b/proxies/medl-proxy/src/test/resources/application-test.yml
index 45a7f438eb7..5f3a2a2c0c8 100644
--- a/proxies/medl-proxy/src/test/resources/application-test.yml
+++ b/proxies/medl-proxy/src/test/resources/application-test.yml
@@ -1 +1,2 @@
-azure.app.client.id: dummy
\ No newline at end of file
+azure.app.client.id: dummy
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle
index e46b9090715..d7d10acfae4 100644
--- a/proxies/norg2-proxy/build.gradle
+++ b/proxies/norg2-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -32,7 +32,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/norg2-proxy/src/main/resources/application.yml b/proxies/norg2-proxy/src/main/resources/application.yml
index 91fe257e6df..656cb23834e 100644
--- a/proxies/norg2-proxy/src/main/resources/application.yml
+++ b/proxies/norg2-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/norg2-proxy/src/test/resources/application-test.yml b/proxies/norg2-proxy/src/test/resources/application-test.yml
index 45a7f438eb7..f05debbd219 100644
--- a/proxies/norg2-proxy/src/test/resources/application-test.yml
+++ b/proxies/norg2-proxy/src/test/resources/application-test.yml
@@ -1 +1 @@
-azure.app.client.id: dummy
\ No newline at end of file
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle
index fb5edf6f87e..26dcd2b3dc5 100644
--- a/proxies/pdl-proxy/build.gradle
+++ b/proxies/pdl-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/pdl-proxy/src/main/resources/application.yml b/proxies/pdl-proxy/src/main/resources/application.yml
index 7a06b7ad5ce..0a99cca928d 100644
--- a/proxies/pdl-proxy/src/main/resources/application.yml
+++ b/proxies/pdl-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/pdl-proxy/src/test/resources/application-test.properties b/proxies/pdl-proxy/src/test/resources/application-test.properties
index aff06b97955..aa18dbf1e43 100644
--- a/proxies/pdl-proxy/src/test/resources/application-test.properties
+++ b/proxies/pdl-proxy/src/test/resources/application-test.properties
@@ -1,6 +1,4 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
+TOKEN_X_ISSUER=dummy
 
 sts.token.provider.username=dummy
 sts.token.provider.password=dummy
diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle
index aba01e473d2..1b5b751a3cf 100644
--- a/proxies/pensjon-testdata-facade-proxy/build.gradle
+++ b/proxies/pensjon-testdata-facade-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml
index b81dba22e28..a39776feb28 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml
+++ b/proxies/pensjon-testdata-facade-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml b/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml
index f693ce3567f..30e48d6e0e9 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml
+++ b/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
-azure.app.client.id: dummy
+TOKEN_X_ISSUER: dummy
 
 consumers:
   samboer-testdata:
diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle
index b429e7fe74f..083cac16fbc 100644
--- a/proxies/saf-proxy/build.gradle
+++ b/proxies/saf-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/saf-proxy/src/main/resources/application.yml b/proxies/saf-proxy/src/main/resources/application.yml
index 962d2834e86..c7952e5627b 100644
--- a/proxies/saf-proxy/src/main/resources/application.yml
+++ b/proxies/saf-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/saf-proxy/src/test/resources/application-test.yml b/proxies/saf-proxy/src/test/resources/application-test.yml
index a5f9b6a19d2..3a0b87cb27e 100644
--- a/proxies/saf-proxy/src/test/resources/application-test.yml
+++ b/proxies/saf-proxy/src/test/resources/application-test.yml
@@ -1,5 +1,4 @@
-azure.app.client.id: dummy
-azure.app.client.secret: dummy
+TOKEN_X_ISSUER: dummy
 consumers:
   saf:
     url: http://saf-dummy.dummy.no
diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle
index b5b93f70080..852155d7368 100644
--- a/proxies/sigrunstub-proxy/build.gradle
+++ b/proxies/sigrunstub-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/sigrunstub-proxy/src/main/resources/application.yml b/proxies/sigrunstub-proxy/src/main/resources/application.yml
index b0ef8d47ecd..f2667f033bc 100644
--- a/proxies/sigrunstub-proxy/src/main/resources/application.yml
+++ b/proxies/sigrunstub-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/sigrunstub-proxy/src/test/resources/application-test.properties b/proxies/sigrunstub-proxy/src/test/resources/application-test.properties
index f44e7773252..e5e55886152 100644
--- a/proxies/sigrunstub-proxy/src/test/resources/application-test.properties
+++ b/proxies/sigrunstub-proxy/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
\ No newline at end of file
+TOKEN_X_ISSUER=dummy
\ No newline at end of file
diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle
index a711ce5a38a..cfc1d9540d6 100644
--- a/proxies/skjermingsregister-proxy/build.gradle
+++ b/proxies/skjermingsregister-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -23,7 +23,7 @@ sonarqube {
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.token", System.getenv("SONAR_TOKEN")
+        property "sonar.login", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-skjermingsregister-proxy"
@@ -39,36 +39,41 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
 repositories {
-    mavenCentral()
     mavenCentral()
     mavenLocal()
 }
 
 dependencies {
-
+    
+    implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:reactive-core'
     implementation 'no.nav.testnav.libs:reactive-proxy'
-    implementation 'no.nav.testnav.libs:security-token-service'
+    implementation 'no.nav.testnav.libs:reactive-security'
     implementation 'no.nav.testnav.libs:data-transfer-objects'
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
+    
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
     implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
-    
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation 'org.springframework.security:spring-security-test'
+
+    annotationProcessor 'org.projectlombok:lombok'
+    implementation 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 }
+
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)
diff --git a/proxies/skjermingsregister-proxy/config.yml b/proxies/skjermingsregister-proxy/config.yml
index 5b935a86541..615a070f4e1 100644
--- a/proxies/skjermingsregister-proxy/config.yml
+++ b/proxies/skjermingsregister-proxy/config.yml
@@ -1,14 +1,29 @@
-apiVersion: "nais.io/v1alpha1"
-kind: "Application"
+---
+apiVersion: nais.io/v1
+kind: AzureAdApplication
+metadata:
+  name: testnav-skjermingsregister-proxy-trygdeetaten
+  namespace: dolly
+  labels:
+    team: dolly
+spec:
+  secretName: azure-trygdeetaten-testnav-skjermingsregister-proxy-trygdeetaten
+  secretKeyPrefix: "AZURE_TRYGDEETATEN"
+  tenant: trygdeetaten.no
+---
+apiVersion: nais.io/v1alpha1
+kind: Application
 metadata:
   name: testnav-skjermingsregister-proxy
   namespace: dolly
   labels:
     team: dolly
 spec:
-  image: "{{image}}"
+  image: {{image}}
   port: 8080
   webproxy: true
+  tokenx:
+    enabled: true
   azure:
     application:
       allowAllUsers: true
@@ -34,6 +49,10 @@ spec:
         - application: app-1
           namespace: plattformsikkerhet
           cluster: dev-gcp
+    outbound:
+      rules:
+        - application: skjermede-personer
+          namespace: nom
   liveness:
     path: /internal/isAlive
     initialDelay: 4
@@ -55,5 +74,7 @@ spec:
       memory: 1024Mi
     limits:
       memory: 2048Mi
+  envFrom:
+    - secret: azure-trygdeetaten-testnav-skjermingsregister-proxy-trygdeetaten
   ingresses:
     - "https://testnav-skjermingsregister-proxy.dev-fss-pub.nais.io"
\ No newline at end of file
diff --git a/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/Consumers.java b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/Consumers.java
new file mode 100644
index 00000000000..c2f34180298
--- /dev/null
+++ b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/Consumers.java
@@ -0,0 +1,22 @@
+package no.nav.testnav.proxies.skjermingsregisterproxy;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+
+import static lombok.AccessLevel.PACKAGE;
+
+@Configuration
+@ConfigurationProperties(prefix = "consumers")
+@NoArgsConstructor(access = PACKAGE)
+@Getter
+@Setter(PACKAGE)
+public class Consumers {
+
+    private ServerProperties skjermingsregister;
+
+}
diff --git a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/LocalVaultConfig.java b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/LocalVaultConfig.java
new file mode 100644
index 00000000000..de96737cf66
--- /dev/null
+++ b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/LocalVaultConfig.java
@@ -0,0 +1,42 @@
+package no.nav.testnav.proxies.skjermingsregisterproxy;
+
+import io.micrometer.common.lang.NonNullApi;
+import no.nav.testnav.libs.reactiveproxy.config.DevConfig;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Profile;
+import org.springframework.vault.annotation.VaultPropertySource;
+import org.springframework.vault.authentication.ClientAuthentication;
+import org.springframework.vault.authentication.TokenAuthentication;
+import org.springframework.vault.client.VaultEndpoint;
+import org.springframework.vault.config.AbstractVaultConfiguration;
+
+import static io.micrometer.common.util.StringUtils.isBlank;
+
+@Profile("local")
+@Import(DevConfig.class)
+@Configuration
+@VaultPropertySource(value = "kv/preprod/fss/testnav-skjermingsregister-proxy/dev", ignoreSecretNotFound = false)
+@NonNullApi
+public class LocalVaultConfig extends AbstractVaultConfiguration {
+
+    static final String TOKEN_PROPERTY_NAME = "spring.cloud.vault.token";
+
+    @Override
+    public VaultEndpoint vaultEndpoint() {
+        return VaultEndpoint.create("vault.adeo.no", 443);
+    }
+
+    @Override
+    public ClientAuthentication clientAuthentication() {
+        if (System.getenv().containsKey("VAULT_TOKEN")) {
+            System.setProperty(TOKEN_PROPERTY_NAME, System.getenv("VAULT_TOKEN"));
+        }
+        var token = System.getProperty(TOKEN_PROPERTY_NAME);
+        if (isBlank(token)) {
+            throw new IllegalArgumentException("Påkrevet property '%s' er ikke satt.".formatted(TOKEN_PROPERTY_NAME));
+        }
+        return new TokenAuthentication(System.getProperty(TOKEN_PROPERTY_NAME));
+    }
+
+}
\ No newline at end of file
diff --git a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfig.java b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfig.java
new file mode 100644
index 00000000000..8841a328d7c
--- /dev/null
+++ b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfig.java
@@ -0,0 +1,48 @@
+package no.nav.testnav.proxies.skjermingsregisterproxy;
+
+import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
+import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
+import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.securitycore.domain.AccessToken;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.route.RouteLocator;
+import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Import({
+        SecureOAuth2ServerToServerConfiguration.class,
+        SecurityConfig.class
+})
+@Configuration
+public class RouteLocatorConfig {
+
+    @Bean
+    public RouteLocator customRouteLocator(
+            RouteLocatorBuilder builder,
+            Consumers consumers,
+            GatewayFilter authenticationFilter
+    ) {
+        return builder
+                .routes()
+                .route(spec -> spec
+                        .path("/**")
+                        .filters(f -> f.filter(authenticationFilter))
+                        .uri(consumers.getSkjermingsregister().getUrl()))
+                .build();
+    }
+
+    @Bean
+    GatewayFilter getAuthenticationFilter(
+            TrygdeetatenAzureAdTokenService tokenService,
+            Consumers consumers
+    ) {
+        return AddAuthenticationRequestGatewayFilterFactory
+                .bearerAuthenticationHeaderFilter(() -> tokenService
+                        .exchange(consumers.getSkjermingsregister())
+                        .map(AccessToken::getTokenValue));
+    }
+
+}
diff --git a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java
index 170d704c300..c4576ca8987 100644
--- a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java
+++ b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java
@@ -1,51 +1,16 @@
 package no.nav.testnav.proxies.skjermingsregisterproxy;
 
 import no.nav.testnav.libs.reactivecore.config.CoreConfig;
-import no.nav.testnav.libs.reactiveproxy.config.DevConfig;
-import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
-import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
-import no.nav.testnav.libs.securitytokenservice.StsOidcTokenService;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 
-@Import({
-        CoreConfig.class,
-        DevConfig.class,
-        SecurityConfig.class
-})
 @SpringBootApplication
+@Import(CoreConfig.class)
 public class SkjermingsregisterProxyApplicationStarter {
+
     public static void main(String[] args) {
         SpringApplication.run(SkjermingsregisterProxyApplicationStarter.class, args);
     }
 
-    @Bean
-    public StsOidcTokenService stsOidcTokenService(
-            @Value("${sts.token.provider.url}") String url,
-            @Value("${sts.token.provider.username}") String username,
-            @Value("${sts.token.provider.password}") String password) {
-
-        return new StsOidcTokenService(url, username, password);
-    }
-
-    @Bean
-    public RouteLocator customRouteLocator(RouteLocatorBuilder builder, StsOidcTokenService stsOidcTokenService) {
-
-        var addAuthenticationHeaderFilter = AddAuthenticationRequestGatewayFilterFactory
-                .bearerAuthenticationHeaderFilter(stsOidcTokenService::getToken);
-
-        return builder.routes()
-                .route(spec -> spec
-                        .path("/**")
-                        .filters(filterSpec -> filterSpec
-                                .filter(addAuthenticationHeaderFilter))
-                        .uri("http://skjermede-personer.nom.svc.nais.local/"))
-                .build();
-    }
-
-}
+}
\ No newline at end of file
diff --git a/proxies/skjermingsregister-proxy/src/main/resources/application-dev.yml b/proxies/skjermingsregister-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 26224023aab..00000000000
--- a/proxies/skjermingsregister-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
diff --git a/proxies/skjermingsregister-proxy/src/main/resources/application.yml b/proxies/skjermingsregister-proxy/src/main/resources/application.yml
index f9a72f66cf5..7ab17a5a1c7 100644
--- a/proxies/skjermingsregister-proxy/src/main/resources/application.yml
+++ b/proxies/skjermingsregister-proxy/src/main/resources/application.yml
@@ -12,17 +12,19 @@ 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:
+      enabled: false
     gateway:
       httpclient:
         response-timeout: 30s
 
-sts:
-  token:
-    provider:
-      url: https://security-token-service.dev.adeo.no/rest/v1/sts/token
-      username: ${STS_TOKEN_PROVIDER_USERNAME}
-      password: ${STS_TOKEN_PROVIDER_PASSWORD}
+consumers:
+  skjermingsregister:
+    name: skjermede-personer
+    namespace: nom
+    url: https://skjermede-personer.dev.adeo.no
+    cluster: dev-fss
diff --git a/proxies/skjermingsregister-proxy/src/main/resources/bootstrap.yml b/proxies/skjermingsregister-proxy/src/main/resources/bootstrap.yml
deleted file mode 100644
index 0451449ca23..00000000000
--- a/proxies/skjermingsregister-proxy/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
-  cloud:
-    vault:
-      enabled: false
\ No newline at end of file
diff --git a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
index 52c15597b3c..e8c92e3122b 100644
--- a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
@@ -37,4 +37,5 @@
     </springProfile>
 
     <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
+
 </configuration>
\ No newline at end of file
diff --git a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/ApplicationContextTest.java b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/ApplicationContextTest.java
deleted file mode 100644
index 9c83fa6454c..00000000000
--- a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/ApplicationContextTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.nav.testnav.proxies.skjermingsregisterproxy;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
-import org.springframework.test.context.ActiveProfiles;
-
-@SpringBootTest
-@ActiveProfiles("test")
-class ApplicationContextTest {
-
-    @MockBean
-    public ReactiveJwtDecoder reactiveJwtDecoder;
-
-    @Test
-    @SuppressWarnings("java:S2699")
-    void load_app_context() {
-    }
-}
diff --git a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/LocalVaultConfigTest.java b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/LocalVaultConfigTest.java
new file mode 100644
index 00000000000..2527e4fe89b
--- /dev/null
+++ b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/LocalVaultConfigTest.java
@@ -0,0 +1,45 @@
+package no.nav.testnav.proxies.skjermingsregisterproxy;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.vault.authentication.TokenAuthentication;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
+@ActiveProfiles("test")
+class LocalVaultConfigTest {
+
+    @Test
+    void missingSystemPropertyShouldFail() {
+        assertThatThrownBy(new LocalVaultConfig()::clientAuthentication)
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void environmentPropertyShouldTakePrecedenceOverSystemProperty() {
+        try {
+            System.setProperty(LocalVaultConfig.TOKEN_PROPERTY_NAME, "<some-token-here>");
+            assertThat(new LocalVaultConfig())
+                    .isNotNull()
+                    .satisfies(
+                            config -> assertThat(config.clientAuthentication())
+                                    .isNotNull()
+                                    .isInstanceOf(TokenAuthentication.class)
+                    );
+        } finally {
+            System.clearProperty(LocalVaultConfig.TOKEN_PROPERTY_NAME);
+        }
+    }
+
+    @Test
+    void vaultEndpointShouldBeKnown() {
+        assertThat(new LocalVaultConfig().vaultEndpoint())
+                .isNotNull()
+                .satisfies(endpoint -> {
+                    assertThat(endpoint.getHost()).isEqualTo("vault.adeo.no");
+                    assertThat(endpoint.getPort()).isEqualTo(443);
+                });
+    }
+
+}
diff --git a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfigTest.java b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfigTest.java
new file mode 100644
index 00000000000..c29d2faf621
--- /dev/null
+++ b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfigTest.java
@@ -0,0 +1,68 @@
+package no.nav.testnav.proxies.skjermingsregisterproxy;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Login;
+
+@SpringBootTest(
+        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = "consumers.skjermingsregister.url=http://localhost:${wiremock.server.port}"
+)
+@AutoConfigureWireMock(port = 0)
+@AutoConfigureWebTestClient
+@ActiveProfiles("test")
+class RouteLocatorConfigTest {
+
+    @Autowired
+    private WebTestClient webClient;
+
+    @Test
+    void shouldRouteToStub() {
+
+        stubFor(
+                get(urlEqualTo("/testing/route"))
+                        .willReturn(
+                                aResponse()
+                                        .withStatus(HttpStatus.OK.value())
+                                        .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_VALUE)
+                                        .withBody("Some content")
+                        )
+        );
+
+        webClient
+                .mutateWith(mockOAuth2Login())
+                .get().uri("/testing/route")
+                .exchange()
+                .expectStatus().isOk()
+                .expectHeader().contentType(MediaType.TEXT_PLAIN_VALUE)
+                .expectBody(String.class).isEqualTo("Some content");
+
+    }
+
+    @TestConfiguration
+    static class TestAuthenticationConfig {
+
+        @Primary
+        @Bean
+        GatewayFilter getNoopAuthenticationFilter() {
+            return (exchange, chain) -> chain.filter(exchange);
+
+        }
+
+    }
+
+}
diff --git a/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml b/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml
index 4772c647cd8..08e74d491a3 100644
--- a/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml
+++ b/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml
@@ -1,6 +1,8 @@
-spring.cloud.vault.token: dummy
-azure.app.client.id: dummy
-azure.app.client.secret: dummy
+TOKEN_X_ISSUER: dummy
 proxy.url: http://localhost
 STS_TOKEN_PROVIDER_USERNAME: dummy
-STS_TOKEN_PROVIDER_PASSWORD: dummy
\ No newline at end of file
+STS_TOKEN_PROVIDER_PASSWORD: dummy
+spring:
+  cloud:
+    vault:
+      token: dummy
\ No newline at end of file
diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle
index ecbc8796587..6990b0a3202 100644
--- a/proxies/synthdata-meldekort-proxy/build.gradle
+++ b/proxies/synthdata-meldekort-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle
index 711e8077cf6..3561afaae3c 100644
--- a/proxies/tps-forvalteren-proxy/build.gradle
+++ b/proxies/tps-forvalteren-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml b/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml
index e92aaaf34e1..987c041ac49 100644
--- a/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml
+++ b/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml
@@ -1,5 +1,3 @@
-azure.app.client.id: ${client_id}
-azure.app.client.secret: ${client_secret}
 
 proxy.url: https://tps-forvalteren-dev.dev.adeo.no
 
diff --git a/proxies/tps-forvalteren-proxy/src/main/resources/application.yml b/proxies/tps-forvalteren-proxy/src/main/resources/application.yml
index 93506d24953..87ce883e8a1 100644
--- a/proxies/tps-forvalteren-proxy/src/main/resources/application.yml
+++ b/proxies/tps-forvalteren-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml b/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml
index 20fa5a451fa..438707ee212 100644
--- a/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml
+++ b/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml
@@ -8,4 +8,6 @@ proxy:
   url: http://localhost
 
 username: dummy
-password: dummy
\ No newline at end of file
+password: dummy
+
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle
index 670fcab1e6a..a53eedbbcd1 100644
--- a/proxies/udistub-proxy/build.gradle
+++ b/proxies/udistub-proxy/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.1.4"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'org.springframework.boot' version "3.2.1"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
     }
 }
 
diff --git a/proxies/udistub-proxy/config.yml b/proxies/udistub-proxy/config.yml
index 5f4537efe6e..7c353cb0220 100644
--- a/proxies/udistub-proxy/config.yml
+++ b/proxies/udistub-proxy/config.yml
@@ -9,6 +9,8 @@ spec:
   image: "{{image}}"
   port: 8080
   webproxy: true
+  tokenx:
+    enabled: true
   azure:
     application:
       allowAllUsers: true
@@ -54,4 +56,4 @@ spec:
     limits:
       memory: 2048Mi
   ingresses:
-    - "https://testnav-udistub-proxy.dev-fss-pub.nais.io"
\ No newline at end of file
+    - "https://testnav-udistub-proxy.dev-fss-pub.nais.io"
diff --git a/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties
+++ b/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/proxies/udistub-proxy/src/main/resources/application.yml b/proxies/udistub-proxy/src/main/resources/application.yml
index 3f16ba355d0..06c736b4f2c 100644
--- a/proxies/udistub-proxy/src/main/resources/application.yml
+++ b/proxies/udistub-proxy/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: ${TOKEN_X_CLIENT_ID}
   cloud:
     gateway:
diff --git a/proxies/udistub-proxy/src/test/resources/application-test.properties b/proxies/udistub-proxy/src/test/resources/application-test.properties
index 18ea64dc24a..483fe127f1f 100644
--- a/proxies/udistub-proxy/src/test/resources/application-test.properties
+++ b/proxies/udistub-proxy/src/test/resources/application-test.properties
@@ -1,4 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
-proxy.url=http://localhost
\ No newline at end of file
+TOKEN_X_ISSUER= dummy
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index a585428fd09..1a3d42dbd11 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,7 +21,6 @@ gradleEnterprise {
     }
 }
 
-includeBuild './proxies/kodeverk-proxy'
 includeBuild './proxies/udistub-proxy'
 includeBuild './proxies/skjermingsregister-proxy'
 includeBuild './proxies/batch-adeo-proxy'
@@ -119,6 +118,7 @@ includeBuild './apps/tps-messaging-service'
 includeBuild './apps/organisasjon-tilgang-frontend'
 includeBuild './apps/synt-vedtakshistorikk-service'
 includeBuild './apps/testnav-ident-pool'
+includeBuild './apps/tenor-search-service'
 includeBuild './apps/dollystatus'
 
 includeBuild './xsd/arbeidsforhold-xsd'
diff --git a/xsd/arbeidsforhold-xsd/build.gradle b/xsd/arbeidsforhold-xsd/build.gradle
index 4329ba9891c..ae38ee81ac9 100644
--- a/xsd/arbeidsforhold-xsd/build.gradle
+++ b/xsd/arbeidsforhold-xsd/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
     id 'java-library'
     id 'com.github.edeandrea.xjc-generation' version '1.6'
 }
diff --git a/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties b/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties
index e411586a54a..a5952066425 100644
--- a/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties
+++ b/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists