diff --git a/.github/workflows/app.adresse-service.yml b/.github/workflows/app.adresse-service.yml
index 7e90f169a3b..5e7048aacaa 100644
--- a/.github/workflows/app.adresse-service.yml
+++ b/.github/workflows/app.adresse-service.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/adresse-service/**
-      - .github/workflows/app.adresse-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/adresse-service/**"
+      - ".github/workflows/app.adresse-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.amelding-service.yml b/.github/workflows/app.amelding-service.yml
index 6ad932e6adf..dccaf511221 100644
--- a/.github/workflows/app.amelding-service.yml
+++ b/.github/workflows/app.amelding-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/avro-schema
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/reactive-security
-      - libs/security-core
-      - apps/amelding-service/**
-      - .github/workflows/app.amelding-service.yml
+      - "libs/avro-schema/**"
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "apps/amelding-service/**"
+      - ".github/workflows/app.amelding-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.app-tilgang-analyse-service.yml b/.github/workflows/app.app-tilgang-analyse-service.yml
index 0113b62d688..71950c604b7 100644
--- a/.github/workflows/app.app-tilgang-analyse-service.yml
+++ b/.github/workflows/app.app-tilgang-analyse-service.yml
@@ -4,11 +4,11 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/reactive-security
-      - apps/app-tilgang-analyse-service/**
-      - .github/workflows/app.app-tilgang-analyse-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "apps/app-tilgang-analyse-service/**"
+      - ".github/workflows/app.app-tilgang-analyse-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.arbeidsforhold-service.yml b/.github/workflows/app.arbeidsforhold-service.yml
index fe87912f849..169a2330d11 100644
--- a/.github/workflows/app.arbeidsforhold-service.yml
+++ b/.github/workflows/app.arbeidsforhold-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/arbeidsforhold-service/**
-      - .github/workflows/app.arbeidsforhold-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/arbeidsforhold-service/**"
+      - ".github/workflows/app.arbeidsforhold-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.batch-bestilling-service.yml b/.github/workflows/app.batch-bestilling-service.yml
index a3a97112764..e4b3e0c1eb6 100644
--- a/.github/workflows/app.batch-bestilling-service.yml
+++ b/.github/workflows/app.batch-bestilling-service.yml
@@ -4,15 +4,15 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-insecure-security
-      - libs/servlet-security
-      - apps/batch-bestilling-service/**
-      - .github/workflows/app.batch-bestilling-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "libs/servlet-security/**"
+      - "apps/batch-bestilling-service/**"
+      - ".github/workflows/app.batch-bestilling-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.brreg-stub.yml b/.github/workflows/app.brreg-stub.yml
index a5b7d9775e8..33e66b75a29 100644
--- a/.github/workflows/app.brreg-stub.yml
+++ b/.github/workflows/app.brreg-stub.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/database
-      - libs/servlet-core
-      - apps/brreg-stub/**
-      - .github/workflows/app.brreg-stub.yml
+      - "libs/database/**"
+      - "libs/servlet-core/**"
+      - "apps/brreg-stub/**"
+      - ".github/workflows/app.brreg-stub.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.bruker-service.yml b/.github/workflows/app.bruker-service.yml
index 7b7ea372317..7fd402271e6 100644
--- a/.github/workflows/app.bruker-service.yml
+++ b/.github/workflows/app.bruker-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/integration-test
-      - libs/reactive-core
-      - libs/reactive-security
-      - libs/security-core
-      - apps/bruker-service/**
-      - .github/workflows/app.bruker-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/integration-test/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "apps/bruker-service/**"
+      - ".github/workflows/app.bruker-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.budpro-service.yml b/.github/workflows/app.budpro-service.yml
index f1d95348fe4..f5f036ab185 100644
--- a/.github/workflows/app.budpro-service.yml
+++ b/.github/workflows/app.budpro-service.yml
@@ -4,15 +4,15 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-insecure-security
-      - libs/servlet-security
-      - apps/budpro-service/**
-      - .github/workflows/app.budpro-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "libs/servlet-security/**"
+      - "apps/budpro-service/**"
+      - ".github/workflows/app.budpro-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.dolly-backend.yml b/.github/workflows/app.dolly-backend.yml
index c87d005fee7..d122c632b70 100644
--- a/.github/workflows/app.dolly-backend.yml
+++ b/.github/workflows/app.dolly-backend.yml
@@ -4,16 +4,16 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects/**
-      - libs/data-transfer-search-objects/**
-      - libs/database/**
-      - libs/reactive-core/**
-      - libs/security-core/**
-      - libs/servlet-core/**
-      - libs/servlet-insecure-security/**
-      - libs/servlet-security/**
-      - apps/dolly-backend/**
-      - .github/workflows/app.dolly-backend.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/data-transfer-search-objects/**"
+      - "libs/database/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "libs/servlet-security/**"
+      - "apps/dolly-backend/**"
+      - ".github/workflows/app.dolly-backend.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml
index 8231ab067f0..d8dfc7b61ca 100644
--- a/.github/workflows/app.dolly-frontend.yml
+++ b/.github/workflows/app.dolly-frontend.yml
@@ -4,17 +4,17 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/reactive-frontend
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/reactive-session-security
-      - libs/security-core
-      - libs/security-core
-      - apps/dolly-frontend/**
-      - .github/workflows/app.dolly-frontend.yml
-      - .github/workflows/common.playwright.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-frontend/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/reactive-session-security/**"
+      - "libs/security-core/**"
+      - "libs/security-core/**"
+      - "apps/dolly-frontend/**"
+      - ".github/workflows/app.dolly-frontend.yml"
+      - ".github/workflows/common.playwright.yml"
 
 jobs:
   playwright:
diff --git a/.github/workflows/app.dollystatus.yml b/.github/workflows/app.dollystatus.yml
index 1e01ec0e8f5..5b788efac5b 100644
--- a/.github/workflows/app.dollystatus.yml
+++ b/.github/workflows/app.dollystatus.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - apps/dollystatus/**
-      - .github/workflows/app.dollystatus.yml
+      - "apps/dollystatus/**"
+      - ".github/workflows/app.dollystatus.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.endringsmelding-frontend.yml b/.github/workflows/app.endringsmelding-frontend.yml
index 60b2672417e..b034be702fe 100644
--- a/.github/workflows/app.endringsmelding-frontend.yml
+++ b/.github/workflows/app.endringsmelding-frontend.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-frontend
-      - libs/reactive-session-security
-      - libs/security-core
-      - apps/endringsmelding-frontend/**
-      - .github/workflows/app.endringsmelding-frontend.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-frontend/**"
+      - "libs/reactive-session-security/**"
+      - "libs/security-core/**"
+      - "apps/endringsmelding-frontend/**"
+      - ".github/workflows/app.endringsmelding-frontend.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.endringsmelding-service.yml b/.github/workflows/app.endringsmelding-service.yml
index 473936ffe9c..6334f480fdb 100644
--- a/.github/workflows/app.endringsmelding-service.yml
+++ b/.github/workflows/app.endringsmelding-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/data-transfer-search-objects
-      - libs/reactive-core
-      - libs/reactive-security
-      - libs/security-core
-      - apps/endringsmelding-service/**
-      - .github/workflows/app.endringsmelding-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/data-transfer-search-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "apps/endringsmelding-service/**"
+      - ".github/workflows/app.endringsmelding-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.ereg-batch-status-service.yml b/.github/workflows/app.ereg-batch-status-service.yml
index 6c2714fb430..750485f41f1 100644
--- a/.github/workflows/app.ereg-batch-status-service.yml
+++ b/.github/workflows/app.ereg-batch-status-service.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/ereg-batch-status-service/**
-      - .github/workflows/app.ereg-batch-status-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/ereg-batch-status-service/**"
+      - ".github/workflows/app.ereg-batch-status-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.faste-data-frontend.yml b/.github/workflows/app.faste-data-frontend.yml
index f823bf38e11..80820cd1ca5 100644
--- a/.github/workflows/app.faste-data-frontend.yml
+++ b/.github/workflows/app.faste-data-frontend.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-frontend
-      - libs/reactive-session-security
-      - libs/security-core
-      - apps/faste-data-frontend/**
-      - .github/workflows/app.faste-data-frontend.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-frontend/**"
+      - "libs/reactive-session-security/**"
+      - "libs/security-core/**"
+      - "apps/faste-data-frontend/**"
+      - ".github/workflows/app.faste-data-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 699cd0886e8..16dbf65c2b0 100644
--- a/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml
+++ b/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-insecure-security
-      - apps/generer-arbeidsforhold-populasjon-service/**
-      - .github/workflows/app.generer-arbeidsforhold-populasjon-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "apps/generer-arbeidsforhold-populasjon-service/**"
+      - ".github/workflows/app.generer-arbeidsforhold-populasjon-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.generer-navn-service.yml b/.github/workflows/app.generer-navn-service.yml
index 3d1ba3071f7..d7847ed949d 100644
--- a/.github/workflows/app.generer-navn-service.yml
+++ b/.github/workflows/app.generer-navn-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/testing
-      - apps/generer-navn-service/**
-      - .github/workflows/app.generer-navn-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/generer-navn-service/**"
+      - ".github/workflows/app.generer-navn-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.generer-organisasjon-populasjon-service.yml b/.github/workflows/app.generer-organisasjon-populasjon-service.yml
index 27e3c270d23..11a39629df1 100644
--- a/.github/workflows/app.generer-organisasjon-populasjon-service.yml
+++ b/.github/workflows/app.generer-organisasjon-populasjon-service.yml
@@ -4,18 +4,18 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/avro-schema
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/database
-      - libs/kafka-config
-      - libs/kafka-producers
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/generer-organisasjon-populasjon-service/**
-      - .github/workflows/app.generer-organisasjon-populasjon-service.yml
+      - "libs/avro-schema/**"
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/database/**"
+      - "libs/kafka-config/**"
+      - "libs/kafka-producers/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/generer-organisasjon-populasjon-service/**"
+      - ".github/workflows/app.generer-organisasjon-populasjon-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.generer-synt-amelding-service.yml b/.github/workflows/app.generer-synt-amelding-service.yml
index 2a58b0444ef..744c6b22715 100644
--- a/.github/workflows/app.generer-synt-amelding-service.yml
+++ b/.github/workflows/app.generer-synt-amelding-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/domain
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/generer-synt-amelding-service/**
-      - .github/workflows/app.generer-synt-amelding-service.yml
+      - "libs/domain/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/generer-synt-amelding-service/**"
+      - ".github/workflows/app.generer-synt-amelding-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.helsepersonell-service.yml b/.github/workflows/app.helsepersonell-service.yml
index 8e86d7ada58..5e6979f34a9 100644
--- a/.github/workflows/app.helsepersonell-service.yml
+++ b/.github/workflows/app.helsepersonell-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/testing
-      - apps/helsepersonell-service/**
-      - .github/workflows/app.helsepersonell-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/helsepersonell-service/**"
+      - ".github/workflows/app.helsepersonell-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.inntektsmelding-generator-service.yml b/.github/workflows/app.inntektsmelding-generator-service.yml
index 124e94604b0..0eb7df2cdee 100644
--- a/.github/workflows/app.inntektsmelding-generator-service.yml
+++ b/.github/workflows/app.inntektsmelding-generator-service.yml
@@ -4,11 +4,11 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/inntektsmelding-generator-service/**
-      - .github/workflows/app.inntektsmelding-generator-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/inntektsmelding-generator-service/**"
+      - ".github/workflows/app.inntektsmelding-generator-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.inntektsmelding-service.yml b/.github/workflows/app.inntektsmelding-service.yml
index ca5f3ac3556..55d5d01bf5a 100644
--- a/.github/workflows/app.inntektsmelding-service.yml
+++ b/.github/workflows/app.inntektsmelding-service.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/inntektsmelding-service/**
-      - .github/workflows/app.inntektsmelding-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/inntektsmelding-service/**"
+      - ".github/workflows/app.inntektsmelding-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.jenkins-batch-status-service.yml b/.github/workflows/app.jenkins-batch-status-service.yml
index 58de12428fb..74b7bf874a8 100644
--- a/.github/workflows/app.jenkins-batch-status-service.yml
+++ b/.github/workflows/app.jenkins-batch-status-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/jenkins-batch-status-service/**
-      - .github/workflows/app.jenkins-batch-status-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/jenkins-batch-status-service/**"
+      - ".github/workflows/app.jenkins-batch-status-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.joark-dokument-service.yml b/.github/workflows/app.joark-dokument-service.yml
index 43cde386980..abe89263f1b 100644
--- a/.github/workflows/app.joark-dokument-service.yml
+++ b/.github/workflows/app.joark-dokument-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/domain
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/joark-dokument-service/**
-      - .github/workflows/app.joark-dokument-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/domain/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/joark-dokument-service/**"
+      - ".github/workflows/app.joark-dokument-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.kodeverk-service.yml b/.github/workflows/app.kodeverk-service.yml
index 3dde08184f7..a94ff4a4ac7 100644
--- a/.github/workflows/app.kodeverk-service.yml
+++ b/.github/workflows/app.kodeverk-service.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/security-core
-      - libs/reactive-core
-      - libs/reactive-security
-      - libs/data-transfer-objects
-      - apps/kodeverk-service/**
-      - .github/workflows/app.kodeverk-service.yml
+      - "libs/security-core/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "libs/data-transfer-objects/**"
+      - "apps/kodeverk-service/**"
+      - ".github/workflows/app.kodeverk-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.miljoer-service.yml b/.github/workflows/app.miljoer-service.yml
index e28f29bdb39..dda2c9dd734 100644
--- a/.github/workflows/app.miljoer-service.yml
+++ b/.github/workflows/app.miljoer-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/miljoer-service/**
-      - .github/workflows/app.miljoer-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/miljoer-service/**"
+      - ".github/workflows/app.miljoer-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.oppsummeringsdokument-service.yml b/.github/workflows/app.oppsummeringsdokument-service.yml
index 8a387f98571..7d482e83f9c 100644
--- a/.github/workflows/app.oppsummeringsdokument-service.yml
+++ b/.github/workflows/app.oppsummeringsdokument-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - xsd/arbeidsforhold-xsd
-      - apps/oppsummeringsdokument-service/**
-      - .github/workflows/app.oppsummeringsdokument-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "xsd/arbeidsforhold-xsd/**"
+      - "apps/oppsummeringsdokument-service/**"
+      - ".github/workflows/app.oppsummeringsdokument-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-bestilling-service.yml b/.github/workflows/app.organisasjon-bestilling-service.yml
index 6122515acda..b797c98491c 100644
--- a/.github/workflows/app.organisasjon-bestilling-service.yml
+++ b/.github/workflows/app.organisasjon-bestilling-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/organisasjon-bestilling-service/**
-      - .github/workflows/app.organisasjon-bestilling-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/organisasjon-bestilling-service/**"
+      - ".github/workflows/app.organisasjon-bestilling-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-faste-data-service.yml b/.github/workflows/app.organisasjon-faste-data-service.yml
index c7193ddf3fa..a1b3e6186d3 100644
--- a/.github/workflows/app.organisasjon-faste-data-service.yml
+++ b/.github/workflows/app.organisasjon-faste-data-service.yml
@@ -4,18 +4,18 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/avro-schema
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/database
-      - libs/kafka-config
-      - libs/kafka-producers
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/organisasjon-faste-data-service/**
-      - .github/workflows/app.organisasjon-faste-data-service.yml
+      - "libs/avro-schema/**"
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/database/**"
+      - "libs/kafka-config/**"
+      - "libs/kafka-producers/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/organisasjon-faste-data-service/**"
+      - ".github/workflows/app.organisasjon-faste-data-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-forvalter.yml b/.github/workflows/app.organisasjon-forvalter.yml
index 3ecb4d6d283..cc2d3fbfc92 100644
--- a/.github/workflows/app.organisasjon-forvalter.yml
+++ b/.github/workflows/app.organisasjon-forvalter.yml
@@ -4,18 +4,18 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/avro-schema
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/database
-      - libs/kafka-config
-      - libs/kafka-producers
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/testing
-      - apps/organisasjon-forvalter/**
-      - .github/workflows/app.organisasjon-forvalter.yml
+      - "libs/avro-schema/**"
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/database/**"
+      - "libs/kafka-config/**"
+      - "libs/kafka-producers/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/organisasjon-forvalter/**"
+      - ".github/workflows/app.organisasjon-forvalter.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-mottak-service.yml b/.github/workflows/app.organisasjon-mottak-service.yml
index b71d1722c34..230c1d6215f 100644
--- a/.github/workflows/app.organisasjon-mottak-service.yml
+++ b/.github/workflows/app.organisasjon-mottak-service.yml
@@ -4,17 +4,17 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/avro-schema
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/kafka-config
-      - libs/kafka-producers
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-insecure-security
-      - apps/organisasjon-mottak-service/**
-      - .github/workflows/app.organisasjon-mottak-service.yml
+      - "libs/avro-schema/**"
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/kafka-config/**"
+      - "libs/kafka-producers/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "apps/organisasjon-mottak-service/**"
+      - ".github/workflows/app.organisasjon-mottak-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-service.yml b/.github/workflows/app.organisasjon-service.yml
index 21a5ca84e40..04bda6d8b40 100644
--- a/.github/workflows/app.organisasjon-service.yml
+++ b/.github/workflows/app.organisasjon-service.yml
@@ -4,15 +4,15 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/testing
-      - apps/organisasjon-service/**
-      - .github/workflows/app.organisasjon-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/organisasjon-service/**"
+      - ".github/workflows/app.organisasjon-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-tilgang-frontend.yml b/.github/workflows/app.organisasjon-tilgang-frontend.yml
index a5427ef42da..18ab3a96315 100644
--- a/.github/workflows/app.organisasjon-tilgang-frontend.yml
+++ b/.github/workflows/app.organisasjon-tilgang-frontend.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-frontend
-      - libs/reactive-session-security
-      - libs/security-core
-      - apps/organisasjon-tilgang-frontend/**
-      - .github/workflows/app.organisasjon-tilgang-frontend.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-frontend/**"
+      - "libs/reactive-session-security/**"
+      - "libs/security-core/**"
+      - "apps/organisasjon-tilgang-frontend/**"
+      - ".github/workflows/app.organisasjon-tilgang-frontend.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.organisasjon-tilgang-service.yml b/.github/workflows/app.organisasjon-tilgang-service.yml
index e93ed0219e7..229fcbb1fcd 100644
--- a/.github/workflows/app.organisasjon-tilgang-service.yml
+++ b/.github/workflows/app.organisasjon-tilgang-service.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-security
-      - apps/organisasjon-tilgang-service/**
-      - .github/workflows/app.organisasjon-tilgang-service.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "apps/organisasjon-tilgang-service/**"
+      - ".github/workflows/app.organisasjon-tilgang-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.orgnummer-service.yml b/.github/workflows/app.orgnummer-service.yml
index b218fcab8d7..adf569410be 100644
--- a/.github/workflows/app.orgnummer-service.yml
+++ b/.github/workflows/app.orgnummer-service.yml
@@ -4,15 +4,15 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/database
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/orgnummer-service/**
-      - .github/workflows/app.orgnummer-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/database/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/orgnummer-service/**"
+      - ".github/workflows/app.orgnummer-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.oversikt-frontend.yml b/.github/workflows/app.oversikt-frontend.yml
index c700d7b3f8b..2c96950bc1b 100644
--- a/.github/workflows/app.oversikt-frontend.yml
+++ b/.github/workflows/app.oversikt-frontend.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-frontend
-      - libs/reactive-security
-      - libs/security-core
-      - apps/oversikt-frontend/**
-      - .github/workflows/app.oversikt-frontend.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-frontend/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "apps/oversikt-frontend/**"
+      - ".github/workflows/app.oversikt-frontend.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.pdl-forvalter.yml b/.github/workflows/app.pdl-forvalter.yml
index 18839dfb57c..177601a64ea 100644
--- a/.github/workflows/app.pdl-forvalter.yml
+++ b/.github/workflows/app.pdl-forvalter.yml
@@ -4,15 +4,15 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/data-transfer-search-objects
-      - libs/database
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/testing
-      - apps/pdl-forvalter/**
-      - .github/workflows/app.pdl-forvalter.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/data-transfer-search-objects/**"
+      - "libs/database/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/pdl-forvalter/**"
+      - ".github/workflows/app.pdl-forvalter.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-faste-data-service.yml b/.github/workflows/app.person-faste-data-service.yml
index ffdadd22f88..f18c3a7a16f 100644
--- a/.github/workflows/app.person-faste-data-service.yml
+++ b/.github/workflows/app.person-faste-data-service.yml
@@ -4,11 +4,11 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/reactive-security
-      - apps/person-faste-data-service/**
-      - .github/workflows/app.person-faste-data-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "apps/person-faste-data-service/**"
+      - ".github/workflows/app.person-faste-data-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-organisasjon-tilgang-service.yml b/.github/workflows/app.person-organisasjon-tilgang-service.yml
index fd1f874742f..1b084267e6c 100644
--- a/.github/workflows/app.person-organisasjon-tilgang-service.yml
+++ b/.github/workflows/app.person-organisasjon-tilgang-service.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/integration-test
-      - libs/reactive-core
-      - libs/reactive-security
-      - libs/security-core
-      - apps/person-organisasjon-tilgang-service/**
-      - .github/workflows/app.person-organisasjon-tilgang-service.yml
+      - "libs/integration-test/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "apps/person-organisasjon-tilgang-service/**"
+      - ".github/workflows/app.person-organisasjon-tilgang-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-search-service.yml b/.github/workflows/app.person-search-service.yml
index 3bfffa3a6c4..698519acab6 100644
--- a/.github/workflows/app.person-search-service.yml
+++ b/.github/workflows/app.person-search-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/person-search-service/**
-      - .github/workflows/app.person-search-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/person-search-service/**"
+      - ".github/workflows/app.person-search-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.person-service.yml b/.github/workflows/app.person-service.yml
index f210094236e..5b67b219091 100644
--- a/.github/workflows/app.person-service.yml
+++ b/.github/workflows/app.person-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/person-service/**
-      - .github/workflows/app.person-service.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/person-service/**"
+      - ".github/workflows/app.person-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.profil-api.yml b/.github/workflows/app.profil-api.yml
index 9aa4b0088a5..a7340986b6f 100644
--- a/.github/workflows/app.profil-api.yml
+++ b/.github/workflows/app.profil-api.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/profil-api/**
-      - .github/workflows/app.profil-api.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/profil-api/**"
+      - ".github/workflows/app.profil-api.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.skattekort-service.yml b/.github/workflows/app.skattekort-service.yml
index 363346f819b..62d3b5ea777 100644
--- a/.github/workflows/app.skattekort-service.yml
+++ b/.github/workflows/app.skattekort-service.yml
@@ -3,12 +3,13 @@ name: skattekort-service
 on:
   push:
     paths:
-      - libs/reactive-core
-      - libs/reactive-security
-      - libs/security-core
-      - libs/data-transfer-objects
-      - apps/skattekort-service/**
-      - .github/workflows/app.skattekort-service.yml
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "libs/data-transfer-objects/**"
+      - "apps/skattekort-service/**"
+      - ".github/workflows/app.skattekort-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.sykemelding-api.yml b/.github/workflows/app.sykemelding-api.yml
index 4641e97dc85..13b32b61caa 100644
--- a/.github/workflows/app.sykemelding-api.yml
+++ b/.github/workflows/app.sykemelding-api.yml
@@ -4,11 +4,11 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/avro-schema
-      - libs/data-transfer-objects
-      - libs/servlet-core
-      - apps/sykemelding-api/**
-      - .github/workflows/app.sykemelding-api.yml
+      - "libs/avro-schema/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/servlet-core/**"
+      - "apps/sykemelding-api/**"
+      - ".github/workflows/app.sykemelding-api.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.synt-sykemelding-api.yml b/.github/workflows/app.synt-sykemelding-api.yml
index ad0279bf498..a9dd896a2d1 100644
--- a/.github/workflows/app.synt-sykemelding-api.yml
+++ b/.github/workflows/app.synt-sykemelding-api.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/testing
-      - apps/synt-sykemelding-api/**
-      - .github/workflows/app.synt-sykemelding-api.yml
+      - "libs/commands/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/synt-sykemelding-api/**"
+      - ".github/workflows/app.synt-sykemelding-api.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.synt-vedtakshistorikk-service.yml b/.github/workflows/app.synt-vedtakshistorikk-service.yml
index c0b181f96ec..d9ec5a49d8b 100644
--- a/.github/workflows/app.synt-vedtakshistorikk-service.yml
+++ b/.github/workflows/app.synt-vedtakshistorikk-service.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/domain
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-insecure-security
-      - libs/servlet-security
-      - apps/synt-vedtakshistorikk-service/**
-      - .github/workflows/app.synt-vedtakshistorikk-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/domain/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "libs/servlet-security/**"
+      - "apps/synt-vedtakshistorikk-service/**"
+      - ".github/workflows/app.synt-vedtakshistorikk-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml
index d898cbfb9fd..ad84bfd3851 100644
--- a/.github/workflows/app.team-dolly-lokal-app.yml
+++ b/.github/workflows/app.team-dolly-lokal-app.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - .nais/team-dolly-lokal-app.yml
-      - .github/workflows/app.team-dolly-lokal-app.yml
+      - ".nais/team-dolly-lokal-app.yml"
+      - ".github/workflows/app.team-dolly-lokal-app.yml"
 
 jobs:
   deploy:
diff --git a/.github/workflows/app.tenor-search-service.yml b/.github/workflows/app.tenor-search-service.yml
index 5f40dd9ed41..605fb49954d 100644
--- a/.github/workflows/app.tenor-search-service.yml
+++ b/.github/workflows/app.tenor-search-service.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/integration-test
-      - libs/reactive-core
-      - libs/reactive-security
-      - libs/security-core
-      - apps/tenor-search-service/**
-      - .github/workflows/app.tenor-search-service.yml
+      - "libs/integration-test/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "apps/tenor-search-service/**"
+      - ".github/workflows/app.tenor-search-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.testnav-ident-pool.yml b/.github/workflows/app.testnav-ident-pool.yml
index e8fe6d75656..7515d6b8b31 100644
--- a/.github/workflows/app.testnav-ident-pool.yml
+++ b/.github/workflows/app.testnav-ident-pool.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/database
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-insecure-security
-      - libs/servlet-security
-      - libs/testing
-      - apps/testnav-ident-pool/**
-      - .github/workflows/app.testnav-ident-pool.yml
+      - "libs/database/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/testnav-ident-pool/**"
+      - ".github/workflows/app.testnav-ident-pool.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.testnorge-statisk-data-forvalter.yml b/.github/workflows/app.testnorge-statisk-data-forvalter.yml
index b164c01e498..da24fffbf50 100644
--- a/.github/workflows/app.testnorge-statisk-data-forvalter.yml
+++ b/.github/workflows/app.testnorge-statisk-data-forvalter.yml
@@ -4,19 +4,19 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/avro-schema
-      - libs/commands
-      - libs/csv-converter
-      - libs/data-transfer-objects
-      - libs/database
-      - libs/kafka-config
-      - libs/kafka-producers
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/testing
-      - apps/testnorge-statisk-data-forvalter/**
-      - .github/workflows/app.testnorge-statisk-data-forvalter.yml
+      - "libs/avro-schema/**"
+      - "libs/commands/**"
+      - "libs/csv-converter/**"
+      - "libs/data-transfer-objects/**"
+      - "libs/database/**"
+      - "libs/kafka-config/**"
+      - "libs/kafka-producers/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/testing/**"
+      - "apps/testnorge-statisk-data-forvalter/**"
+      - ".github/workflows/app.testnorge-statisk-data-forvalter.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.tilbakemelding-api.yml b/.github/workflows/app.tilbakemelding-api.yml
index eb496fe56b7..eed207fbb99 100644
--- a/.github/workflows/app.tilbakemelding-api.yml
+++ b/.github/workflows/app.tilbakemelding-api.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/reactive-core
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/slack
-      - apps/tilbakemelding-api/**
-      - .github/workflows/app.tilbakemelding-api.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/reactive-core/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/slack/**"
+      - "apps/tilbakemelding-api/**"
+      - ".github/workflows/app.tilbakemelding-api.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.tps-messaging-service.yml b/.github/workflows/app.tps-messaging-service.yml
index 60269fe5596..050e30682e1 100644
--- a/.github/workflows/app.tps-messaging-service.yml
+++ b/.github/workflows/app.tps-messaging-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/data-transfer-search-objects
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/tps-messaging-service/**
-      - .github/workflows/app.tps-messaging-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/data-transfer-search-objects/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/tps-messaging-service/**"
+      - ".github/workflows/app.tps-messaging-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.udi-stub.yml b/.github/workflows/app.udi-stub.yml
index a4878aa96a5..839be1717ae 100644
--- a/.github/workflows/app.udi-stub.yml
+++ b/.github/workflows/app.udi-stub.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/database
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/udi-stub/**
-      - .github/workflows/app.udi-stub.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/database/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/udi-stub/**"
+      - ".github/workflows/app.udi-stub.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/app.varslinger-service.yml b/.github/workflows/app.varslinger-service.yml
index 52b99d4a2ef..c49f1803c97 100644
--- a/.github/workflows/app.varslinger-service.yml
+++ b/.github/workflows/app.varslinger-service.yml
@@ -4,13 +4,13 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects
-      - libs/database
-      - libs/security-core
-      - libs/servlet-core
-      - libs/servlet-security
-      - apps/varslinger-service/**
-      - .github/workflows/app.varslinger-service.yml
+      - "libs/data-transfer-objects/**"
+      - "libs/database/**"
+      - "libs/security-core/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "apps/varslinger-service/**"
+      - ".github/workflows/app.varslinger-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.commands.yml b/.github/workflows/lib.commands.yml
index fe42de59148..7115336e368 100644
--- a/.github/workflows/lib.commands.yml
+++ b/.github/workflows/lib.commands.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/commands/**
-      - .github/workflows/lib.commands.yml
+      - "libs/commands/**"
+      - ".github/workflows/lib.commands.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.csv-converter.yml b/.github/workflows/lib.csv-converter.yml
index 7a4f7741bfa..898d42e0dc8 100644
--- a/.github/workflows/lib.csv-converter.yml
+++ b/.github/workflows/lib.csv-converter.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/csv-converter/**
-      - .github/workflows/lib.csv-converter.yml
+      - "libs/csv-converter/**"
+      - ".github/workflows/lib.csv-converter.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.data-transfer-objects.yml b/.github/workflows/lib.data-transfer-objects.yml
index 10d6aac991e..d7283b39865 100644
--- a/.github/workflows/lib.data-transfer-objects.yml
+++ b/.github/workflows/lib.data-transfer-objects.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/data-transfer-objects/**
-      - .github/workflows/lib.data-transfer-objects.yml
+      - "libs/data-transfer-objects/**"
+      - ".github/workflows/lib.data-transfer-objects.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.domain.yml b/.github/workflows/lib.domain.yml
index 1ad4cb33284..422aa567082 100644
--- a/.github/workflows/lib.domain.yml
+++ b/.github/workflows/lib.domain.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/domain/**
-      - .github/workflows/lib.domain.yml
+      - "libs/domain/**"
+      - ".github/workflows/lib.domain.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.frontend.dolly-assets.yml b/.github/workflows/lib.frontend.dolly-assets.yml
index c18c6a997e5..604ffdf93c4 100644
--- a/.github/workflows/lib.frontend.dolly-assets.yml
+++ b/.github/workflows/lib.frontend.dolly-assets.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - navikt/dolly-assets/**
-      - .github/workflows/lib.frontend.dolly-assets.yml
+      - "navikt/dolly-assets/**"
+      - ".github/workflows/lib.frontend.dolly-assets.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.frontend.dolly-komponenter.yml b/.github/workflows/lib.frontend.dolly-komponenter.yml
index 32f933b8eeb..45096b00099 100644
--- a/.github/workflows/lib.frontend.dolly-komponenter.yml
+++ b/.github/workflows/lib.frontend.dolly-komponenter.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - navikt/dolly-komponenter/**
-      - .github/workflows/lib.frontend.dolly-komponenter.yml
+      - "navikt/dolly-komponenter/**"
+      - ".github/workflows/lib.frontend.dolly-komponenter.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.frontend.dolly-lib.yml b/.github/workflows/lib.frontend.dolly-lib.yml
index d8681fbd394..eda40519a67 100644
--- a/.github/workflows/lib.frontend.dolly-lib.yml
+++ b/.github/workflows/lib.frontend.dolly-lib.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - navikt/dolly-lib/**
-      - .github/workflows/lib.frontend.dolly-lib.yml
+      - "navikt/dolly-lib/**"
+      - ".github/workflows/lib.frontend.dolly-lib.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.integration-test.yml b/.github/workflows/lib.integration-test.yml
index 2d1c7b06fa1..73a09e6dfe2 100644
--- a/.github/workflows/lib.integration-test.yml
+++ b/.github/workflows/lib.integration-test.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/integration-test/**
-      - .github/workflows/lib.reactive-core.yml
+      - "libs/integration-test/**"
+      - ".github/workflows/lib.reactive-core.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.kafka-config.yml b/.github/workflows/lib.kafka-config.yml
index a1dcd3a4c5c..be268145d34 100644
--- a/.github/workflows/lib.kafka-config.yml
+++ b/.github/workflows/lib.kafka-config.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/kafka-config/**
-      - .github/workflows/lib.kafka-config.yml
+      - "libs/kafka-config/**"
+      - ".github/workflows/lib.kafka-config.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.kafka-producers.yml b/.github/workflows/lib.kafka-producers.yml
index 52ccd54f2a7..dc44a2b2ca0 100644
--- a/.github/workflows/lib.kafka-producers.yml
+++ b/.github/workflows/lib.kafka-producers.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/kafka-producers/**
-      - .github/workflows/lib.kafka-producers.yml
+      - "libs/kafka-producers/**"
+      - ".github/workflows/lib.kafka-producers.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.reactive-core.yml b/.github/workflows/lib.reactive-core.yml
index e8c4f42dc1a..64947e77919 100644
--- a/.github/workflows/lib.reactive-core.yml
+++ b/.github/workflows/lib.reactive-core.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core/**
-      - .github/workflows/lib.reactive-core.yml
+      - "libs/reactive-core/**"
+      - ".github/workflows/lib.reactive-core.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.reactive-frontend.yml b/.github/workflows/lib.reactive-frontend.yml
index f0af8e405aa..a5382a0a6b4 100644
--- a/.github/workflows/lib.reactive-frontend.yml
+++ b/.github/workflows/lib.reactive-frontend.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-frontend/**
-      - .github/workflows/lib.reactive-frontend.yml
+      - "libs/reactive-frontend/**"
+      - ".github/workflows/lib.reactive-frontend.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.reactive-proxy.yml b/.github/workflows/lib.reactive-proxy.yml
index cf533e942d2..83dc7f8aeaf 100644
--- a/.github/workflows/lib.reactive-proxy.yml
+++ b/.github/workflows/lib.reactive-proxy.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-proxy/**
-      - .github/workflows/lib.reactive-proxy.yml
+      - "libs/reactive-proxy/**"
+      - ".github/workflows/lib.reactive-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.reactive-security.yml b/.github/workflows/lib.reactive-security.yml
index 96be8f94a43..346382bdffb 100644
--- a/.github/workflows/lib.reactive-security.yml
+++ b/.github/workflows/lib.reactive-security.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-security/**
-      - .github/workflows/lib.reactive-security.yml
+      - "libs/reactive-security/**"
+      - ".github/workflows/lib.reactive-security.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.reactive-session-security.yml b/.github/workflows/lib.reactive-session-security.yml
index 47653017564..901b2a4782a 100644
--- a/.github/workflows/lib.reactive-session-security.yml
+++ b/.github/workflows/lib.reactive-session-security.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-session-security/**
-      - .github/workflows/lib.reactive-session-security.yml
+      - "libs/reactive-session-security/**"
+      - ".github/workflows/lib.reactive-session-security.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.security-core.yml b/.github/workflows/lib.security-core.yml
index 396a18dab4b..648ef119ad6 100644
--- a/.github/workflows/lib.security-core.yml
+++ b/.github/workflows/lib.security-core.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/security-core/**
-      - .github/workflows/lib.security-core.yml
+      - "libs/security-core/**"
+      - ".github/workflows/lib.security-core.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.security-token-service.yml b/.github/workflows/lib.security-token-service.yml
index 7824af257d4..cc2e0c51e4e 100644
--- a/.github/workflows/lib.security-token-service.yml
+++ b/.github/workflows/lib.security-token-service.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/security-token-service/**
-      - .github/workflows/lib.security-token-service.yml
+      - "libs/security-token-service/**"
+      - ".github/workflows/lib.security-token-service.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.servlet-core.yml b/.github/workflows/lib.servlet-core.yml
index f17428a66b4..0ac58e20331 100644
--- a/.github/workflows/lib.servlet-core.yml
+++ b/.github/workflows/lib.servlet-core.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/servlet-core/**
-      - .github/workflows/lib.servlet-core.yml
+      - "libs/servlet-core/**"
+      - ".github/workflows/lib.servlet-core.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.servlet-insecure-security.yml b/.github/workflows/lib.servlet-insecure-security.yml
index a7dac8ae203..7d1765056a9 100644
--- a/.github/workflows/lib.servlet-insecure-security.yml
+++ b/.github/workflows/lib.servlet-insecure-security.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/servlet-insecure-security/**
-      - .github/workflows/lib.servlet-insecure-security.yml
+      - "libs/servlet-insecure-security/**"
+      - ".github/workflows/lib.servlet-insecure-security.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.servlet-security.yml b/.github/workflows/lib.servlet-security.yml
index 099904ee040..9d33fe1daa1 100644
--- a/.github/workflows/lib.servlet-security.yml
+++ b/.github/workflows/lib.servlet-security.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/servlet-security/**
-      - .github/workflows/lib.commanservlet-securityds.yml
+      - "libs/servlet-security/**"
+      - ".github/workflows/lib.commanservlet-securityds.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/lib.testing.yml b/.github/workflows/lib.testing.yml
index 82d00726df0..b36dadd3207 100644
--- a/.github/workflows/lib.testing.yml
+++ b/.github/workflows/lib.testing.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/testing/**
-      - .github/workflows/lib.testing.yml
+      - "libs/testing/**"
+      - ".github/workflows/lib.testing.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml
index 2bc7f795e9c..310feaaf51e 100644
--- a/.github/workflows/proxy.aareg-proxy.yml
+++ b/.github/workflows/proxy.aareg-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/aareg-proxy/**
-      - .github/workflows/proxy.aareg-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/aareg-proxy/**"
+      - ".github/workflows/proxy.aareg-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml
index cc6054cf3c4..b20b48512a8 100644
--- a/.github/workflows/proxy.aareg-synt-services-proxy.yml
+++ b/.github/workflows/proxy.aareg-synt-services-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/aareg-synt-services-proxy/**
-      - .github/workflows/proxy.aareg-synt-services-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/aareg-synt-services-proxy/**"
+      - ".github/workflows/proxy.aareg-synt-services-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
index 59ffdeb73d7..4db4cf9de2b 100644
--- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml
+++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/arbeidsplassencv-proxy/**
-      - .github/workflows/proxy.arbeidsplassencv-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/arbeidsplassencv-proxy/**"
+      - ".github/workflows/proxy.arbeidsplassencv-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml
index ead83894a33..a3e53ad65a2 100644
--- a/.github/workflows/proxy.arena-forvalteren-proxy.yml
+++ b/.github/workflows/proxy.arena-forvalteren-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/arena-forvalteren-proxy/**
-      - .github/workflows/proxy.arena-forvalteren-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/arena-forvalteren-proxy/**"
+      - ".github/workflows/proxy.arena-forvalteren-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml
index bad9ea25d42..c7c2952893d 100644
--- a/.github/workflows/proxy.batch-adeo-proxy.yml
+++ b/.github/workflows/proxy.batch-adeo-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/batch-adeo-proxy/**
-      - .github/workflows/proxy.batch-adeo-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/batch-adeo-proxy/**"
+      - ".github/workflows/proxy.batch-adeo-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml
index b7520bed9fd..00473425265 100644
--- a/.github/workflows/proxy.brregstub-proxy.yml
+++ b/.github/workflows/proxy.brregstub-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/brregstub-proxy/**
-      - .github/workflows/proxy.brregstub-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/brregstub-proxy/**"
+      - ".github/workflows/proxy.brregstub-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.dokarkiv-proxy.yml b/.github/workflows/proxy.dokarkiv-proxy.yml
index b8a1d303cb8..e3ff33da84b 100644
--- a/.github/workflows/proxy.dokarkiv-proxy.yml
+++ b/.github/workflows/proxy.dokarkiv-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/dokarkiv-proxy/**
-      - .github/workflows/proxy.dokarkiv-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/dokarkiv-proxy/**"
+      - ".github/workflows/proxy.dokarkiv-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml
index c3e4a4b7109..bd107d2487a 100644
--- a/.github/workflows/proxy.ereg-proxy.yml
+++ b/.github/workflows/proxy.ereg-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/ereg-proxy/**
-      - .github/workflows/proxy.ereg-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/ereg-proxy/**"
+      - ".github/workflows/proxy.ereg-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml
index c30d8a29606..0bdd1bef3d7 100644
--- a/.github/workflows/proxy.histark-proxy.yml
+++ b/.github/workflows/proxy.histark-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/histark-proxy/**
-      - .github/workflows/proxy.histark-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/histark-proxy/**"
+      - ".github/workflows/proxy.histark-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml
index ae9e1dcbe2a..14da83bedaf 100644
--- a/.github/workflows/proxy.inntektstub-proxy.yml
+++ b/.github/workflows/proxy.inntektstub-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/inntektstub-proxy/**
-      - .github/workflows/proxy.inntektstub-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/inntektstub-proxy/**"
+      - ".github/workflows/proxy.inntektstub-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml
index d931982ae44..f16a905983e 100644
--- a/.github/workflows/proxy.inst-proxy.yml
+++ b/.github/workflows/proxy.inst-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/inst-proxy/**
-      - .github/workflows/proxy.inst-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/inst-proxy/**"
+      - ".github/workflows/proxy.inst-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml
index d355ccea4d4..920ddc0d4f3 100644
--- a/.github/workflows/proxy.kontoregister-person-proxy.yml
+++ b/.github/workflows/proxy.kontoregister-person-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/kontoregister-person-proxy/**
-      - .github/workflows/proxy.kontoregister-person-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/kontoregister-person-proxy/**"
+      - ".github/workflows/proxy.kontoregister-person-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml
index b0baebdf252..c76a656f36f 100644
--- a/.github/workflows/proxy.krrstub-proxy.yml
+++ b/.github/workflows/proxy.krrstub-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/krrstub-proxy/**
-      - .github/workflows/proxy.krrstub-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/krrstub-proxy/**"
+      - ".github/workflows/proxy.krrstub-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml
index e1314415413..837b047ee19 100644
--- a/.github/workflows/proxy.medl-proxy.yml
+++ b/.github/workflows/proxy.medl-proxy.yml
@@ -4,14 +4,14 @@ on:
   push:
     paths:
       - "plugins/**"
-      - proxies/medl-proxy/**
-      - libs/servlet-core
-      - libs/servlet-security
-      - libs/servlet-insecure-security
-      - libs/security-core
-      - libs/database
-      - libs/data-transfer-objects
-      - .github/workflows/proxy.medl-proxy.yml
+      - "proxies/medl-proxy/**"
+      - "libs/servlet-core/**"
+      - "libs/servlet-security/**"
+      - "libs/servlet-insecure-security/**"
+      - "libs/security-core/**"
+      - "libs/database/**"
+      - "libs/data-transfer-objects/**"
+      - ".github/workflows/proxy.medl-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.modapp-ereg-proxy.yml b/.github/workflows/proxy.modapp-ereg-proxy.yml
index 25b98733bbf..51cc7d2df5a 100644
--- a/.github/workflows/proxy.modapp-ereg-proxy.yml
+++ b/.github/workflows/proxy.modapp-ereg-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/modapp-ereg-proxy/**
-      - .github/workflows/proxy.modapp-ereg-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/modapp-ereg-proxy/**"
+      - ".github/workflows/proxy.modapp-ereg-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml
index b9f4e2ef0ed..9a77d1713d7 100644
--- a/.github/workflows/proxy.norg2-proxy.yml
+++ b/.github/workflows/proxy.norg2-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/norg2-proxy/**
-      - .github/workflows/proxy.norg2-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/norg2-proxy/**"
+      - ".github/workflows/proxy.norg2-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.pdl-proxy.yml b/.github/workflows/proxy.pdl-proxy.yml
index 53c574f9f68..ae2f5c5668e 100644
--- a/.github/workflows/proxy.pdl-proxy.yml
+++ b/.github/workflows/proxy.pdl-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/pdl-proxy/**
-      - .github/workflows/proxy.pdl-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/pdl-proxy/**"
+      - ".github/workflows/proxy.pdl-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml
index 9cc596e2ff6..a1c18aaf72a 100644
--- a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml
+++ b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/pensjon-testdata-facade-proxy/**
-      - .github/workflows/proxy.pensjon-testdata-facade-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/pensjon-testdata-facade-proxy/**"
+      - ".github/workflows/proxy.pensjon-testdata-facade-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml
index 2b820a832a1..689ccb6591b 100644
--- a/.github/workflows/proxy.saf-proxy.yml
+++ b/.github/workflows/proxy.saf-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/saf-proxy/**
-      - .github/workflows/proxy.saf-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/saf-proxy/**"
+      - ".github/workflows/proxy.saf-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml
index 9dfedcc71aa..aef377a2530 100644
--- a/.github/workflows/proxy.sigrunstub-proxy.yml
+++ b/.github/workflows/proxy.sigrunstub-proxy.yml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/sigrunstub-proxy/**
-      - .github/workflows/proxy.sigrunstub-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/sigrunstub-proxy/**"
+      - ".github/workflows/proxy.sigrunstub-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml
index 23188dcc289..ddf9fbfbbf8 100644
--- a/.github/workflows/proxy.skjermingsregister-proxy.yml
+++ b/.github/workflows/proxy.skjermingsregister-proxy.yml
@@ -4,11 +4,11 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/security-token-service
-      - proxies/skjermingsregister-proxy/**
-      - .github/workflows/proxy.skjermingsregister-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/security-token-service/**"
+      - "proxies/skjermingsregister-proxy/**"
+      - ".github/workflows/proxy.skjermingsregister-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml
index a7f6e1005e3..7e36fb74ef3 100644
--- a/.github/workflows/proxy.synthdata-meldekort-proxy.yml
+++ b/.github/workflows/proxy.synthdata-meldekort-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/synthdata-meldekort-proxy/**
-      - .github/workflows/proxy.synthdata-meldekort-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/synthdata-meldekort-proxy/**"
+      - ".github/workflows/proxy.synthdata-meldekort-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml
index aebdd29b5a1..79c313e5149 100644
--- a/.github/workflows/proxy.udistub-proxy.yml
+++ b/.github/workflows/proxy.udistub-proxy.yml
@@ -4,12 +4,12 @@ on:
   push:
     paths:
       - "plugins/**"
-      - libs/reactive-core
-      - libs/reactive-proxy
-      - libs/reactive-security
-      - libs/security-core
-      - proxies/udistub-proxy/**
-      - .github/workflows/proxy.udistub-proxy.yml
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/reactive-security/**"
+      - "libs/security-core/**"
+      - "proxies/udistub-proxy/**"
+      - ".github/workflows/proxy.udistub-proxy.yml"
 
 jobs:
   workflow:
diff --git a/.github/workflows/redis-dev.yml b/.github/workflows/redis-dev.yml
index 1b457f1f5f9..039c73e4ee5 100644
--- a/.github/workflows/redis-dev.yml
+++ b/.github/workflows/redis-dev.yml
@@ -3,7 +3,7 @@ name: Deploy redis
 on:
   push:
     paths:
-      - '.nais/redis-dev.yml'
+      - ".nais/redis-dev.yml"
   workflow_dispatch:
 
 jobs:
diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
index 56d33d74b09..a7c60fde2e8 100644
--- a/apps/adresse-service/build.gradle
+++ b/apps/adresse-service/build.gradle
@@ -19,9 +19,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
-    implementation 'org.aspectj:aspectjweaver:1.9.7'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
+    implementation "org.aspectj:aspectjweaver:$versions.jweaver"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 }
diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
index 16ed90044de..c2a4bbf4d5f 100644
--- a/apps/amelding-service/build.gradle
+++ b/apps/amelding-service/build.gradle
@@ -24,8 +24,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
index 94508051277..88d3ffe411e 100644
--- a/apps/app-tilgang-analyse-service/build.gradle
+++ b/apps/app-tilgang-analyse-service/build.gradle
@@ -25,8 +25,8 @@ dependencies {
     implementation 'org.flywaydb:flyway-core'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
index 9fa78862913..089e3d8c9fc 100644
--- a/apps/arbeidsforhold-service/build.gradle
+++ b/apps/arbeidsforhold-service/build.gradle
@@ -11,10 +11,10 @@ sonarqube {
 
 dependencies {
 
-    implementation 'com.google.guava:guava:33.2.0-jre'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
-    implementation 'javax.activation:activation:1.1.1'
-    implementation 'org.glassfish.jaxb:jaxb-runtime'
+    implementation "com.google.guava:guava:$versions.guava"
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "javax.activation:activation:$versions.javaxActivation"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
 
     implementation 'no.nav.testnav.libs:commands'
@@ -29,9 +29,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "javax.annotation:javax.annotation-api:$versions.javaxAnnotation"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
index 628be93c515..5cfd5693cab 100644
--- a/apps/batch-bestilling-service/build.gradle
+++ b/apps/batch-bestilling-service/build.gradle
@@ -23,8 +23,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
index f80ab4a9e55..48e8a1d39ae 100644
--- a/apps/brreg-stub/build.gradle
+++ b/apps/brreg-stub/build.gradle
@@ -47,15 +47,15 @@ dependencies {
     implementation 'com.h2database:h2'
 
     implementation 'wsdl4j:wsdl4j'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     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"
+    implementation "com.sun.xml.ws:jaxws-rt:$versions.jaxws"
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
     implementation 'jakarta.jws:jakarta.jws-api:3.0.0' //TODO upgrade to JUnit5
diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
index ce15cdca0ee..d2d3a9c73f0 100644
--- a/apps/bruker-service/build.gradle
+++ b/apps/bruker-service/build.gradle
@@ -23,7 +23,7 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'com.auth0:java-jwt:4.4.0'
+    implementation "com.auth0:java-jwt:$versions.jwt"
 
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:reactive-core'
@@ -35,8 +35,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     implementation 'io.r2dbc:r2dbc-h2'
     implementation 'org.postgresql:r2dbc-postgresql'
@@ -45,10 +45,10 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     runtimeOnly 'com.h2database:h2'
 
-    testImplementation 'io.projectreactor:reactor-test'
+    testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-    testImplementation 'org.assertj:assertj-core:3.26.0'
+    testImplementation "org.assertj:assertj-core:$versions.assertj"
     testImplementation 'no.nav.testnav.libs:integration-test'
-    testImplementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
+    testImplementation "com.squareup.okhttp3:okhttp:$versions.okhttp"
+    testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp"
 }
diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle
index a04fdddbcb5..ca5df53ed97 100644
--- a/apps/budpro-service/build.gradle
+++ b/apps/budpro-service/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
     implementation "org.springframework.boot:spring-boot-starter-security"
diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
index e72ffcbdff7..2adde405cba 100644
--- a/apps/dolly-backend/build.gradle
+++ b/apps/dolly-backend/build.gradle
@@ -22,8 +22,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
@@ -31,31 +31,31 @@ 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.6'
+    implementation 'org.springframework.retry:spring-retry'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
-    implementation 'org.opensearch.client:spring-data-opensearch:1.4.0'
+    implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch"
 
-    implementation 'org.apache.commons:commons-lang3:3.14.0'
+    implementation 'org.apache.commons:commons-lang3'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'com.github.ben-manes.caffeine:caffeine'
 
     implementation 'org.ehcache:ehcache:3.10.8'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
     implementation 'org.postgresql:postgresql'
     implementation 'org.flywaydb:flyway-core'
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
     implementation 'org.codehaus.jettison:jettison:1.5.4'
-    implementation 'org.apache.poi:poi:5.2.5'
-    implementation 'org.apache.poi:poi-ooxml:5.2.5'
+    implementation "org.apache.poi:poi:$versions.apachePoi"
+    implementation "org.apache.poi:poi-ooxml:$versions.apachePoi"
 
     testImplementation 'org.opensearch:opensearch-testcontainers:2.0.1'
 
     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.6.5'
+    testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.bitbucket.b_c:jose4j:0.9.6'
diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
index 23eb2c39428..79877d0ed8b 100644
--- a/apps/dolly-backend/config.test.yml
+++ b/apps/dolly-backend/config.test.yml
@@ -37,6 +37,7 @@ spec:
         - application: testnav-organisasjon-service
         - application: testnav-pdl-forvalter-dev
         - application: testnav-person-service
+        - application: testnav-skattekort-service
         - application: testnav-sykemelding-api
         - application: testnav-synt-sykemelding-api
         - application: testnav-tps-messaging-service
@@ -107,4 +108,4 @@ spec:
         name: testnav-dolly-backend-dev
         databases:
           - name: testnav-dolly-backend-dev
-        autoBackupHour: 3
\ No newline at end of file
+        autoBackupHour: 3
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/SkattekortClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/SkattekortClient.java
new file mode 100644
index 00000000000..6ba64ea112d
--- /dev/null
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/SkattekortClient.java
@@ -0,0 +1,60 @@
+package no.nav.dolly.bestilling.skattekort;
+
+import lombok.RequiredArgsConstructor;
+import ma.glasnost.orika.MapperFacade;
+import no.nav.dolly.bestilling.ClientFuture;
+import no.nav.dolly.bestilling.ClientRegister;
+import no.nav.dolly.domain.jpa.BestillingProgress;
+import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
+import no.nav.dolly.domain.resultset.dolly.DollyPerson;
+import no.nav.dolly.util.TransactionHelperService;
+import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.nonNull;
+
+@Service
+@RequiredArgsConstructor
+public class SkattekortClient implements ClientRegister {
+
+    private final SkattekortConsumer skattekortConsumer;
+    private final MapperFacade mapperFacade;
+    private final TransactionHelperService transactionHelperService;
+
+    @Override
+    public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, DollyPerson dollyPerson,
+                                          BestillingProgress progress, boolean isOpprettEndre) {
+
+        return Flux.just(bestilling)
+                .filter(bestilling1 -> nonNull(bestilling1.getSkattekort()))
+                .map(bestilling1 -> mapperFacade.map(bestilling1.getSkattekort(), SkattekortRequestDTO.class))
+                .doOnNext(skattekort ->
+                        skattekort.getArbeidsgiver()
+                                .forEach(arbeidsgiver -> arbeidsgiver.getArbeidstaker()
+                                        .forEach(arbeidstaker -> arbeidstaker.setArbeidstakeridentifikator(dollyPerson.getIdent()))))
+                .flatMap(skattkort -> Flux.fromIterable(skattkort.getArbeidsgiver())
+                        .map(arbeidsgiver -> SkattekortRequestDTO.builder()
+                                .arbeidsgiver(List.of(arbeidsgiver))
+                                .build())
+                        .flatMap(skattekortConsumer::sendSkattekort)
+                        .collect(Collectors.joining(",")))
+                .map(status -> futurePersist(progress, status));
+    }
+
+    private ClientFuture futurePersist(BestillingProgress progress, String status) {
+
+        return () -> {
+            transactionHelperService.persister(progress, BestillingProgress::setSkattekortStatus, status);
+            return progress;
+        };
+    }
+
+    @Override
+    public void release(List<String> identer) {
+        // Deletion is not yet supported
+    }
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/SkattekortConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/SkattekortConsumer.java
new file mode 100644
index 00000000000..08006dbe42a
--- /dev/null
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/SkattekortConsumer.java
@@ -0,0 +1,33 @@
+package no.nav.dolly.bestilling.skattekort;
+
+import no.nav.dolly.bestilling.skattekort.command.SkattekortPostCommand;
+import no.nav.dolly.config.Consumers;
+import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+
+@Service
+public class SkattekortConsumer {
+
+    private final WebClient webClient;
+    private final ServerProperties serverProperties;
+    private final TokenExchange tokenExchange;
+
+    public SkattekortConsumer(WebClient.Builder webClientBuilder, Consumers consumers, TokenExchange tokenExchange) {
+
+        this.serverProperties = consumers.getTestnavSkattekortService();
+        this.webClient = webClientBuilder
+                .baseUrl(serverProperties.getUrl())
+                .build();
+        this.tokenExchange = tokenExchange;
+    }
+
+    public Flux<String> sendSkattekort(SkattekortRequestDTO skattekortRequestDTO) {
+
+        return tokenExchange.exchange(serverProperties)
+                .flatMapMany(token -> new SkattekortPostCommand(webClient, skattekortRequestDTO, token.getTokenValue()).call());
+    }
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/command/SkattekortPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/command/SkattekortPostCommand.java
new file mode 100644
index 00000000000..0c67bd2a771
--- /dev/null
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/command/SkattekortPostCommand.java
@@ -0,0 +1,78 @@
+package no.nav.dolly.bestilling.skattekort.command;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.dolly.errorhandling.ErrorStatusDecoder;
+import no.nav.dolly.util.RequestHeaderUtil;
+import no.nav.testnav.libs.dto.skattekortservice.v1.IdentifikatorForEnhetEllerPerson;
+import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO;
+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 org.springframework.web.reactive.function.client.WebClientResponseException;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.retry.Retry;
+
+import java.time.Duration;
+import java.util.concurrent.Callable;
+
+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.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.springframework.http.HttpHeaders.ACCEPT;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
+@RequiredArgsConstructor
+public class SkattekortPostCommand implements Callable<Flux<String>> {
+
+    private static final String SKATTEKORT_URL = "/api/v1/skattekort";
+    private static final String CONSUMER = "Dolly";
+
+    private final WebClient webClient;
+    private final SkattekortRequestDTO request;
+    private final String token;
+
+    @Override
+    public Flux<String> call() {
+
+        return webClient.post().uri(uriBuilder -> uriBuilder
+                        .path(SKATTEKORT_URL)
+                        .build())
+                .header(ACCEPT, APPLICATION_JSON_VALUE)
+                .header(HEADER_NAV_CALL_ID, RequestHeaderUtil.getNavCallId())
+                .header(HEADER_NAV_CONSUMER_ID, CONSUMER)
+                .header(AUTHORIZATION, "Bearer " + token)
+                .header(UserConstant.USER_HEADER_JWT, getUserJwt())
+                .bodyValue(request)
+                .retrieve()
+                .bodyToFlux(String.class)
+                .map(status -> getArbeidsgiverAndYear(request) + ErrorStatusDecoder.encodeStatus(status))
+                        .doOnError(WebClientFilter::logErrorMessage)
+                        .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
+                                .filter(WebClientFilter::is5xxException))
+                        .onErrorResume(throwable -> throwable instanceof WebClientResponseException.NotFound,
+                                throwable -> Mono.empty());
+    }
+
+    private static String getArbeidsgiverAndYear(SkattekortRequestDTO skattekort) {
+
+        return skattekort.getArbeidsgiver().stream()
+                .findFirst()
+                .map(arbeidsgiver -> String.format("%s+%s:",
+                        getArbeidsgiver(arbeidsgiver.getArbeidsgiveridentifikator()),
+                        arbeidsgiver.getArbeidstaker().stream()
+                                .findFirst()
+                                .map(arbeidstaker -> arbeidstaker.getInntektsaar().toString())
+                                .orElse("inntektsår")))
+                .orElse("organisasjonsnummer+inntektsår:");
+    }
+
+    private static String getArbeidsgiver(IdentifikatorForEnhetEllerPerson identifikator) {
+
+        return isNotBlank(identifikator.getOrganisasjonsnummer()) ?
+                identifikator.getOrganisasjonsnummer() :
+                identifikator.getPersonidentifikator();
+    }
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/mapper/SkattekortMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/mapper/SkattekortMappingStrategy.java
new file mode 100644
index 00000000000..1d61ece0da8
--- /dev/null
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/mapper/SkattekortMappingStrategy.java
@@ -0,0 +1,18 @@
+package no.nav.dolly.bestilling.skattekort.mapper;
+
+import ma.glasnost.orika.MapperFactory;
+import no.nav.dolly.domain.resultset.skattekort.SkattekortRequestDTO;
+import no.nav.dolly.mapper.MappingStrategy;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SkattekortMappingStrategy implements MappingStrategy {
+
+    @Override
+    public void register(MapperFactory factory) {
+        factory.classMap(SkattekortRequestDTO.class, no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO.class)
+                .mapNulls(false)
+                .field("arbeidsgiverSkatt", "arbeidsgiver")
+                .register();
+    }
+}
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 971e4b2caec..13ff48fa4e2 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
@@ -44,4 +44,5 @@ public class Consumers {
     private ServerProperties testnavSyntSykemeldingApi;
     private ServerProperties testnavTpsMessagingService;
     private ServerProperties testnavUdistubProxy;
+    private ServerProperties testnavSkattekortService;
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/jpa/BestillingProgress.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/jpa/BestillingProgress.java
index 57498aa2ac0..aa5ead29790 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/jpa/BestillingProgress.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/jpa/BestillingProgress.java
@@ -118,6 +118,9 @@ public class BestillingProgress implements Serializable {
     @Column(name = "ARBEIDSPLASSENCV_STATUS")
     private String arbeidsplassenCVStatus;
 
+    @Column(name = "SKATTEKORT_STATUS")
+    private String skattekortStatus;
+
     @Column(name = "master")
     @Enumerated(EnumType.STRING)
     private Master master;
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java
index a831e69ed00..21369fd65a2 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/BestilteKriterier.java
@@ -21,6 +21,7 @@
 import no.nav.dolly.domain.resultset.pensjon.PensjonData;
 import no.nav.dolly.domain.resultset.sigrunstub.RsLignetInntekt;
 import no.nav.dolly.domain.resultset.sigrunstub.RsPensjonsgivendeForFolketrygden;
+import no.nav.dolly.domain.resultset.skattekort.SkattekortRequestDTO;
 import no.nav.dolly.domain.resultset.skjerming.RsSkjerming;
 import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding;
 import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging;
@@ -59,4 +60,5 @@ public class BestilteKriterier {
     private RsSkjerming skjerming;
     private RsSykemelding sykemelding;
     private ArbeidsplassenCVDTO arbeidsplassenCV;
+    private SkattekortRequestDTO skattekort;
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java
index 9bf2874f112..50c44963069 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java
@@ -22,6 +22,7 @@
 import no.nav.dolly.domain.resultset.pensjon.PensjonData;
 import no.nav.dolly.domain.resultset.sigrunstub.RsLignetInntekt;
 import no.nav.dolly.domain.resultset.sigrunstub.RsPensjonsgivendeForFolketrygden;
+import no.nav.dolly.domain.resultset.skattekort.SkattekortRequestDTO;
 import no.nav.dolly.domain.resultset.skjerming.RsSkjerming;
 import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding;
 import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging;
@@ -75,6 +76,7 @@ public class RsDollyBestilling {
     private BankkontoData bankkonto;
     private RsSkjerming skjerming;
     private ArbeidsplassenCVDTO arbeidsplassenCV;
+    private SkattekortRequestDTO skattekort;
 
     public List<RsAareg> getAareg() {
         if (isNull(aareg)) {
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java
index 04e8dfad626..20381dbac04 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java
@@ -37,6 +37,7 @@ public enum SystemTyper {
     SIGRUNSTUB("Skatteinntekt grunnlag (SIGRUN)"),
     SIGRUN_LIGNET("Lignet skatteinntekt (Sigrunstub)"),
     SIGRUN_PENSJONSGIVENDE("Pensjonsgivende inntekt (Sigrunstub)"),
+    SKATTEKORT("Skattekort (SOKOS)"),
     SKJERMINGSREGISTER("Skjermingsregisteret"),
     SYKEMELDING("NAV sykemelding"),
     TPS_MESSAGING("Meldinger til TPS"),
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/skattekort/SkattekortRequestDTO.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/skattekort/SkattekortRequestDTO.java
new file mode 100644
index 00000000000..8f6485aa6c7
--- /dev/null
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/skattekort/SkattekortRequestDTO.java
@@ -0,0 +1,30 @@
+package no.nav.dolly.domain.resultset.skattekort;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import no.nav.testnav.libs.dto.skattekortservice.v1.ArbeidsgiverSkatt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SkattekortRequestDTO {
+
+    private List<ArbeidsgiverSkatt> arbeidsgiverSkatt;
+
+    public List<ArbeidsgiverSkatt> getArbeidsgiverSkatt() {
+
+        if (isNull(arbeidsgiverSkatt)) {
+
+            arbeidsgiverSkatt = new ArrayList<>();
+        }
+        return arbeidsgiverSkatt;
+    }
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java
index 91d2b13de6a..b4a8a33ca60 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java
@@ -25,6 +25,7 @@
 import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding;
 import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson;
 import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
+import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.domain.Persistable;
@@ -94,6 +95,8 @@ public boolean isNew() {
     @Field
     private ArbeidsplassenCVDTO arbeidsplassenCV;
     @Field
+    private SkattekortRequestDTO skattekort;
+    @Field
     private List<String> identer;
 
     @Transient
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingSkattekortStatusMapper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingSkattekortStatusMapper.java
new file mode 100644
index 00000000000..fdce4ceee6a
--- /dev/null
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingSkattekortStatusMapper.java
@@ -0,0 +1,95 @@
+package no.nav.dolly.mapper;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import no.nav.dolly.domain.jpa.BestillingProgress;
+import no.nav.dolly.domain.resultset.RsStatusRapport;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Collections.emptyList;
+import static no.nav.dolly.domain.resultset.SystemTyper.SKATTEKORT;
+import static no.nav.dolly.mapper.AbstractRsStatusMiljoeIdentForhold.decodeMsg;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class BestillingSkattekortStatusMapper {
+
+    public static List<RsStatusRapport> buildSkattekortStatusMap(List<BestillingProgress> progressList) {
+
+        //  status     org+year       ident
+        Map<String, Map<String, Set<String>>> errorEnvIdents = new HashMap<>();
+
+        progressList.forEach(progress -> {
+            if (isNotBlank(progress.getSkattekortStatus()) && isNotBlank(progress.getIdent())) {
+                var entries = progress.getSkattekortStatus().split(",");
+                for (var entry : entries) {
+                    var orgYear = entry.split(":")[0];
+                    var status = entry.split(":")[1];
+                    if (errorEnvIdents.containsKey(status)) {
+                        if (errorEnvIdents.get(status).containsKey(orgYear)) {
+                            errorEnvIdents.get(status).get(orgYear).add(progress.getIdent());
+                        } else {
+                            errorEnvIdents.get(status).put(orgYear, new HashSet<>(Set.of(progress.getIdent())));
+                        }
+                    } else {
+                        errorEnvIdents.put(status, new HashMap<>(Map.of(orgYear, new HashSet<>(Set.of(progress.getIdent())))));
+                    }
+                }
+            }
+        });
+
+        if (errorEnvIdents.isEmpty()) {
+            return emptyList();
+
+        } else {
+            if (errorEnvIdents.entrySet().stream()
+                    .allMatch(entry -> entry.getKey().equals("Skattekort lagret"))) {
+
+                return errorEnvIdents.values().stream()
+                        .map(entry -> RsStatusRapport.builder()
+                                .id(SKATTEKORT)
+                                .navn(SKATTEKORT.getBeskrivelse())
+                                .statuser(List.of(RsStatusRapport.Status.builder()
+                                        .melding("OK")
+                                        .identer(entry.values().stream()
+                                                .map(orgYear -> orgYear.stream().toList())
+                                                .flatMap(Collection::stream)
+                                                .distinct()
+                                                .toList())
+                                        .build()))
+                                .build())
+                        .toList();
+
+            } else {
+
+                return errorEnvIdents.entrySet().stream()
+                        .filter(entry -> !entry.getKey().equals("Skattekort lagret"))
+                        .map(entry -> RsStatusRapport.builder()
+                                .id(SKATTEKORT)
+                                .navn(SKATTEKORT.getBeskrivelse())
+                                .statuser(entry.getValue().entrySet().stream()
+                                        .map(orgYear -> RsStatusRapport.Status.builder()
+                                                .melding(formatMelding(orgYear.getKey(), entry.getKey()))
+                                                .identer(orgYear.getValue().stream().toList())
+                                                .build())
+                                        .toList())
+                                .build())
+                        .toList();
+            }
+        }
+    }
+
+    private static String formatMelding(String orgYear, String melding) {
+
+        return "FEIL: organisasjon:%s, inntektsår:%s, melding:%s".formatted(
+                orgYear.split("\\+")[0],
+                orgYear.split("\\+")[1],
+                decodeMsg(melding));
+    }
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingStatusMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingStatusMappingStrategy.java
index 8c0eee3b0fc..07ed467b33b 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingStatusMappingStrategy.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingStatusMappingStrategy.java
@@ -38,6 +38,7 @@
 import static no.nav.dolly.mapper.BestillingPdlPersonStatusMapper.buildPdlPersonStatusMap;
 import static no.nav.dolly.mapper.BestillingPensjonforvalterStatusMapper.buildPensjonforvalterStatusMap;
 import static no.nav.dolly.mapper.BestillingSigrunStubStatusMapper.buildSigrunStubStatusMap;
+import static no.nav.dolly.mapper.BestillingSkattekortStatusMapper.buildSkattekortStatusMap;
 import static no.nav.dolly.mapper.BestillingSkjermingsRegisterStatusMapper.buildSkjermingsRegisterStatusMap;
 import static no.nav.dolly.mapper.BestillingSykemeldingStatusMapper.buildSykemeldingStatusMap;
 import static no.nav.dolly.mapper.BestillingTpsMessagingStatusMapper.buildTpsMessagingStatusMap;
@@ -103,6 +104,7 @@ public void mapAtoB(Bestilling bestilling, RsBestillingStatus bestillingStatus,
                         bestillingStatus.getStatus().addAll(buildSkjermingsRegisterStatusMap(progresser));
                         bestillingStatus.getStatus().addAll(buildKontoregisterStatusMap(progresser));
                         bestillingStatus.getStatus().addAll(buildArbeidsplassenCVStatusMap(progresser));
+                        bestillingStatus.getStatus().addAll(buildSkattekortStatusMap(progresser));
                         bestillingStatus.getStatus().addAll(buildAnnenFeilStatusMap(progresser));
                     }
                 })
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/DollyRequest2MalBestillingMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/DollyRequest2MalBestillingMappingStrategy.java
index 97617aee455..5d4c0403d8c 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/DollyRequest2MalBestillingMappingStrategy.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/DollyRequest2MalBestillingMappingStrategy.java
@@ -14,8 +14,11 @@
 import no.nav.dolly.mapper.MappingStrategy;
 import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO;
+import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO;
 import org.springframework.stereotype.Component;
 
+import static java.util.Objects.isNull;
+
 @Component
 public class DollyRequest2MalBestillingMappingStrategy implements MappingStrategy {
 
@@ -53,6 +56,22 @@ public void mapAtoB(RsDollyUtvidetBestilling request, RsDollyUtvidetBestilling a
                         akkumulert.getInstdata().addAll(request.getInstdata());
                         akkumulert.getSigrunstub().addAll(request.getSigrunstub());
                         akkumulert.getSigrunstubPensjonsgivende().addAll(request.getSigrunstubPensjonsgivende());
+                        if (isNull(akkumulert.getSkattekort())) {
+                            akkumulert.setSkattekort(request.getSkattekort());
+                        } else {
+                            akkumulert.getSkattekort().getArbeidsgiverSkatt()
+                                    .addAll(request.getSkattekort().getArbeidsgiverSkatt());
+                        }
+                    }
+                })
+                .register();
+
+        factory.classMap(SkattekortRequestDTO.class, SkattekortRequestDTO.class)
+                .mapNulls(false)
+                .customize(new CustomMapper<>() {
+                    @Override
+                    public void mapAtoB(SkattekortRequestDTO skattekort, SkattekortRequestDTO akkumulert, MappingContext context) {
+                        akkumulert.getArbeidsgiver().addAll(skattekort.getArbeidsgiver());
                     }
                 })
                 .register();
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java
index 5066ec21607..5164bcb4f63 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java
@@ -422,6 +422,7 @@ public String getBestKriterier(RsDollyBestilling request) {
                 .skjerming(request.getSkjerming())
                 .sykemelding(request.getSykemelding())
                 .arbeidsplassenCV(request.getArbeidsplassenCV())
+                .skattekort(request.getSkattekort())
                 .build());
     }
 
diff --git a/apps/dolly-backend/src/main/resources/application-local.yaml b/apps/dolly-backend/src/main/resources/application-local.yaml
index f013a7344f9..cba61bd629b 100644
--- a/apps/dolly-backend/src/main/resources/application-local.yaml
+++ b/apps/dolly-backend/src/main/resources/application-local.yaml
@@ -70,4 +70,6 @@ consumers:
   testnav-arbeidsplassencv-proxy:
     url: https://testnav-arbeidsplassencv-proxy.intern.dev.nav.no
   testnav-kodeverk-service:
-    url: https://testnav-kodeverk-service.intern.dev.nav.no
\ No newline at end of file
+    url: https://testnav-kodeverk-service.intern.dev.nav.no
+  testnav-skattekort-service:
+    url: https://testnav-skattekort-service.intern.dev.nav.no
\ No newline at end of file
diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yaml
index b7143d8e865..f2bb53a8d5d 100644
--- a/apps/dolly-backend/src/main/resources/application.yaml
+++ b/apps/dolly-backend/src/main/resources/application.yaml
@@ -236,4 +236,9 @@ consumers:
     namespace: dolly
     url: http://testnav-arbeidsplassencv-proxy.dolly.svc.cluster.local
     cluster: dev-gcp
+  testnavSkattekortService:
+    name: testnav-skattekort-service
+    namespace: dolly
+    url: http://testnav-skattekort-service.dolly.svc.cluster.local
+    cluster: dev-gcp
     
\ No newline at end of file
diff --git a/apps/dolly-backend/src/main/resources/db/migration/V1.7.24__AlterBestillingProgressSkattekort.sql b/apps/dolly-backend/src/main/resources/db/migration/V1.7.24__AlterBestillingProgressSkattekort.sql
new file mode 100644
index 00000000000..79de07a3fa0
--- /dev/null
+++ b/apps/dolly-backend/src/main/resources/db/migration/V1.7.24__AlterBestillingProgressSkattekort.sql
@@ -0,0 +1,6 @@
+-----------------------------
+-- A L T E R   T A B L E S --
+-----------------------------
+
+alter table bestilling_progress
+add column skattekort_status varchar(2048);
\ No newline at end of file
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index 0c6eec6c7ea..f924989b6d5 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -132,4 +132,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
                         .filters(filter, addUserJwtHeaderFilter())
                 ).uri(host);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle
index 2efc7c7d5d6..06911756cd6 100644
--- a/apps/endringsmelding-service/build.gradle
+++ b/apps/endringsmelding-service/build.gradle
@@ -20,8 +20,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle
index 975d7537c32..d0262742b65 100644
--- a/apps/ereg-batch-status-service/build.gradle
+++ b/apps/ereg-batch-status-service/build.gradle
@@ -23,8 +23,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle
index 683138fe87c..96d217a72ff 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle
+++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle
@@ -23,8 +23,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle
index e9128a37078..daed7ca1a1f 100644
--- a/apps/generer-navn-service/build.gradle
+++ b/apps/generer-navn-service/build.gradle
@@ -21,8 +21,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle
index 90f8dafb97e..9c1768c82f4 100644
--- a/apps/generer-organisasjon-populasjon-service/build.gradle
+++ b/apps/generer-organisasjon-populasjon-service/build.gradle
@@ -33,15 +33,15 @@ dependencies {
 
     implementation 'org.springframework.kafka:spring-kafka'
 
-    implementation 'io.confluent:kafka-avro-serializer:7.6.1'
-    implementation 'jakarta.validation:jakarta.validation-api:3.1.0'
+    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
+    implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
     implementation 'org.flywaydb:flyway-core'
     implementation 'com.h2database:h2'
     implementation 'com.zaxxer:HikariCP'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
-    implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.projectreactor:reactor-spring:$versions.reactorSpring"
     implementation 'org.postgresql:postgresql'
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle
index a7ab4499bfb..582abaf023a 100644
--- a/apps/generer-synt-amelding-service/build.gradle
+++ b/apps/generer-synt-amelding-service/build.gradle
@@ -23,8 +23,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle
index d134383b9e3..f7535f9d68f 100644
--- a/apps/helsepersonell-service/build.gradle
+++ b/apps/helsepersonell-service/build.gradle
@@ -21,6 +21,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 }
\ No newline at end of file
diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle
index 1f3408ebc17..22e95963649 100644
--- a/apps/inntektsmelding-generator-service/build.gradle
+++ b/apps/inntektsmelding-generator-service/build.gradle
@@ -18,17 +18,17 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    implementation 'org.aspectj:aspectjweaver:1.9.22'
+    implementation "org.aspectj:aspectjweaver:$versions.jweaver"
 
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
-    implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
-    implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
-    implementation 'com.sun.xml.bind:jaxb-core:4.0.5'
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
+    implementation "com.sun.xml.bind:jaxb-impl:$versions.jaxb"
+    implementation "com.sun.xml.bind:jaxb-core:$versions.jaxb"
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0'
diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle
index 77150e60bba..67622313baa 100644
--- a/apps/inntektsmelding-service/build.gradle
+++ b/apps/inntektsmelding-service/build.gradle
@@ -22,10 +22,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4'
+    implementation "no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:$versions.navAltinnInntektsmelding"
 
     implementation 'org.apache.commons:commons-io:1.3.2'
 
diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle
index d8462adf3a0..96be491762b 100644
--- a/apps/jenkins-batch-status-service/build.gradle
+++ b/apps/jenkins-batch-status-service/build.gradle
@@ -24,8 +24,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle
index a6fd3f3096a..27ac16d7327 100644
--- a/apps/joark-dokument-service/build.gradle
+++ b/apps/joark-dokument-service/build.gradle
@@ -22,8 +22,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/kodeverk-service/build.gradle b/apps/kodeverk-service/build.gradle
index 73c539385ad..4aeeb607350 100644
--- a/apps/kodeverk-service/build.gradle
+++ b/apps/kodeverk-service/build.gradle
@@ -20,8 +20,8 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-cache'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     implementation 'com.github.ben-manes.caffeine:caffeine'
 }
diff --git a/apps/kodeverk-service/config.yml b/apps/kodeverk-service/config.yml
index 690c5389cc0..e72ef4771f1 100644
--- a/apps/kodeverk-service/config.yml
+++ b/apps/kodeverk-service/config.yml
@@ -21,6 +21,7 @@ spec:
         - application: testnav-oversikt-frontend
         - application: testnav-pdl-forvalter
         - application: testnav-pdl-forvalter-dev
+        - application: testnav-levende-arbeidsforhold-ansettelse
     outbound:
       external:
         - host: kodeverk-api.nav.no
@@ -54,4 +55,4 @@ spec:
     limits:
       memory: 2048Mi
   ingresses:
-    - "https://testnav-kodeverk-service.intern.dev.nav.no"
\ No newline at end of file
+    - "https://testnav-kodeverk-service.intern.dev.nav.no"
diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle
index 3542a92e169..6ba4a6a7266 100644
--- a/apps/miljoer-service/build.gradle
+++ b/apps/miljoer-service/build.gradle
@@ -21,8 +21,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle
index c96e355d75b..98a6449f8ae 100644
--- a/apps/oppsummeringsdokument-service/build.gradle
+++ b/apps/oppsummeringsdokument-service/build.gradle
@@ -10,9 +10,9 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
-    implementation 'javax.activation:activation:1.1.1'
-    implementation 'org.glassfish.jaxb:jaxb-runtime'
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "javax.activation:activation:$versions.javaxActivation"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
 
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:security-core'
@@ -20,20 +20,20 @@ dependencies {
     implementation 'no.nav.testnav.libs:servlet-security'
     implementation 'no.nav.testnav.xsd:arbeidsforhold-xsd'
 
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.1'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    implementation 'org.opensearch.client:spring-data-opensearch:1.4.0'
+    implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch"
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
     implementation 'org.springframework.kafka:spring-kafka'
-    implementation 'org.apache.kafka:kafka-clients:3.7.0'
+    implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle
index 49c26126d73..d0f03b0b23a 100644
--- a/apps/organisasjon-bestilling-service/build.gradle
+++ b/apps/organisasjon-bestilling-service/build.gradle
@@ -30,8 +30,8 @@ dependencies {
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.postgresql:postgresql'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle
index 6d25402d7f3..adb4ef27310 100644
--- a/apps/organisasjon-faste-data-service/build.gradle
+++ b/apps/organisasjon-faste-data-service/build.gradle
@@ -28,17 +28,17 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
 
-    implementation 'jakarta.validation:jakarta.validation-api:3.1.0'
-    implementation 'io.confluent:kafka-avro-serializer:7.6.1'
+    implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
+    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
 
     implementation 'org.flywaydb:flyway-core'
     implementation 'com.zaxxer:HikariCP'
     implementation 'com.h2database:h2'
     implementation 'org.postgresql:postgresql'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
-    implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.projectreactor:reactor-spring:$versions.reactorSpring"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle
index a797e956911..03052c5a3ec 100644
--- a/apps/organisasjon-forvalter/build.gradle
+++ b/apps/organisasjon-forvalter/build.gradle
@@ -33,14 +33,14 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
 
-    implementation 'org.apache.avro:avro:1.11.3'
+    implementation "org.apache.avro:avro:$versions.apacheAvro"
 
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.postgresql:postgresql'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
     testImplementation 'com.h2database:h2'
     testImplementation 'no.nav.testnav.libs:testing'
diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle
index 3cc4f014c31..e2205e6ad42 100644
--- a/apps/organisasjon-mottak-service/build.gradle
+++ b/apps/organisasjon-mottak-service/build.gradle
@@ -28,10 +28,10 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
     implementation 'org.springframework.kafka:spring-kafka'
-    implementation 'org.apache.kafka:kafka-clients:3.7.0'
-    implementation 'io.confluent:kafka-avro-serializer:7.6.1'
+    implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka"
+    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle
index 15983dd6171..504d05dcd93 100644
--- a/apps/organisasjon-service/build.gradle
+++ b/apps/organisasjon-service/build.gradle
@@ -22,10 +22,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'no.nav.testnav.libs:testing'
-    testImplementation 'org.assertj:assertj-core:3.26.0'
+    testImplementation "org.assertj:assertj-core:$versions.assertj"
 }
diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle
index cac64614994..3989bbbfd80 100644
--- a/apps/organisasjon-tilgang-service/build.gradle
+++ b/apps/organisasjon-tilgang-service/build.gradle
@@ -21,10 +21,10 @@ dependencies {
     implementation 'org.postgresql:r2dbc-postgresql'
     implementation 'org.flywaydb:flyway-core'
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle
index 6747304bad4..1a79299b6c6 100644
--- a/apps/orgnummer-service/build.gradle
+++ b/apps/orgnummer-service/build.gradle
@@ -24,13 +24,13 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
 
-    implementation 'jakarta.validation:jakarta.validation-api:3.1.0'
+    implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
     implementation 'org.flywaydb:flyway-core'
     implementation 'com.h2database:h2'
     implementation 'com.zaxxer:HikariCP'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     implementation 'org.postgresql:postgresql'
 }
diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle
index ad38e381713..a396a86e94f 100644
--- a/apps/oversikt-frontend/build.gradle
+++ b/apps/oversikt-frontend/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     
     implementation 'org.springframework.session:spring-session-core'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle
index a12c382a9e5..abdf9719dab 100644
--- a/apps/pdl-forvalter/build.gradle
+++ b/apps/pdl-forvalter/build.gradle
@@ -30,15 +30,15 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     implementation 'org.postgresql:postgresql'
     implementation 'org.flywaydb:flyway-core'
 
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
     testImplementation 'no.nav.testnav.libs:testing'
 }
\ No newline at end of file
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/ForeldreansvarService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForeldreansvarService.java
index a1aac782cad..604b88dc825 100644
--- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForeldreansvarService.java
+++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ForeldreansvarService.java
@@ -113,19 +113,31 @@ public void validate(ForeldreansvarDTO foreldreansvar, PersonDTO hovedperson) {
                 .anyMatch(alder -> alder.getFoedselsaar() <= LocalDateTime.now().minusYears(MYNDIG_ALDER).getYear())) {
 
             if ((foreldreansvar.getAnsvar() == Ansvar.MOR || foreldreansvar.getAnsvar() == Ansvar.MEDMOR) &&
+<<<<<<< HEAD
                     isNull(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+=======
+                    isBlank(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+>>>>>>> 63de518655e3fe576ff56346f04d9504f126c9c9
                     !isRelasjonMor(hovedperson)) {
                 throw new InvalidRequestException(INVALID_RELASJON_MOR_EXCEPTION);
             }
 
             if ((foreldreansvar.getAnsvar() == Ansvar.FAR) &&
+<<<<<<< HEAD
                     isNull(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+=======
+                    isBlank(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+>>>>>>> 63de518655e3fe576ff56346f04d9504f126c9c9
                     !isRelasjonFar(hovedperson)) {
                 throw new InvalidRequestException(INVALID_RELASJON_FAR_EXCEPTION);
             }
 
             if ((foreldreansvar.getAnsvar() == Ansvar.FELLES) &&
+<<<<<<< HEAD
                     isNull(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+=======
+                    isBlank(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+>>>>>>> 63de518655e3fe576ff56346f04d9504f126c9c9
                     !isRelasjonForeldre(hovedperson)) {
                 throw new InvalidRequestException(INVALID_RELASJON_FELLES_EXCEPTION);
             }
@@ -184,22 +196,22 @@ private void validateForeldreansvar(ForeldreansvarDTO foreldreansvar) {
         }
     }
 
-    public void validateBarn(ForeldreansvarDTO foreldreansvar, PersonDTO barn) {
+    private void validateBarn(ForeldreansvarDTO foreldreansvar, PersonDTO barn) {
 
         if ((foreldreansvar.getAnsvar() == Ansvar.MOR || foreldreansvar.getAnsvar() == Ansvar.MEDMOR) &&
-                isNull(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+                isBlank(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
                 !isRelasjonFraBarn(barn, MOR, MEDMOR)) {
             throw new InvalidRequestException(INVALID_RELASJON_MOR_EXCEPTION);
         }
 
         if ((foreldreansvar.getAnsvar() == Ansvar.FAR) &&
-                isNull(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+                isBlank(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
                 !isRelasjonFraBarn(barn, FAR)) {
             throw new InvalidRequestException(INVALID_RELASJON_FAR_EXCEPTION);
         }
 
         if ((foreldreansvar.getAnsvar() == Ansvar.FELLES) &&
-                isNull(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
+                isBlank(foreldreansvar.getAnsvarlig()) && isNull(foreldreansvar.getAnsvarligUtenIdentifikator()) &&
                 !isRelasjonForeldreFraBarn(barn)) {
             throw new InvalidRequestException(INVALID_RELASJON_FELLES_EXCEPTION);
         }
@@ -344,7 +356,11 @@ public void handle(ForeldreansvarDTO foreldreansvar, PersonDTO person) {
 
                     makeAnsvarligUtenIdentifikator(foreldreansvar, person);
 
+<<<<<<< HEAD
                 } else if (isNull(foreldreansvar.getAnsvarlig())) {
+=======
+                } else if (isBlank(foreldreansvar.getAnsvarlig())) {
+>>>>>>> 63de518655e3fe576ff56346f04d9504f126c9c9
 
                     opprettNyAsvarlig(foreldreansvar, person);
                 }
@@ -424,7 +440,7 @@ private void handleBarn(ForeldreansvarDTO foreldreansvar, PersonDTO barn) {
 
                 setAnsvarUtenIdentifikator(foreldreansvar, barn);
 
-            } else if (isNull(foreldreansvar.getAnsvarlig())) {
+            } else if (isBlank(foreldreansvar.getAnsvarlig())) {
 
                 opprettNyAsvarlig(foreldreansvar, barn);
             }
diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle
index db7f8c23a30..745a0854d4d 100644
--- a/apps/person-faste-data-service/build.gradle
+++ b/apps/person-faste-data-service/build.gradle
@@ -25,9 +25,9 @@ dependencies {
     implementation 'com.zaxxer:HikariCP'
     implementation 'org.postgresql:postgresql'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle
index b42ef832505..d7959ce9df3 100644
--- a/apps/person-organisasjon-tilgang-service/build.gradle
+++ b/apps/person-organisasjon-tilgang-service/build.gradle
@@ -28,12 +28,12 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'no.nav.testnav.libs:integration-test'
-    testImplementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
+    testImplementation "com.squareup.okhttp3:okhttp:$versions.okhttp"
+    testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp"
 }
diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle
index 35180b607e3..02965927619 100644
--- a/apps/person-search-service/build.gradle
+++ b/apps/person-search-service/build.gradle
@@ -18,18 +18,18 @@ dependencies {
     implementation 'no.nav.testnav.libs:servlet-security'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
-    implementation 'org.opensearch.client:spring-data-opensearch:1.4.0'
+    implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch"
 
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
\ No newline at end of file
diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle
index 31e404e1828..1b0944a8593 100644
--- a/apps/person-service/build.gradle
+++ b/apps/person-service/build.gradle
@@ -23,8 +23,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle
index 46e2b97e3f5..05b7ac72f0d 100644
--- a/apps/profil-api/build.gradle
+++ b/apps/profil-api/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/skattekort-service/build.gradle b/apps/skattekort-service/build.gradle
index a798e1c8744..a49aaa40e38 100644
--- a/apps/skattekort-service/build.gradle
+++ b/apps/skattekort-service/build.gradle
@@ -1,43 +1,13 @@
 plugins {
-    id 'java'
-    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 "dolly-apps"
+
     id 'org.unbroken-dome.xjc' version '2.0.0'
 }
 
 sonarqube {
     properties {
-        property "sonar.dynamicAnalysis", "reuseReports"
-        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.organization", "navikt"
-        property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-skattekort-service"
         property "sonar.projectName", "testnav-skattekort-service"
-        property "sonar.sourceEncoding", "UTF-8"
-    }
-}
-
-bootJar {
-    archiveFileName = "app.jar"
-    mainClass = 'no.nav.skattekortservice.SkattekortServiceApplicationStarter'
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-dependencyManagement {
-    applyMavenExclusions = false
-    imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
-    }
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -52,21 +22,9 @@ xjc {
     srcDirName = 'resources/schema'
 }
 
-repositories {
-    mavenCentral()
-    maven {
-        name = "GitHubPackages"
-        url = uri('https://maven.pkg.github.com/navikt/maven-release')
-        credentials(PasswordCredentials) {
-            password System.getenv("NAV_TOKEN")
-            username 'token'
-        }
-    }
-}
-
 dependencies {
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
-    implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.0'
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
     implementation 'org.json:json:20231013'
 
     implementation 'no.nav.testnav.libs:security-core'
@@ -74,26 +32,13 @@ dependencies {
     implementation 'no.nav.testnav.libs:reactive-security'
     implementation 'no.nav.testnav.libs:data-transfer-objects'
 
-    implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     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'
-    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.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'
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
-    annotationProcessor 'org.projectlombok:lombok'
-    implementation 'org.projectlombok:lombok'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 }
\ No newline at end of file
diff --git a/apps/skattekort-service/config.yml b/apps/skattekort-service/config.yml
index f040ef425d6..26ec83a2ed0 100644
--- a/apps/skattekort-service/config.yml
+++ b/apps/skattekort-service/config.yml
@@ -20,8 +20,11 @@ spec:
     inbound:
       rules:
         - application: dolly-backend
+        - application: dolly-backend-dev
         - application: dolly-frontend
+        - application: dolly-frontend-dev
         - application: dolly-idporten
+        - application: team-dolly-lokal-app
         - application: testnav-oversikt-frontend
     outbound:
       external:
diff --git a/apps/skattekort-service/settings.gradle b/apps/skattekort-service/settings.gradle
index b42e15f1e9a..a35cbdbc703 100644
--- a/apps/skattekort-service/settings.gradle
+++ b/apps/skattekort-service/settings.gradle
@@ -4,6 +4,8 @@ plugins {
 
 rootProject.name = 'skattekort-service'
 
+includeBuild "../../plugins/java"
+
 includeBuild '../../libs/security-core'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'
diff --git a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/SkattekortServiceApplicationStarter.java b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/SkattekortServiceApplicationStarter.java
index 1c714ebb8b7..0d5a91d6a10 100644
--- a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/SkattekortServiceApplicationStarter.java
+++ b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/SkattekortServiceApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(SkattekortServiceApplicationStarter.class, args);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponsIntermediate.java b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponsIntermediate.java
index dcf4a91927e..efeef1ffbc1 100644
--- a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponsIntermediate.java
+++ b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponsIntermediate.java
@@ -1,11 +1,15 @@
 package no.nav.skattekortservice.dto;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import no.nav.testnav.libs.dto.skattekortservice.v1.IdentifikatorForEnhetEllerPerson;
 
 import java.time.LocalDate;
@@ -88,9 +92,6 @@ public static class Skattekort {
         private LocalDate utstedtDato;
         private Long skattekortidentifikator;
         private List<Forskuddstrekk> forskuddstrekk;
-        private List<Frikort> frikort;
-        private List<Trekktabell> trekktabell;
-        private List<Trekkprosent> trekkprosent;
 
         public List<Forskuddstrekk> getForskuddstrekk() {
 
@@ -99,59 +100,40 @@ public List<Forskuddstrekk> getForskuddstrekk() {
             }
             return forskuddstrekk;
         }
-
-        public List<Frikort> getFrikort() {
-
-            if (isNull(frikort)) {
-                frikort = new ArrayList<>();
-            }
-            return frikort;
-        }
-
-        public List<Trekktabell> getTrekktabell() {
-
-            if (isNull(trekktabell)) {
-                trekktabell = new ArrayList<>();
-            }
-            return trekktabell;
-        }
-
-        public List<Trekkprosent> getTrekkprosent() {
-
-            if (isNull(trekkprosent)) {
-                trekkprosent = new ArrayList<>();
-            }
-            return trekkprosent;
-        }
     }
 
     @Data
-    @Builder
+    @SuperBuilder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class Forskuddstrekk {
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "xsi:type")
+    @JsonSubTypes({
+            @JsonSubTypes.Type(value = Frikort.class, name = "Frikort"),
+            @JsonSubTypes.Type(value = Trekktabell.class, name = "Trekktabell"),
+            @JsonSubTypes.Type(value = Trekkprosent.class, name = "Trekkprosent")
+    })
+    public abstract static class Forskuddstrekk {
 
         private Trekkode trekkode;
+        private String type;
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    @Builder
+    @SuperBuilder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class Frikort {
-
-        private Trekkode trekkode;
+    public static class Frikort extends Forskuddstrekk {
 
         private Integer frikortbeloep;
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    @Builder
+    @SuperBuilder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class Trekktabell {
-
-        private Trekkode trekkode;
+    public static class Trekktabell extends Forskuddstrekk {
 
         private Tabelltype tabelltype;
         private String tabellnummer;
@@ -159,11 +141,12 @@ public static class Trekktabell {
         private Integer antallMaanederForTrekk;
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    @Builder
+    @SuperBuilder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class Trekkprosent {
+    public static class Trekkprosent extends Forskuddstrekk {
 
         private Trekkode trekkode;
 
diff --git a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponse.java b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponse.java
index 76b2ef5d19d..43cbb649855 100644
--- a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponse.java
+++ b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/dto/SkattekortResponse.java
@@ -4,7 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import no.nav.testnav.libs.dto.skattekortservice.v1.Arbeidsgiver;
+import no.nav.testnav.libs.dto.skattekortservice.v1.ArbeidsgiverSkatt;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,9 +25,9 @@ public class SkattekortResponse {
     @AllArgsConstructor
     public static class SkattekortTilArbeidsgiver {
 
-        private List<Arbeidsgiver> arbeidsgiver;
+        private List<ArbeidsgiverSkatt> arbeidsgiver;
 
-        public List<Arbeidsgiver> getArbeidsgiver() {
+        public List<ArbeidsgiverSkatt> getArbeidsgiver() {
 
             if (isNull(arbeidsgiver)) {
                 arbeidsgiver = new ArrayList<>();
diff --git a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/ArbeidsgiverMappingStrategy.java b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/ArbeidsgiverMappingStrategy.java
index 28348b1e7ff..6d3f64c1a3b 100644
--- a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/ArbeidsgiverMappingStrategy.java
+++ b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/ArbeidsgiverMappingStrategy.java
@@ -5,7 +5,6 @@
 import ma.glasnost.orika.MapperFactory;
 import ma.glasnost.orika.MappingContext;
 import no.nav.skattekortservice.dto.SkattekortResponsIntermediate;
-import no.nav.testnav.libs.dto.skattekortservice.v1.Forskuddstrekk;
 import no.nav.testnav.libs.dto.skattekortservice.v1.Frikort;
 import no.nav.testnav.libs.dto.skattekortservice.v1.Resultatstatus;
 import no.nav.testnav.libs.dto.skattekortservice.v1.Skattekort;
@@ -17,6 +16,8 @@
 import no.nav.testnav.libs.dto.skattekortservice.v1.Trekktabell;
 import org.springframework.stereotype.Component;
 
+import static java.util.Objects.nonNull;
+
 @Slf4j
 @Component
 public class ArbeidsgiverMappingStrategy implements MappingStrategy {
@@ -39,22 +40,12 @@ public void mapAtoB(SkattekortResponsIntermediate.Skattekortmelding source, Skat
                 })
                 .register();
 
-        factory.classMap(SkattekortResponsIntermediate.Forskuddstrekk.class, Forskuddstrekk.class)
-                .customize(new CustomMapper<>() {
-                    @Override
-                    public void mapAtoB(SkattekortResponsIntermediate.Forskuddstrekk source, Forskuddstrekk target, MappingContext context) {
-
-                        target.setTrekkode(Trekkode.valueOf(source.getTrekkode().getValue()));
-                    }
-                })
-                .register();
-
         factory.classMap(SkattekortResponsIntermediate.Frikort.class, Frikort.class)
                 .customize(new CustomMapper<>() {
                     @Override
                     public void mapAtoB(SkattekortResponsIntermediate.Frikort source, Frikort target, MappingContext context) {
 
-                        target.setTrekkode(Trekkode.valueOf(source.getTrekkode().getValue()));
+                        target.setTrekkode(getTrekkodeValue(source.getTrekkode()));
                         target.setFrikortbeloep(source.getFrikortbeloep());
                     }
                 })
@@ -65,7 +56,7 @@ public void mapAtoB(SkattekortResponsIntermediate.Frikort source, Frikort target
                     @Override
                     public void mapAtoB(SkattekortResponsIntermediate.Trekktabell source, Trekktabell target, MappingContext context) {
 
-                        target.setTrekkode(Trekkode.valueOf(source.getTrekkode().getValue()));
+                        target.setTrekkode(getTrekkodeValue(source.getTrekkode()));
                         target.setTabelltype(Tabelltype.valueOf(source.getTabelltype().getValue()));
                         target.setTabellnummer(source.getTabellnummer());
                         target.setProsentsats(source.getProsentsats());
@@ -79,11 +70,16 @@ public void mapAtoB(SkattekortResponsIntermediate.Trekktabell source, Trekktabel
                     @Override
                     public void mapAtoB(SkattekortResponsIntermediate.Trekkprosent source, Trekkprosent target, MappingContext context) {
 
-                        target.setTrekkode(Trekkode.valueOf(target.getTrekkode().getValue()));
+                        target.setTrekkode(getTrekkodeValue(source.getTrekkode()));
                         target.setProsentsats(source.getProsentsats());
                         target.setAntallMaanederForTrekk(source.getAntallMaanederForTrekk());
                     }
                 })
                 .register();
     }
+
+    private static Trekkode getTrekkodeValue(SkattekortResponsIntermediate.Trekkode trekkode) {
+
+        return nonNull(trekkode.getValue()) ? Trekkode.valueOf(trekkode.getValue()) : null;
+    }
 }
diff --git a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/TrekktypeMappingStrategy.java b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/ForskuddstrekkMappingStrategy.java
similarity index 52%
rename from apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/TrekktypeMappingStrategy.java
rename to apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/ForskuddstrekkMappingStrategy.java
index 0d6d81dfd77..5e6c1273f11 100644
--- a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/TrekktypeMappingStrategy.java
+++ b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/mapper/ForskuddstrekkMappingStrategy.java
@@ -9,7 +9,6 @@
 import no.nav.testnav.libs.dto.skattekortservice.v1.Skattekort;
 import no.nav.testnav.libs.dto.skattekortservice.v1.Trekkprosent;
 import no.nav.testnav.libs.dto.skattekortservice.v1.Trekktabell;
-import no.nav.testnav.libs.dto.skattekortservice.v1.Trekktype;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -17,7 +16,7 @@
 import static java.util.Objects.nonNull;
 
 @Component
-public class TrekktypeMappingStrategy implements MappingStrategy {
+public class ForskuddstrekkMappingStrategy implements MappingStrategy {
     @Override
     public void register(MapperFactory factory) {
 
@@ -26,20 +25,17 @@ public void register(MapperFactory factory) {
                     @Override
                     public void mapAtoB(Skattekort skattekort, no.skatteetaten.fastsetting.formueinntekt.forskudd.skattekorttilarbeidsgiver.v3.Skattekort skattekort2, MappingContext context) {
 
-                        skattekort2.getForskuddstrekk().addAll(skattekort.getTrekktype().stream()
-                                .map(trekktype -> {
-                                    if (nonNull(trekktype.getFrikort())) {
-                                        return mapperFacade.map(trekktype.getFrikort(),
+                        skattekort2.getForskuddstrekk().addAll(skattekort.getForskuddstrekk().stream()
+                                .map(forskuddstrekk -> {
+                                    if (nonNull(forskuddstrekk.getFrikort())) {
+                                        return mapperFacade.map(forskuddstrekk.getFrikort(),
                                                 no.skatteetaten.fastsetting.formueinntekt.forskudd.skattekorttilarbeidsgiver.v3.Frikort.class);
-                                    } else if (nonNull(trekktype.getTrekktabell())) {
-                                        return mapperFacade.map(trekktype.getTrekktabell(),
+                                    } else if (nonNull(forskuddstrekk.getTrekktabell())) {
+                                        return mapperFacade.map(forskuddstrekk.getTrekktabell(),
                                                 no.skatteetaten.fastsetting.formueinntekt.forskudd.skattekorttilarbeidsgiver.v3.Trekktabell.class);
-                                    } else if (nonNull(trekktype.getTrekkprosent())) {
-                                        return mapperFacade.map(trekktype.getTrekkprosent(),
+                                    } else if (nonNull(forskuddstrekk.getTrekkprosent())) {
+                                        return mapperFacade.map(forskuddstrekk.getTrekkprosent(),
                                                 no.skatteetaten.fastsetting.formueinntekt.forskudd.skattekorttilarbeidsgiver.v3.Trekkprosent.class);
-                                    } else if (nonNull(trekktype.getForskuddstrekk())) {
-                                        return mapperFacade.map(trekktype.getForskuddstrekk(),
-                                                no.skatteetaten.fastsetting.formueinntekt.forskudd.skattekorttilarbeidsgiver.v3.Forskuddstrekk.class);
                                     } else {
                                         return null;
                                     }
@@ -48,7 +44,7 @@ public void mapAtoB(Skattekort skattekort, no.skatteetaten.fastsetting.formueinn
                                 .toList());
                     }
                 })
-                .exclude("trekktype")
+                .exclude("forskuddstrekk")
                 .byDefault()
                 .register();
 
@@ -57,29 +53,21 @@ public void mapAtoB(Skattekort skattekort, no.skatteetaten.fastsetting.formueinn
                     @Override
                     public void mapAtoB(SkattekortResponsIntermediate.Skattekort skattekort, Skattekort skattekort2, MappingContext context) {
 
-                        skattekort2.getTrekktype().addAll(skattekort.getFrikort().stream()
-                                .map(frikort -> Trekktype.builder()
-                                        .frikort(mapperFacade.map(frikort, Frikort.class))
-                                        .build())
-                                .toList());
-                        skattekort2.getTrekktype().addAll(skattekort.getForskuddstrekk().stream()
-                                .map(forskuddstrekk -> Trekktype.builder()
-                                        .forskuddstrekk(mapperFacade.map(forskuddstrekk, Forskuddstrekk.class))
-                                        .build())
-                                .toList());
-                        skattekort2.getTrekktype().addAll(skattekort.getTrekkprosent().stream()
-                                .map(trekkprosent -> Trekktype.builder()
-                                        .trekkprosent(mapperFacade.map(trekkprosent, Trekkprosent.class))
-                                        .build())
-                                .toList());
-                        skattekort2.getTrekktype().addAll(skattekort.getTrekktabell().stream()
-                                .map(trekktabell -> Trekktype.builder()
-                                        .trekktabell(mapperFacade.map(trekktabell, Trekktabell.class))
-                                        .build())
-                                .toList());
+                        skattekort2.setSkattekortidentifikator(skattekort.getSkattekortidentifikator());
+                        skattekort2.setUtstedtDato(skattekort.getUtstedtDato());
+                        skattekort.getForskuddstrekk()
+                                .forEach(forskuddstrekk -> skattekort2.getForskuddstrekk().add(
+                                        Forskuddstrekk.builder()
+                                                .frikort(forskuddstrekk instanceof SkattekortResponsIntermediate.Frikort ?
+                                                        mapperFacade.map(forskuddstrekk, Frikort.class) : null)
+                                                .trekktabell(forskuddstrekk instanceof SkattekortResponsIntermediate.Trekktabell ?
+                                                        mapperFacade.map(forskuddstrekk, Trekktabell.class) : null)
+                                                .trekkprosent(forskuddstrekk instanceof SkattekortResponsIntermediate.Trekkprosent ?
+                                                        mapperFacade.map(forskuddstrekk, Trekkprosent.class) : null)
+                                                .build()
+                                ));
                     }
                 })
-                .byDefault()
                 .register();
     }
 }
\ No newline at end of file
diff --git a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/service/SkattekortService.java b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/service/SkattekortService.java
index c116642a81f..836f8379d3a 100644
--- a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/service/SkattekortService.java
+++ b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/service/SkattekortService.java
@@ -12,7 +12,7 @@
 import no.nav.skattekortservice.dto.SokosRequest;
 import no.nav.skattekortservice.dto.SokosResponse;
 import no.nav.skattekortservice.utility.SkattekortValidator;
-import no.nav.testnav.libs.dto.skattekortservice.v1.Arbeidsgiver;
+import no.nav.testnav.libs.dto.skattekortservice.v1.ArbeidsgiverSkatt;
 import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO;
 import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortResponseDTO;
 import org.json.XML;
@@ -107,10 +107,10 @@ private String decodeRequest(String request) {
     }
 
     @SneakyThrows
-    private List<Arbeidsgiver> unmarshal(String xmlData) {
+    private List<ArbeidsgiverSkatt> unmarshal(String xmlData) {
 
         var jsonRoot = XML.toJSONObject(xmlData);
         var intermediate = objectMapper.readValue(jsonRoot.toString(), SkattekortResponsIntermediate.class);
-        return mapperFacade.mapAsList(intermediate.getSkattekortTilArbeidsgiver().getArbeidsgiver(), Arbeidsgiver.class);
+        return mapperFacade.mapAsList(intermediate.getSkattekortTilArbeidsgiver().getArbeidsgiver(), ArbeidsgiverSkatt.class);
     }
 }
\ No newline at end of file
diff --git a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/utility/SkattekortValidator.java b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/utility/SkattekortValidator.java
index 6c4a87dc66a..e039d549028 100644
--- a/apps/skattekort-service/src/main/java/no/nav/skattekortservice/utility/SkattekortValidator.java
+++ b/apps/skattekort-service/src/main/java/no/nav/skattekortservice/utility/SkattekortValidator.java
@@ -1,7 +1,7 @@
 package no.nav.skattekortservice.utility;
 
 import lombok.experimental.UtilityClass;
-import no.nav.testnav.libs.dto.skattekortservice.v1.Arbeidsgiver;
+import no.nav.testnav.libs.dto.skattekortservice.v1.ArbeidsgiverSkatt;
 import no.nav.testnav.libs.dto.skattekortservice.v1.Skattekort;
 import no.nav.testnav.libs.dto.skattekortservice.v1.SkattekortRequestDTO;
 import no.nav.testnav.libs.dto.skattekortservice.v1.Skattekortmelding;
@@ -25,10 +25,10 @@ public static void validate(SkattekortRequestDTO skattekort) {
     private static void validateSkattekort(SkattekortRequestDTO skattekort) {
 
         skattekort.getArbeidsgiver().stream()
-                .map(Arbeidsgiver::getArbeidstaker)
+                .map(ArbeidsgiverSkatt::getArbeidstaker)
                 .flatMap(Collection::stream)
                 .map(Skattekortmelding::getSkattekort)
-                .map(Skattekort::getTrekktype)
+                .map(Skattekort::getForskuddstrekk)
                 .flatMap(Collection::stream)
                 .forEach(trekktype -> {
                     if (trekktype.isAllEmpty()) {
@@ -44,7 +44,7 @@ private static void validateSkattekort(SkattekortRequestDTO skattekort) {
     private static void validateArbeidstager(SkattekortRequestDTO skattekort) {
 
         skattekort.getArbeidsgiver().stream()
-                .map(Arbeidsgiver::getArbeidstaker)
+                .map(ArbeidsgiverSkatt::getArbeidstaker)
                 .flatMap(Collection::stream)
                 .forEach(arbeidstaker -> {
                     if (arbeidstaker.isEmptyArbeidstakeridentifikator()) {
@@ -60,7 +60,7 @@ private static void validateArbeidstager(SkattekortRequestDTO skattekort) {
     private static void validateArbeidsgiver(SkattekortRequestDTO skattekort) {
 
         skattekort.getArbeidsgiver().stream()
-                .map(Arbeidsgiver::getArbeidsgiveridentifikator)
+                .map(ArbeidsgiverSkatt::getArbeidsgiveridentifikator)
                 .forEach(arbeidsgiver -> {
                     if (arbeidsgiver.isAllEmpty()) {
                         throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle
index 83c6eddff06..ca0ef57453e 100644
--- a/apps/sykemelding-api/build.gradle
+++ b/apps/sykemelding-api/build.gradle
@@ -21,18 +21,18 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.3'
+    implementation "com.ibm.mq:mq-jms-spring-boot-starter:$versions.mq"
     implementation 'org.springframework.kafka:spring-kafka'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
-    implementation 'jakarta.activation:jakarta.activation-api:2.1.3'
-    implementation 'org.glassfish.jaxb:jaxb-runtime'
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "jakarta.activation:jakarta.activation-api:$versions.jakartaActivation"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
 
-    implementation 'org.apache.kafka:kafka-clients:3.7.0'
-    implementation 'io.confluent:kafka-avro-serializer:7.6.1'
+    implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka"
+    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
 
     testImplementation 'no.nav.testnav.libs:testing'
     testImplementation 'org.springframework.security:spring-security-test'
diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle
index eb83949743f..d16feb5f7f2 100644
--- a/apps/synt-sykemelding-api/build.gradle
+++ b/apps/synt-sykemelding-api/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'no.nav.testnav.libs:testing'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle
index dfb441da87d..1cc0aa03dd3 100644
--- a/apps/synt-vedtakshistorikk-service/build.gradle
+++ b/apps/synt-vedtakshistorikk-service/build.gradle
@@ -21,9 +21,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
-    implementation 'com.google.guava:guava:33.2.0-jre'
+    implementation "com.google.guava:guava:$versions.guava"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5
diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle
index 6fdabd19299..ea1398e40d3 100644
--- a/apps/tenor-search-service/build.gradle
+++ b/apps/tenor-search-service/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'no.nav.testnav.libs:integration-test'
diff --git a/apps/tenor-search-service/config.yml b/apps/tenor-search-service/config.yml
index 2eb29f3038e..4664354954f 100644
--- a/apps/tenor-search-service/config.yml
+++ b/apps/tenor-search-service/config.yml
@@ -29,6 +29,7 @@ spec:
         - application: dolly-idporten
         - application: team-dolly-lokal-app
         - application: testnav-oversikt-frontend
+        - application: testnav-levende-arbeidsforhold-ansettelse
     outbound:
       rules:
         - application: dolly-backend
@@ -62,4 +63,4 @@ spec:
     - "https://testnav-tenor-search-service.intern.dev.nav.no"
   env:
     - name: SPRING_PROFILES_ACTIVE
-      value: prod
\ No newline at end of file
+      value: prod
diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle
index 5193965cf39..0bb3e37d932 100644
--- a/apps/testnav-ident-pool/build.gradle
+++ b/apps/testnav-ident-pool/build.gradle
@@ -30,15 +30,15 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
     implementation 'org.springframework.retry:spring-retry'
 
-    implementation 'org.aspectj:aspectjweaver'
+    implementation "org.aspectj:aspectjweaver:$versions.jweaver"
 
     implementation 'com.h2database:h2'
 
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.postgresql:postgresql'
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'org.springframework.security:spring-security-test'
diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle
index b5edf50c4d2..6dd8cd066e7 100644
--- a/apps/testnorge-statisk-data-forvalter/build.gradle
+++ b/apps/testnorge-statisk-data-forvalter/build.gradle
@@ -10,7 +10,7 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'com.google.guava:guava:33.2.0-jre'
+    implementation "com.google.guava:guava:$versions.guava"
 
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:servlet-security'
@@ -24,7 +24,7 @@ dependencies {
     implementation 'no.nav.testnav.libs:csv-converter'
 
     implementation 'org.springframework.kafka:spring-kafka'
-    implementation 'io.confluent:kafka-avro-serializer:7.6.1'
+    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -34,7 +34,7 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    implementation 'org.aspectj:aspectjweaver:1.9.22'
+    implementation "org.aspectj:aspectjweaver:$versions.jweaver"
     implementation 'org.postgresql:postgresql'
     implementation 'com.zaxxer:HikariCP'
 
@@ -43,14 +43,14 @@ dependencies {
     implementation 'com.h2database:h2'
    
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "com.squareup.okhttp3:okhttp:$versions.okhttp"
 
     testImplementation 'no.nav.testnav.libs:testing'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'org.springframework.security:spring-security-test'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3'
+    testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp"
 }
 
 description = 'testnorge-statisk-data-forvalter'
diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle
index 18c30dc7887..cbb640e8bfe 100644
--- a/apps/tilbakemelding-api/build.gradle
+++ b/apps/tilbakemelding-api/build.gradle
@@ -22,13 +22,13 @@ 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.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
 
     implementation 'org.reactivestreams:reactive-streams:1.0.4'
 
-    implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE'
+    implementation "org.projectreactor:reactor-spring:$versions.reactorSpring"
 
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
 }
diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle
index a294779524b..f6c23a4d1d4 100644
--- a/apps/tps-messaging-service/build.gradle
+++ b/apps/tps-messaging-service/build.gradle
@@ -28,20 +28,20 @@ dependencies {
 
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
-    implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.3'
+    implementation "com.ibm.mq:mq-jms-spring-boot-starter:$versions.mq"
     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 "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "com.sun.xml.bind:jaxb-core:$versions.jaxb"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
 
-    implementation 'no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-s610-domain:2020.08.27-09.53-183ead3d81eb'
-    implementation 'no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-m201-domain:2020.08.27-09.53-183ead3d81eb'
-    implementation 'no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-castor-tps-s018-domain:2020.08.27-09.53-183ead3d81eb'
+    implementation "no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-s610-domain:$versions.navFellesregister"
+    implementation "no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-m201-domain:$versions.navFellesregister"
+    implementation "no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-castor-tps-s018-domain:$versions.navFellesregister"
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
-    implementation 'org.aspectj:aspectjweaver:1.9.22'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
+    implementation "org.aspectj:aspectjweaver:$versions.jweaver"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 }
\ No newline at end of file
diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle
index 2d3e7ca0d9b..b9afdb2c571 100644
--- a/apps/udi-stub/build.gradle
+++ b/apps/udi-stub/build.gradle
@@ -23,7 +23,7 @@ configurations {
 dependencies {
     implementation platform('org.testcontainers:testcontainers-bom:1.19.8')
 
-    implementation "com.sun.xml.ws:jaxws-rt:4.0.2"
+    implementation "com.sun.xml.ws:jaxws-rt:$versions.jaxws"
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:servlet-security'
     implementation 'no.nav.testnav.libs:database'
@@ -43,9 +43,9 @@ dependencies {
     implementation 'org.flywaydb:flyway-core'
     implementation 'com.zaxxer:HikariCP'
 
-    implementation 'ma.glasnost.orika:orika-core:1.5.4'
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation 'com.h2database:h2'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle
index dddc98bead8..1735ab74ece 100644
--- a/apps/varslinger-service/build.gradle
+++ b/apps/varslinger-service/build.gradle
@@ -11,7 +11,7 @@ sonarqube {
 
 dependencies {
 
-    implementation 'com.google.guava:guava:33.2.0-jre'
+    implementation "com.google.guava:guava:$versions.guava"
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:database'
@@ -27,7 +27,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     implementation 'com.h2database:h2'
     implementation 'com.zaxxer:HikariCP'
diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle
index 9ee8384b058..27ed8451880 100644
--- a/examples/reactive-rest-example/build.gradle
+++ b/examples/reactive-rest-example/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     runtimeOnly 'com.h2database:h2'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback"
     implementation 'org.hibernate.validator:hibernate-validator'
 }
diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle
index 274ce6210ae..09e3817af9a 100644
--- a/libs/avro-schema/build.gradle
+++ b/libs/avro-schema/build.gradle
@@ -10,6 +10,6 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'org.apache.avro:avro-compiler:1.11.3'
-    implementation 'org.apache.avro:avro-maven-plugin:1.11.3'
+    implementation "org.apache.avro:avro-compiler:$versions.apacheAvro"
+    implementation "org.apache.avro:avro-maven-plugin:$versions.apacheAvro"
 }
\ No newline at end of file
diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle
index 3275231900d..108ee4d21e2 100644
--- a/libs/data-transfer-objects/build.gradle
+++ b/libs/data-transfer-objects/build.gradle
@@ -14,14 +14,14 @@ 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.21'
-    implementation 'jakarta.validation:jakarta.validation-api'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
     implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
     implementation 'org.apache.commons:commons-lang3'
     implementation 'org.springframework:spring-web'
 
-    implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4'
+    implementation "no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:$versions.navAltinnInntektsmelding"
 }
 
 tasks.withType(JavaCompile) {
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Arbeidsgiver.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/ArbeidsgiverSkatt.java
similarity index 94%
rename from libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Arbeidsgiver.java
rename to libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/ArbeidsgiverSkatt.java
index 24de5895b0f..2aa7c31153c 100644
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Arbeidsgiver.java
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/ArbeidsgiverSkatt.java
@@ -14,7 +14,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Arbeidsgiver {
+public class ArbeidsgiverSkatt {
 
     private IdentifikatorForEnhetEllerPerson arbeidsgiveridentifikator;
     private List<Skattekortmelding> arbeidstaker;
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Forskuddstrekk.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Forskuddstrekk.java
index 0d2dc40687a..aeed4c1f671 100644
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Forskuddstrekk.java
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Forskuddstrekk.java
@@ -1,15 +1,48 @@
 package no.nav.testnav.libs.dto.skattekortservice.v1;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Arrays;
+import java.util.Objects;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class Forskuddstrekk {
 
-    private Trekkode trekkode;
+    private Frikort frikort;
+    private Trekktabell trekktabell;
+    private Trekkprosent trekkprosent;
+
+    @JsonIgnore
+    public boolean isAllEmpty() {
+
+        return contentsCount() == 0;
+    }
+
+    @JsonIgnore
+    public boolean isAmbiguous() {
+
+        return contentsCount() > 1;
+    }
+
+    private long contentsCount() {
+
+        return Arrays.stream(getClass().getDeclaredFields())
+                .map(field -> {
+                    try {
+                        field.setAccessible(true);
+                        return field.get(this);
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .filter(Objects::nonNull)
+                .count();
+    }
 }
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Skattekort.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Skattekort.java
index b7f872e60a1..94a1bb58fa3 100644
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Skattekort.java
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Skattekort.java
@@ -19,14 +19,14 @@ public class Skattekort {
 
     private LocalDate utstedtDato;
     private Long skattekortidentifikator;
-    private List<Trekktype> trekktype;
+    private List<Forskuddstrekk> forskuddstrekk;
 
-    public List<Trekktype> getTrekktype() {
+    public List<Forskuddstrekk> getForskuddstrekk() {
 
-        if (isNull(trekktype)) {
-            trekktype = new ArrayList<>();
+        if (isNull(forskuddstrekk)) {
+            forskuddstrekk = new ArrayList<>();
         }
-        return trekktype;
 
+        return forskuddstrekk;
     }
 }
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortRequestDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortRequestDTO.java
index 0aa629dd051..c11c69b16e3 100644
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortRequestDTO.java
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortRequestDTO.java
@@ -16,9 +16,9 @@
 @AllArgsConstructor
 public class SkattekortRequestDTO {
 
-    private List<Arbeidsgiver> arbeidsgiver;
+    private List<ArbeidsgiverSkatt> arbeidsgiver;
 
-    public List<Arbeidsgiver> getArbeidsgiver() {
+    public List<ArbeidsgiverSkatt> getArbeidsgiver() {
 
         if (isNull(arbeidsgiver)) {
             arbeidsgiver = new ArrayList<>();
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortResponseDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortResponseDTO.java
index e0a95fe06c9..53228268f21 100644
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortResponseDTO.java
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/SkattekortResponseDTO.java
@@ -18,10 +18,10 @@ public class SkattekortResponseDTO {
 
     private String ident;
     private String inntektsaar;
-    private List<Arbeidsgiver> arbeidsgiver;
+    private List<ArbeidsgiverSkatt> arbeidsgiver;
     private String skattekortXml;
 
-    public List<Arbeidsgiver> getArbeidsgiver() {
+    public List<ArbeidsgiverSkatt> getArbeidsgiver() {
 
         if (isNull(arbeidsgiver)) {
             arbeidsgiver = new ArrayList<>();
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Trekktype.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Trekktype.java
deleted file mode 100644
index 5042a2e4870..00000000000
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/skattekortservice/v1/Trekktype.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package no.nav.testnav.libs.dto.skattekortservice.v1;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-@Data
-@SuperBuilder
-@NoArgsConstructor
-public class Trekktype {
-
-    private Forskuddstrekk forskuddstrekk;
-    private Frikort frikort;
-    private Trekktabell trekktabell;
-    private Trekkprosent trekkprosent;
-
-    @JsonIgnore
-    public boolean isAllEmpty() {
-
-        return contentsCount() == 0;
-    }
-
-    @JsonIgnore
-    public boolean isAmbiguous() {
-
-        return contentsCount() > 1;
-    }
-
-    private long contentsCount() {
-
-        return Arrays.stream(getClass().getDeclaredFields())
-                .map(field -> {
-                    try {
-                        field.setAccessible(true);
-                        return field.get(this);
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    }
-                })
-                .filter(Objects::nonNull)
-                .count();
-    }
-}
diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle
index e01561121ca..0ed6e488199 100644
--- a/libs/data-transfer-search-objects/build.gradle
+++ b/libs/data-transfer-search-objects/build.gradle
@@ -14,9 +14,9 @@ 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.21'
-    implementation 'jakarta.validation:jakarta.validation-api'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
     implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
     implementation 'org.apache.commons:commons-lang3'
     implementation 'org.springframework:spring-web'
diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle
index feecda27c3e..a8586d3d0e8 100644
--- a/libs/domain/build.gradle
+++ b/libs/domain/build.gradle
@@ -12,8 +12,8 @@ sonarqube {
 dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
     implementation 'io.springfox:springfox-swagger2:3.0.0'
 }
\ No newline at end of file
diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle
index e82832e1e78..1f09eb7b21d 100644
--- a/libs/kafka-producers/build.gradle
+++ b/libs/kafka-producers/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation 'no.nav.testnav.libs:avro-schema'
 
     implementation 'org.springframework.kafka:spring-kafka'
-    implementation 'io.confluent:kafka-avro-serializer:7.6.1'
+    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
 }
\ No newline at end of file
diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle
index bf27e78235e..7af354a3b43 100644
--- a/libs/reactive-core/build.gradle
+++ b/libs/reactive-core/build.gradle
@@ -27,7 +27,7 @@ publishing {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback"
 
-    testImplementation 'io.projectreactor:reactor-test:3.6.5'
+    testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
 }
\ No newline at end of file
diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle
index 0bff93a11d6..4f4646a99ae 100644
--- a/libs/reactive-security/build.gradle
+++ b/libs/reactive-security/build.gradle
@@ -45,7 +45,7 @@ publishing {
 dependencies {
 
     implementation 'no.nav.testnav.libs:security-core'
-    implementation 'com.auth0:java-jwt:4.4.0'
+    implementation "com.auth0:java-jwt:$versions.jwt"
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle
index be94578b17a..d2a0c1ae784 100644
--- a/libs/reactive-session-security/build.gradle
+++ b/libs/reactive-session-security/build.gradle
@@ -10,7 +10,7 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'com.auth0:java-jwt:4.4.0'
+    implementation "com.auth0:java-jwt:$versions.jwt"
     implementation 'no.nav.testnav.libs:security-core'
 
     implementation "org.springframework.session:spring-session-core"
diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle
index 58a7de01e46..c2f472acaa5 100644
--- a/libs/security-core/build.gradle
+++ b/libs/security-core/build.gradle
@@ -14,7 +14,7 @@ tasks.named('compileJava') {
 }
 
 dependencies {
-    implementation 'com.auth0:java-jwt:4.4.0'
+    implementation "com.auth0:java-jwt:$versions.jwt"
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle
index 002ebbe4a64..37aba9ca55a 100644
--- a/libs/servlet-core/build.gradle
+++ b/libs/servlet-core/build.gradle
@@ -11,8 +11,8 @@ sonarqube {
 
 dependencies {
 
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback"
 
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle
index 37487ce71cf..44a67aa7bed 100644
--- a/libs/servlet-security/build.gradle
+++ b/libs/servlet-security/build.gradle
@@ -12,7 +12,7 @@ sonarqube {
 dependencies {
 
     implementation 'no.nav.testnav.libs:security-core'
-    implementation 'com.auth0:java-jwt:4.4.0'
+    implementation "com.auth0:java-jwt:$versions.jwt"
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle
index 69120f53847..8e52747b710 100644
--- a/libs/testing/build.gradle
+++ b/libs/testing/build.gradle
@@ -11,6 +11,6 @@ sonarqube {
 
 dependencies {
     implementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
     implementation 'com.fasterxml.jackson.core:jackson-databind'
 }
\ No newline at end of file
diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle
index e737db4165e..2ee420309f3 100644
--- a/mocks/maskinporten-mock/build.gradle
+++ b/mocks/maskinporten-mock/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation 'com.auth0:java-jwt:4.4.0'
+    implementation "com.auth0:java-jwt:$versions.jwt"
 
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:reactive-core'
@@ -11,7 +11,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.5.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
-    compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+    compileOnly 'jakarta.servlet:jakarta.servlet-api'
 }
diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle
index 1f70a420e11..f5f11a9570d 100644
--- a/mocks/tokendings-mock/build.gradle
+++ b/mocks/tokendings-mock/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation 'com.auth0:java-jwt:4.4.0'
+    implementation "com.auth0:java-jwt:$versions.jwt"
 
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:reactive-core'
@@ -12,7 +12,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.5.0'
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
-    compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+    compileOnly 'jakarta.servlet:jakarta.servlet-api'
 }
diff --git a/plugins/java/src/main/groovy/dolly-apps.gradle b/plugins/java/src/main/groovy/dolly-apps.gradle
index ba686f8b995..3426f98bdd1 100644
--- a/plugins/java/src/main/groovy/dolly-apps.gradle
+++ b/plugins/java/src/main/groovy/dolly-apps.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "dolly-sonar"
+    id "dolly-versions"
 
     id "io.spring.dependency-management" // See ../../../build.gradle for version.
     id "java"
@@ -20,7 +21,7 @@ dependencies {
 
     developmentOnly "org.springframework.boot:spring-boot-devtools"
 
-    implementation "net.logstash.logback:logstash-logback-encoder:7.4"
+    implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback"
     implementation "org.hibernate.validator:hibernate-validator"
     implementation "org.projectlombok:lombok"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
@@ -37,9 +38,9 @@ dependencies {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom "org.springframework.boot:spring-boot-dependencies:3.2.1"
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1"
-        mavenBom "org.springframework.session:spring-session-bom:2021.2.3"
+        mavenBom "org.springframework.boot:spring-boot-dependencies:$versions.springBoot"
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:$versions.springCloud"
+        mavenBom "org.springframework.session:spring-session-bom:$versions.springSession"
     }
 }
 
diff --git a/plugins/java/src/main/groovy/dolly-libs.gradle b/plugins/java/src/main/groovy/dolly-libs.gradle
index fd21bb5f6e0..9002e295ad3 100644
--- a/plugins/java/src/main/groovy/dolly-libs.gradle
+++ b/plugins/java/src/main/groovy/dolly-libs.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "dolly-sonar"
+    id "dolly-versions"
 
     id "io.spring.dependency-management" // See ../../../build.gradle for version.
     id "java-library"
@@ -16,8 +17,8 @@ configurations {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom "org.springframework.boot:spring-boot-dependencies:3.2.1"
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1"
+        mavenBom "org.springframework.boot:spring-boot-dependencies:$versions.springBoot"
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:$versions.springCloud"
     }
 }
 
diff --git a/plugins/java/src/main/groovy/dolly-proxies.gradle b/plugins/java/src/main/groovy/dolly-proxies.gradle
index e6b941df7e7..ea907c260bf 100644
--- a/plugins/java/src/main/groovy/dolly-proxies.gradle
+++ b/plugins/java/src/main/groovy/dolly-proxies.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "dolly-sonar"
+    id "dolly-versions"
 
     id "io.spring.dependency-management" // See ../../../build.gradle for version.
     id "java"
@@ -20,7 +21,7 @@ dependencies {
 
     developmentOnly "org.springframework.boot:spring-boot-devtools"
 
-    implementation "net.logstash.logback:logstash-logback-encoder:7.4"
+    implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-proxy"
     implementation "org.hibernate.validator:hibernate-validator"
@@ -40,9 +41,9 @@ dependencies {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom "org.springframework.boot:spring-boot-dependencies:3.2.1"
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1"
-        mavenBom "org.springframework.session:spring-session-bom:2021.2.3"
+        mavenBom "org.springframework.boot:spring-boot-dependencies:$versions.springBoot"
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:$versions.springCloud"
+        mavenBom "org.springframework.session:spring-session-bom:$versions.springSession"
     }
 }
 
diff --git a/plugins/java/src/main/groovy/dolly-versions.gradle b/plugins/java/src/main/groovy/dolly-versions.gradle
new file mode 100644
index 00000000000..27445a6f0da
--- /dev/null
+++ b/plugins/java/src/main/groovy/dolly-versions.gradle
@@ -0,0 +1,36 @@
+extensions.create("versions", DollyVersionCatalog)
+
+class DollyVersionCatalog {
+    String navAltinnInntektsmelding = "1.2019.08.16-13.46-35cbdfd492d4"
+    String navFellesregister = "2020.08.27-09.53-183ead3d81eb"
+
+    String springBoot = "3.2.1"
+    String springCloud = "2023.0.1"
+    String springSession = "2021.2.3"
+
+    String apacheAvro = "1.11.3"
+    String apacheKafka = "3.7.0"
+    String apachePoi = "5.2.5"
+    String assertj = "3.26.0"
+    String avro = "7.6.1"
+    String guava = "33.2.0-jre"
+    String jackson = "2.17.1"
+    String jakartaActivation = "2.1.3"
+    String jakartaValidation = "3.1.0"
+    String jakartaXmlBindApi = "4.0.2"
+    String javaxActivation = "1.1.1"
+    String javaxAnnotation = "1.3.2"
+    String jaxb = "4.0.5"
+    String jaxws = "4.0.2"
+    String jweaver = "1.9.22"
+    String jwt = "4.4.0"
+    String logback = "7.4"
+    String mq = "3.2.3"
+    String okhttp = "4.10.0"
+    String opensearch = "1.4.0"
+    String orika = "1.5.4"
+    String reactorSpring = "1.0.1.RELEASE"
+    String reactorTest = "3.6.5"
+    String springdoc = "2.5.0"
+    String swagger = "2.2.21"
+}
\ No newline at end of file
diff --git a/proxies/aareg-proxy/config.yml b/proxies/aareg-proxy/config.yml
index f733815cdce..9265c224f6a 100644
--- a/proxies/aareg-proxy/config.yml
+++ b/proxies/aareg-proxy/config.yml
@@ -52,6 +52,8 @@ spec:
           cluster: dev-gcp
         - application: testnorge-statisk-data-forvalter
           cluster: dev-fss
+        - application: testnav-levende-arbeidsforhold-ansettelse
+          cluster: dev-gcp
   liveness:
     path: /internal/isAlive
     initialDelay: 4
diff --git a/proxies/pdl-proxy/config.yml b/proxies/pdl-proxy/config.yml
index 323e598ede3..fd0abde46da 100644
--- a/proxies/pdl-proxy/config.yml
+++ b/proxies/pdl-proxy/config.yml
@@ -58,6 +58,8 @@ spec:
           cluster: dev-gcp
         - application: testnav-tenor-search-service
           cluster: dev-gcp
+        - application: testnav-levende-arbeidsforhold-ansettelse
+          cluster: dev-gcp
     outbound:
       rules:
         - application: pdl-testdata
diff --git a/xsd/arbeidsforhold-xsd/build.gradle b/xsd/arbeidsforhold-xsd/build.gradle
index 850de59b639..c5174f16d0d 100644
--- a/xsd/arbeidsforhold-xsd/build.gradle
+++ b/xsd/arbeidsforhold-xsd/build.gradle
@@ -11,12 +11,12 @@ sonarqube {
 group = 'no.nav.testnav.xsd'
 
 dependencies {
-    implementation 'jakarta.activation:jakarta.activation-api:2.1.3'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+    implementation "jakarta.activation:jakarta.activation-api:$versions.jakartaActivation"
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
 
-    xjc 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+    xjc "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
     xjc 'org.glassfish.jaxb:jaxb-xjc:4.0.5'
-    xjc 'com.sun.xml.bind:jaxb-impl:4.0.5'
+    xjc "com.sun.xml.bind:jaxb-impl:$versions.jaxb"
     xjc 'com.sun.istack:istack-commons-runtime:4.2.0'
 }