diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml
index ab199264114..548416b37c9 100644
--- a/apps/adresse-service/src/main/resources/logback-spring.xml
+++ b/apps/adresse-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/apps/amelding-service/src/main/resources/logback-spring.xml
+++ b/apps/amelding-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 c3609245170..4832f349e0c 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 66437503790..5c9a2412e45 100644
--- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
+++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 edd6ddf127d..9583ff2d427 100644
--- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 6fbad19f583..f6f874fb95b 100644
--- a/apps/brreg-stub/src/main/resources/logback-spring.xml
+++ b/apps/brreg-stub/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 d91dcf28fda..a8f4e1102e4 100644
--- a/apps/bruker-service/src/main/resources/logback-spring.xml
+++ b/apps/bruker-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -25,8 +24,7 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 fe32fb984fe..45629711bde 100644
--- a/apps/budpro-service/src/main/resources/logback-spring.xml
+++ b/apps/budpro-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
index f0ef428e58d..6af8668f777 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml
index 0ac9fd9264d..fafc976c451 100644
--- a/apps/dolly-backend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-backend/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 a3942cd251c..328c3cbd84c 100644
--- a/apps/dolly-frontend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod,dev,idporten">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 9e331f42ac9..07f5248d65f 100644
--- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 0f4f2a2b919..8150ec6c2fb 100644
--- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 2ab880b62d7..1aaf291d4ab 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 ccc4fd23f43..e08948487ac 100644
--- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml
+++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 d763debd20c..97622fc1eaf 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 edd6ddf127d..9583ff2d427 100644
--- a/apps/generer-navn-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 d763debd20c..97622fc1eaf 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 2ab880b62d7..1aaf291d4ab 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 5c64f557653..eeb685bda41 100644
--- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml
+++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 d763debd20c..97622fc1eaf 100644
--- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 d763debd20c..97622fc1eaf 100644
--- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 9aa5595725b..a4ab0d66c2f 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 edd6ddf127d..9583ff2d427 100644
--- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml
+++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 2ab880b62d7..1aaf291d4ab 100644
--- a/apps/kodeverk-service/src/main/resources/logback-spring.xml
+++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 edd6ddf127d..9583ff2d427 100644
--- a/apps/miljoer-service/src/main/resources/logback-spring.xml
+++ b/apps/miljoer-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 317f7169882..c95235c42b4 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 9aa5595725b..a4ab0d66c2f 100644
--- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 9aa5595725b..a4ab0d66c2f 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 d763debd20c..97622fc1eaf 100644
--- a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 66437503790..5c9a2412e45 100644
--- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 d763debd20c..97622fc1eaf 100644
--- a/apps/organisasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 3b322fd17f2..d679d46ee18 100644
--- a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -25,8 +24,7 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 2a69ad5a185..4b79380bec5 100644
--- a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 2ab880b62d7..1aaf291d4ab 100644
--- a/apps/orgnummer-service/src/main/resources/logback-spring.xml
+++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml
+++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 69cb57f28ed..bc227892463 100644
--- a/apps/pdl-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/pdl-forvalter/src/main/resources/logback-spring.xml
@@ -3,8 +3,7 @@
 
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 ccc4fd23f43..e08948487ac 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
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 6595d6805a8..df515f6fe70 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 850a2dec259..10912516977 100644
--- a/apps/person-search-service/src/main/resources/logback-spring.xml
+++ b/apps/person-search-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 4f1e5f389fd..479b8bdf7a7 100644
--- a/apps/person-service/src/main/resources/logback-spring.xml
+++ b/apps/person-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 edd6ddf127d..9583ff2d427 100644
--- a/apps/profil-api/src/main/resources/logback-spring.xml
+++ b/apps/profil-api/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 67ba4ae7fd6..c5ffedd557b 100644
--- a/apps/sykemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/sykemelding-api/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 edd6ddf127d..9583ff2d427 100644
--- a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 ebad5f3dc86..e6189bbd745 100644
--- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
+++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 58e27178f53..691fda0f20c 100644
--- a/apps/tenor-search-service/src/main/resources/logback-spring.xml
+++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
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 6fbad19f583..f6f874fb95b 100644
--- a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
+++ b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 6fbad19f583..f6f874fb95b 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 edd6ddf127d..9583ff2d427 100644
--- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 6fbad19f583..f6f874fb95b 100644
--- a/apps/tps-messaging-service/src/main/resources/logback-spring.xml
+++ b/apps/tps-messaging-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 d8fa230bc40..aaa3b27b1f7 100644
--- a/apps/udi-stub/src/main/resources/logback-spring.xml
+++ b/apps/udi-stub/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 2e35f55a95a..9f8bf6cf184 100644
--- a/apps/varslinger-service/src/main/resources/logback-spring.xml
+++ b/apps/varslinger-service/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -25,8 +24,7 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <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 8bcaee8c3b6..16f5e9c7567 100644
--- a/examples/reactive-rest-example/src/main/resources/logback-spring.xml
+++ b/examples/reactive-rest-example/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle
index 4fb632547a9..53affab269f 100644
--- a/libs/reactive-core/build.gradle
+++ b/libs/reactive-core/build.gradle
@@ -84,6 +84,7 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
 
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.projectreactor:reactor-test:3.5.4'
diff --git a/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackEncoder.java b/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackEncoder.java
new file mode 100644
index 00000000000..6302847c152
--- /dev/null
+++ b/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackEncoder.java
@@ -0,0 +1,8 @@
+package no.nav.testnav.libs.reactivecore.logging;
+
+import lombok.extern.slf4j.Slf4j;
+import net.logstash.logback.encoder.LogstashEncoder;
+
+@Slf4j
+public class TestnavLogbackEncoder extends LogstashEncoder {
+}
\ No newline at end of file
diff --git a/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackLayout.java b/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackLayout.java
deleted file mode 100644
index d7399505b23..00000000000
--- a/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackLayout.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package no.nav.testnav.libs.reactivecore.logging;
-
-import ch.qos.logback.classic.PatternLayout;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class TestnavLogbackLayout 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 TestnavLogbackLayout() {
-        this.setPattern("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n");
-    }
-
-    @Override
-    public String doLayout(ILoggingEvent event) {
-        String message = event.getFormattedMessage();
-        Matcher matcher = pattern.matcher(message);
-
-        StringBuilder result = new StringBuilder();
-        while (matcher.find()) {
-            String match = matcher.group();
-            if (match.charAt(2) == '0' || match.charAt(2) == '1') {
-                String replacement = match.substring(0, 6) + "xxxxx";
-                matcher.appendReplacement(result, replacement);
-            }
-        }
-        matcher.appendTail(result);
-
-        return result + "\n";
-    }
-}
\ No newline at end of file
diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle
index 5a4a3840016..18e1c1b92e3 100644
--- a/libs/servlet-core/build.gradle
+++ b/libs/servlet-core/build.gradle
@@ -47,6 +47,8 @@ java {
 dependencies {
 
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
diff --git a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackEncoder.java b/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackEncoder.java
new file mode 100644
index 00000000000..6980279daaa
--- /dev/null
+++ b/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackEncoder.java
@@ -0,0 +1,8 @@
+package no.nav.testnav.libs.servletcore.logging;
+
+import lombok.extern.slf4j.Slf4j;
+import net.logstash.logback.encoder.LogstashEncoder;
+
+@Slf4j
+public class TestnavLogbackEncoder extends LogstashEncoder {
+}
\ No newline at end of file
diff --git a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackLayout.java b/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackLayout.java
deleted file mode 100644
index a502f265411..00000000000
--- a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackLayout.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package no.nav.testnav.libs.servletcore.logging;
-
-import ch.qos.logback.classic.PatternLayout;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class TestnavLogbackLayout 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 TestnavLogbackLayout() {
-        this.setPattern("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n");
-    }
-
-    @Override
-    public String doLayout(ILoggingEvent event) {
-        String message = event.getFormattedMessage();
-        Matcher matcher = pattern.matcher(message);
-
-        StringBuilder result = new StringBuilder();
-        while (matcher.find()) {
-            String match = matcher.group();
-            if (match.charAt(2) == '0' || match.charAt(2) == '1') {
-                String replacement = match.substring(0, 6) + "xxxxx";
-                matcher.appendReplacement(result, replacement);
-            }
-        }
-        matcher.appendTail(result);
-
-        return result + "\n";
-    }
-}
\ No newline at end of file
diff --git a/proxies/aareg-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-proxy/src/main/resources/logback-spring.xml
index d2ebd887681..86a43aa5b33 100644
--- a/proxies/aareg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/aareg-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 86df0d95fdd..670bb2e190d 100644
--- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/histark-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 ccc4fd23f43..e08948487ac 100644
--- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/inst-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 831607f6a95..ca618d7da3b 100644
--- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/medl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 d74b9ab45d2..37ffd7e0d09 100644
--- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 2d28459cc77..bf12737c752 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,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/saf-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 be1aac763d9..3b591204bab 100644
--- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 233bbeb3c2b..f48486bb3ab 100644
--- a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 0f4f2a2b919..8150ec6c2fb 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <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 ccc4fd23f43..e08948487ac 100644
--- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>