diff --git a/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml b/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
index 913713796..354548a2c 100644
--- a/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
+++ b/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
@@ -39,9 +39,10 @@
       <property name="jakarta.persistence.jdbc.user" value="sa"/>
       <property name="jakarta.persistence.jdbc.password" value=""/>
       <property name="jakarta.persistence.schema-generation.database.action" value="create"/>
-      <property name="eclipselink.logging.level.sql" value="FINE"/>
+      <property name="eclipselink.logging.level.sql" value="INFO"/>
       <property name="eclipselink.logging.parameters" value="true"/>
       <property name="eclipselink.persistence-context.flush-mode" value="auto"/>
+      <property name="eclipselink.logging.file" value="eclipselink.log"/>
     </properties>
   </persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/polaris-server.yml b/polaris-server.yml
index 7aba83e5c..0468ef5c3 100644
--- a/polaris-server.yml
+++ b/polaris-server.yml
@@ -143,7 +143,10 @@ logging:
       # Do not display log statements below this threshold to stdout.
       threshold: ALL
       # Custom Logback PatternLayout with threadname.
-      logFormat: "%-5p [%d{ISO8601} - %-6r] [%t] [%X{aid}%X{sid}%X{tid}%X{wid}%X{oid}%X{srv}%X{job}%X{rid}] %c{30}: %m %kvp%n%ex"
+      layout:
+        type: polaris
+        flattenKeyValues: false
+        includeKeyValues: true
 
     # Settings for logging to a file.
     - type: file