From f1ed06590148d771ee93a6f3d7e8225a069c2060 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 10 Apr 2024 15:58:51 +0200
Subject: [PATCH] Fix for logback oppsett #deploy-endringsmelding-frontend
 #deploy-endringsmelding-service #deploy-tps-messaging-service
 #deploy-test-frontend

---
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 apps/brreg-stub/src/main/resources/logback-spring.xml    | 3 ++-
 .../bruker-service/src/main/resources/logback-spring.xml | 6 ++++--
 .../budpro-service/src/main/resources/logback-spring.xml | 3 ++-
 apps/dolly-backend/src/main/resources/logback-spring.xml | 3 ++-
 .../dolly-frontend/src/main/resources/logback-spring.xml | 3 ++-
 apps/dollystatus/src/main/resources/logback-spring.xml   | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 6 ++++--
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 apps/pdl-forvalter/src/main/resources/logback-spring.xml | 3 ++-
 .../src/main/resources/logback-spring.xml                | 5 +++--
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../person-service/src/main/resources/logback-spring.xml | 3 ++-
 apps/profil-api/src/main/resources/logback-spring.xml    | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 5 +++--
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 apps/udi-stub/src/main/resources/logback-spring.xml      | 3 ++-
 .../src/main/resources/logback-spring.xml                | 6 ++++--
 .../src/main/resources/logback-spring.xml                | 3 ++-
 ...{DollyLogbackEncoder.java => DollyLogbackLayout.java} | 7 ++++++-
 ...{DollyLogbackEncoder.java => DollyLogbackLayout.java} | 9 +++++++--
 .../aareg-proxy/src/main/resources/logback-spring.xml    | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../dokarkiv-proxy/src/main/resources/logback-spring.xml | 3 ++-
 proxies/ereg-proxy/src/main/resources/logback-spring.xml | 3 ++-
 .../histark-proxy/src/main/resources/logback-spring.xml  | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 proxies/inst-proxy/src/main/resources/logback-spring.xml | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../krrstub-proxy/src/main/resources/logback-spring.xml  | 3 ++-
 proxies/medl-proxy/src/main/resources/logback-spring.xml | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../norg2-proxy/src/main/resources/logback-spring.xml    | 3 ++-
 proxies/pdl-proxy/src/main/resources/logback-spring.xml  | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 proxies/saf-proxy/src/main/resources/logback-spring.xml  | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../src/main/resources/logback-spring.xml                | 3 ++-
 .../udistub-proxy/src/main/resources/logback-spring.xml  | 3 ++-
 78 files changed, 173 insertions(+), 84 deletions(-)
 rename libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/{DollyLogbackEncoder.java => DollyLogbackLayout.java} (82%)
 rename libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/{DollyLogbackEncoder.java => DollyLogbackLayout.java} (75%)

diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml
index 6595d976d70..b5676347c14 100644
--- a/apps/adresse-service/src/main/resources/logback-spring.xml
+++ b/apps/adresse-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/apps/amelding-service/src/main/resources/logback-spring.xml
+++ b/apps/amelding-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
index 82b3f8dad33..803031980fa 100644
--- a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
+++ b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
index 4f72e135ea8..b052f83d230 100644
--- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
+++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml
index 3364c049115..86987ef37a2 100644
--- a/apps/brreg-stub/src/main/resources/logback-spring.xml
+++ b/apps/brreg-stub/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml
index 7872cd651a0..b0e1850eb07 100644
--- a/apps/bruker-service/src/main/resources/logback-spring.xml
+++ b/apps/bruker-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +25,8 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml
index 2c7b2d55e66..a92f9af3406 100644
--- a/apps/budpro-service/src/main/resources/logback-spring.xml
+++ b/apps/budpro-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml
index b3f6c2d7a35..5a6ea947bb8 100644
--- a/apps/dolly-backend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-backend/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml
index fa21599b79c..57b5465f668 100644
--- a/apps/dolly-frontend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod,dev,idporten">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/apps/dollystatus/src/main/resources/logback-spring.xml
+++ b/apps/dollystatus/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
index 1d023de9949..4f764105cec 100644
--- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
index 24ba45cd33d..5bf0e8577fe 100644
--- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml
index aeea0e2808f..8cb873abbff 100644
--- a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml
+++ b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
index 9c4e24c9024..ee4311671c9 100644
--- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml
+++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
index 50a2dc358d8..cd9958e7178 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-navn-service/src/main/resources/logback-spring.xml b/apps/generer-navn-service/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/apps/generer-navn-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
index 50a2dc358d8..cd9958e7178 100644
--- a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
index aeea0e2808f..8cb873abbff 100644
--- a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/helsepersonell-service/src/main/resources/logback-spring.xml b/apps/helsepersonell-service/src/main/resources/logback-spring.xml
index a3849a09e03..a5d35dcff1c 100644
--- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml
+++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
index 50a2dc358d8..cd9958e7178 100644
--- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
index 50a2dc358d8..cd9958e7178 100644
--- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
index 1a09d4ba2fc..00e4f75ed9a 100644
--- a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
+++ b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/joark-dokument-service/src/main/resources/logback-spring.xml b/apps/joark-dokument-service/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml
+++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/kodeverk-service/src/main/resources/logback-spring.xml b/apps/kodeverk-service/src/main/resources/logback-spring.xml
index aeea0e2808f..8cb873abbff 100644
--- a/apps/kodeverk-service/src/main/resources/logback-spring.xml
+++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/miljoer-service/src/main/resources/logback-spring.xml b/apps/miljoer-service/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/apps/miljoer-service/src/main/resources/logback-spring.xml
+++ b/apps/miljoer-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
index 94d8aa4af94..5489f69bcb3 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
index 1a09d4ba2fc..00e4f75ed9a 100644
--- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
index 1a09d4ba2fc..00e4f75ed9a 100644
--- a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
index 50a2dc358d8..cd9958e7178 100644
--- a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
index 4f72e135ea8..b052f83d230 100644
--- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-service/src/main/resources/logback-spring.xml b/apps/organisasjon-service/src/main/resources/logback-spring.xml
index 50a2dc358d8..cd9958e7178 100644
--- a/apps/organisasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
index b344704dd15..e1e3322d2d5 100644
--- a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +25,8 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
index e50f8f227df..1e309d72767 100644
--- a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/orgnummer-service/src/main/resources/logback-spring.xml b/apps/orgnummer-service/src/main/resources/logback-spring.xml
index aeea0e2808f..8cb873abbff 100644
--- a/apps/orgnummer-service/src/main/resources/logback-spring.xml
+++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/oversikt-frontend/src/main/resources/logback-spring.xml b/apps/oversikt-frontend/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml
+++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/pdl-forvalter/src/main/resources/logback-spring.xml b/apps/pdl-forvalter/src/main/resources/logback-spring.xml
index 898cd6f552e..67b4a323cb5 100644
--- a/apps/pdl-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/pdl-forvalter/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
 
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/person-faste-data-service/src/main/resources/logback-spring.xml b/apps/person-faste-data-service/src/main/resources/logback-spring.xml
index 6bae863ddb6..ee4311671c9 100644
--- a/apps/person-faste-data-service/src/main/resources/logback-spring.xml
+++ b/apps/person-faste-data-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -36,5 +37,5 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
 </configuration>
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
index bcc6c27b39c..d72fbe3c228 100644
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
+++ b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/person-search-service/src/main/resources/logback-spring.xml b/apps/person-search-service/src/main/resources/logback-spring.xml
index a90015801e5..b215d575db6 100644
--- a/apps/person-search-service/src/main/resources/logback-spring.xml
+++ b/apps/person-search-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/person-service/src/main/resources/logback-spring.xml b/apps/person-service/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/apps/person-service/src/main/resources/logback-spring.xml
+++ b/apps/person-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/profil-api/src/main/resources/logback-spring.xml b/apps/profil-api/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/apps/profil-api/src/main/resources/logback-spring.xml
+++ b/apps/profil-api/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/sykemelding-api/src/main/resources/logback-spring.xml b/apps/sykemelding-api/src/main/resources/logback-spring.xml
index 1c822bd4984..84d7e4ed95b 100644
--- a/apps/sykemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/sykemelding-api/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
index dad63619510..9cb1024b42e 100644
--- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
+++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/tenor-search-service/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml
index d3f432e6914..b8bf9fb69b7 100644
--- a/apps/tenor-search-service/src/main/resources/logback-spring.xml
+++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -36,5 +37,5 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
 </configuration>
\ No newline at end of file
diff --git a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
index 3364c049115..86987ef37a2 100644
--- a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
+++ b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml
index 3364c049115..86987ef37a2 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/tps-messaging-service/src/main/resources/logback-spring.xml b/apps/tps-messaging-service/src/main/resources/logback-spring.xml
index 3364c049115..86987ef37a2 100644
--- a/apps/tps-messaging-service/src/main/resources/logback-spring.xml
+++ b/apps/tps-messaging-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/udi-stub/src/main/resources/logback-spring.xml b/apps/udi-stub/src/main/resources/logback-spring.xml
index 04b6de820ff..af1bd90312f 100644
--- a/apps/udi-stub/src/main/resources/logback-spring.xml
+++ b/apps/udi-stub/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/varslinger-service/src/main/resources/logback-spring.xml b/apps/varslinger-service/src/main/resources/logback-spring.xml
index 373ed950428..08b78c65a79 100644
--- a/apps/varslinger-service/src/main/resources/logback-spring.xml
+++ b/apps/varslinger-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +25,8 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/examples/reactive-rest-example/src/main/resources/logback-spring.xml b/examples/reactive-rest-example/src/main/resources/logback-spring.xml
index ed8f767e048..db3ab82bfeb 100644
--- a/examples/reactive-rest-example/src/main/resources/logback-spring.xml
+++ b/examples/reactive-rest-example/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackEncoder.java b/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackLayout.java
similarity index 82%
rename from libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackEncoder.java
rename to libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackLayout.java
index 51703b206de..f96d09e73fd 100644
--- a/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackEncoder.java
+++ b/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackLayout.java
@@ -6,10 +6,15 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DollyLogbackEncoder extends PatternLayout {
+public class DollyLogbackLayout extends PatternLayout {
     // matches exactly 11 digits (\\d{11}) that are not immediately preceded ((?<!\\d)) or followed ((?!\\d)) by another digit.
     private final Pattern pattern = Pattern.compile("(?<!\\\\d)\\\\d{11}(?!\\\\d)");
 
+    public DollyLogbackLayout() {
+        // Set a default pattern
+        this.setPattern("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n");
+    }
+
     @Override
     public String doLayout(ILoggingEvent event) {
         String message = event.getFormattedMessage();
diff --git a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackEncoder.java b/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackLayout.java
similarity index 75%
rename from libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackEncoder.java
rename to libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackLayout.java
index 1bccf4c6b9c..941353af8b3 100644
--- a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackEncoder.java
+++ b/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackLayout.java
@@ -6,9 +6,14 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DollyLogbackEncoder extends PatternLayout {
+public class DollyLogbackLayout extends PatternLayout {
     // matches exactly 11 digits (\\d{11}) that are not immediately preceded ((?<!\\d)) or followed ((?!\\d)) by another digit.
-    private Pattern pattern = Pattern.compile("(?<!\\\\d)\\\\d{11}(?!\\\\d)");
+    private final Pattern pattern = Pattern.compile("(?<!\\\\d)\\\\d{11}(?!\\\\d)");
+
+    public DollyLogbackLayout() {
+        // Set a default pattern
+        this.setPattern("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n");
+    }
 
     @Override
     public String doLayout(ILoggingEvent event) {
diff --git a/proxies/aareg-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-proxy/src/main/resources/logback-spring.xml
index d3f432e6914..b94eb9388b5 100644
--- a/proxies/aareg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/aareg-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
index 9cb8ec3830e..c57325a133c 100644
--- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/ereg-proxy/src/main/resources/logback-spring.xml b/proxies/ereg-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/histark-proxy/src/main/resources/logback-spring.xml b/proxies/histark-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/histark-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/inst-proxy/src/main/resources/logback-spring.xml b/proxies/inst-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/inst-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
index 15fe5494931..95094a7d52b 100644
--- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/medl-proxy/src/main/resources/logback-spring.xml b/proxies/medl-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/medl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/norg2-proxy/src/main/resources/logback-spring.xml b/proxies/norg2-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/pdl-proxy/src/main/resources/logback-spring.xml b/proxies/pdl-proxy/src/main/resources/logback-spring.xml
index 33520e53c7c..27020c5c331 100644
--- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
index 70f9ea93fd0..fd1e65c323e 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/saf-proxy/src/main/resources/logback-spring.xml b/proxies/saf-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/saf-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
index 6bae863ddb6..b674b8f8e84 100644
--- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
index 7dd6c9141ca..2b480b75970 100644
--- a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
index 24ba45cd33d..5bf0e8577fe 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/udistub-proxy/src/main/resources/logback-spring.xml b/proxies/udistub-proxy/src/main/resources/logback-spring.xml
index 3df339f5995..aa8d7c84f14 100644
--- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.servletcore.logging.DollyLogbackEncoder">
+            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>