diff --git a/hawkbit-runtime/hawkbit-ddi-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-ddi-server/src/main/resources/application.properties
index 8014fa3f5..8d8a6bf64 100644
--- a/hawkbit-runtime/hawkbit-ddi-server/src/main/resources/application.properties
+++ b/hawkbit-runtime/hawkbit-ddi-server/src/main/resources/application.properties
@@ -8,13 +8,23 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
+# Spring configuration
 spring.application.name=ddi-server
+spring.main.allow-bean-definition-overriding=true
 server.port=8081
 
+# Logging configuration
+logging.level.org.eclipse.hawkbit.eventbus.DeadEventListener=WARN
+logging.level.org.springframework.boot.actuate.audit.listener.AuditListener=WARN
+logging.level.org.hibernate.validator.internal.util.Version=WARN
+# security Log with hints on potential attacks
+logging.level.server-security=INFO
+# logging pattern
+logging.pattern.console=%clr(%d{${logging.pattern.dateformat:yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${logging.pattern.level:%5p}) %clr(${PID:}){magenta} %clr(---){faint} %clr([${spring.application.name}] [%X{tenant}:%X{user}] [%15.15t]){faint} %clr(${logging.pattern.correlation:}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${logging.exception-conversion-word:%wEx}
+
 # User Security
 spring.security.user.name=admin
 spring.security.user.password={noop}admin
-spring.main.allow-bean-definition-overriding=true
 
 # Http Encoding
 server.servlet.encoding.charset=UTF-8
diff --git a/hawkbit-runtime/hawkbit-ddi-server/src/main/resources/logback-spring.xml b/hawkbit-runtime/hawkbit-ddi-server/src/main/resources/logback-spring.xml
deleted file mode 100644
index cd0c5b239..000000000
--- a/hawkbit-runtime/hawkbit-ddi-server/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
--->
-<configuration>
-   <include resource="org/springframework/boot/logging/logback/base.xml" />
-
-   <logger name="org.eclipse.hawkbit.eventbus.DeadEventListener" level="WARN" />
-   <Logger name="org.springframework.boot.actuate.audit.listener.AuditListener" level="WARN" />
-
-   <Logger name="org.hibernate.validator.internal.util.Version" level="WARN" />
-
-   <!-- Security Log with hints on potential attacks -->
-   <logger name="server-security" level="INFO" />
-
-   <Root level="INFO">
-      <appender-ref ref="CONSOLE" />
-   </Root>
-
-</configuration>
\ No newline at end of file
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application.properties
index 7d0d0aa53..92c2fe77d 100644
--- a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application.properties
+++ b/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application.properties
@@ -8,9 +8,19 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
+# Spring configuration
 spring.application.name=dmf-server
 spring.main.allow-bean-definition-overriding=true
 
+# Logging configuration
+logging.level.org.eclipse.hawkbit.eventbus.DeadEventListener=WARN
+logging.level.org.springframework.boot.actuate.audit.listener.AuditListener=WARN
+logging.level.org.hibernate.validator.internal.util.Version=WARN
+# security Log with hints on potential attacks
+logging.level.server-security=INFO
+# logging pattern
+logging.pattern.console=%clr(%d{${logging.pattern.dateformat:yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${logging.pattern.level:%5p}) %clr(${PID:}){magenta} %clr(---){faint} %clr([${spring.application.name}] [%X{tenant}:%X{user}] [%15.15t]){faint} %clr(${logging.pattern.correlation:}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${logging.exception-conversion-word:%wEx}
+
 # Optional events
 hawkbit.server.repository.publish-target-poll-event=false
 
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/logback-spring.xml b/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/logback-spring.xml
deleted file mode 100644
index cd0c5b239..000000000
--- a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
--->
-<configuration>
-   <include resource="org/springframework/boot/logging/logback/base.xml" />
-
-   <logger name="org.eclipse.hawkbit.eventbus.DeadEventListener" level="WARN" />
-   <Logger name="org.springframework.boot.actuate.audit.listener.AuditListener" level="WARN" />
-
-   <Logger name="org.hibernate.validator.internal.util.Version" level="WARN" />
-
-   <!-- Security Log with hints on potential attacks -->
-   <logger name="server-security" level="INFO" />
-
-   <Root level="INFO">
-      <appender-ref ref="CONSOLE" />
-   </Root>
-
-</configuration>
\ No newline at end of file
diff --git a/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties
index f12827f60..b6ebb323f 100644
--- a/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties
+++ b/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties
@@ -8,9 +8,20 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
+# Spring config
 spring.application.name=mgmt-server
+spring.main.allow-bean-definition-overriding=true
 spring.port=8080
 
+# Logging configuration
+logging.level.org.eclipse.hawkbit.eventbus.DeadEventListener=WARN
+logging.level.org.springframework.boot.actuate.audit.listener.AuditListener=WARN
+logging.level.org.hibernate.validator.internal.util.Version=WARN
+# security Log with hints on potential attacks
+logging.level.server-security=INFO
+# logging pattern
+logging.pattern.console=%clr(%d{${logging.pattern.dateformat:yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${logging.pattern.level:%5p}) %clr(${PID:}){magenta} %clr(---){faint} %clr([${spring.application.name}] [%X{tenant}:%X{user}] [%15.15t]){faint} %clr(${logging.pattern.correlation:}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${logging.exception-conversion-word:%wEx}
+
 # Define DEFAULT tenant admin user admin/admin
 hawkbit.security.user.admin.password={noop}admin
 hawkbit.security.user.admin.roles=TENANT_ADMIN
@@ -18,8 +29,6 @@ hawkbit.security.user.admin.tenant=DEFAULT
 # allow to auto/implicit create DEFAULT tenant (on mgmt api call)
 hawkbit.server.repository.implicitTenantCreateAllowed=true
 
-spring.main.allow-bean-definition-overriding=true
-
 # Http Encoding
 server.servlet.encoding.charset=UTF-8
 server.servlet.encoding.enabled=true
diff --git a/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/logback-spring.xml b/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/logback-spring.xml
deleted file mode 100644
index cd0c5b239..000000000
--- a/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
--->
-<configuration>
-   <include resource="org/springframework/boot/logging/logback/base.xml" />
-
-   <logger name="org.eclipse.hawkbit.eventbus.DeadEventListener" level="WARN" />
-   <Logger name="org.springframework.boot.actuate.audit.listener.AuditListener" level="WARN" />
-
-   <Logger name="org.hibernate.validator.internal.util.Version" level="WARN" />
-
-   <!-- Security Log with hints on potential attacks -->
-   <logger name="server-security" level="INFO" />
-
-   <Root level="INFO">
-      <appender-ref ref="CONSOLE" />
-   </Root>
-
-</configuration>
\ No newline at end of file
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties
index e3e668327..6e405e4a2 100644
--- a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties
+++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties
@@ -8,8 +8,14 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
+# Spring configuration
 server.port=${PORT:8088}
 
+# Logging configuration
+logging.level.org.springframework.boot.actuate.audit.listener.AuditListener=WARN
+# logging pattern
+logging.pattern.console=%clr(%d{${logging.pattern.dateformat:yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${logging.pattern.level:%5p}) %clr(${PID:}){magenta} %clr(---){faint} %clr([${spring.application.name}] [%X{tenant}:%X{user}] [%15.15t]){faint} %clr(${logging.pattern.correlation:}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${logging.exception-conversion-word:%wEx}
+
 ### Vaadin start ###`
 # build with mvn vaadin:build-frontend to enable / disable
 vaadin.frontend.hotdeploy=false
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java
index 6d1edfe00..8290d3ae8 100644
--- a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java
+++ b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java
@@ -33,8 +33,7 @@ public class Start {
     /**
      * Main method to start the spring-boot application.
      *
-     * @param args
-     *            the VM arguments.
+     * @param args the VM arguments.
      */
     // Exception squid:S2095 - Spring boot standard behavior
     @SuppressWarnings({ "squid:S2095" })
@@ -59,4 +58,4 @@ public class Start {
     public static class MethodSecurityConfig {
 
     }
-}
+}
\ No newline at end of file
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties
index e64f743bd..6aa63f8dc 100644
--- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties
+++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties
@@ -8,15 +8,26 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
+# Spring config
+spring.application.name=update-server
+spring.main.allow-bean-definition-overriding=true
+
+# Logging configuration
+logging.level.org.eclipse.hawkbit.eventbus.DeadEventListener=WARN
+logging.level.org.springframework.boot.actuate.audit.listener.AuditListener=WARN
+logging.level.org.hibernate.validator.internal.util.Version=WARN
+# security Log with hints on potential attacks
+logging.level.server-security=INFO
+# logging pattern
+logging.pattern.console=%clr(%d{${logging.pattern.dateformat:yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${logging.pattern.level:%5p}) %clr(${PID:}){magenta} %clr(---){faint} %clr([${spring.application.name}] [%X{tenant}:%X{user}] [%15.15t]){faint} %clr(${logging.pattern.correlation:}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${logging.exception-conversion-word:%wEx}
+
 # Define DEFAULT tenant admin user admin/admin
+hawkbit.security.user.admin.tenant=DEFAULT
 hawkbit.security.user.admin.password={noop}admin
 hawkbit.security.user.admin.roles=TENANT_ADMIN
-hawkbit.security.user.admin.tenant=DEFAULT
 # allow to auto/implicit create DEFAULT tenant (on mgmt api call)
 hawkbit.server.repository.implicitTenantCreateAllowed=true
 
-spring.main.allow-bean-definition-overriding=true
-
 # Http Encoding
 server.servlet.encoding.charset=UTF-8
 server.servlet.encoding.enabled=true
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml b/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml
deleted file mode 100644
index b71e34118..000000000
--- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
--->
-<configuration>
-   <include resource="org/springframework/boot/logging/logback/base.xml" />
-
-   <logger name="org.eclipse.hawkbit.eventbus.DeadEventListener" level="WARN" />
-   <Logger name="org.springframework.boot.actuate.audit.listener.AuditListener" level="WARN" />
-
-   <Logger name="org.hibernate.validator.internal.util.Version" level="WARN" />
-
-   <!-- Security Log with hints on potential attacks -->
-   <logger name="server-security" level="INFO" />
-   
-   <!-- Suppressing "More than one Servlet Mapping defined. WebSocket may not work" 
-   error due to the way VaadinServletConfiguration configures the endpoints mapping ("/UI" and "/UI/*"). 
-   At the end only the first "/UI" is taken for websocket communication.  -->
-   <logger name="org.atmosphere.util.IOUtils" level="OFF" />
-
-   <Root level="INFO">
-      <appender-ref ref="CONSOLE" />
-   </Root>
-
-</configuration>
\ No newline at end of file
diff --git a/site/src/main/resources/application.properties b/site/src/main/resources/application.properties
index dd196dba5..3de2b4b07 100644
--- a/site/src/main/resources/application.properties
+++ b/site/src/main/resources/application.properties
@@ -8,10 +8,12 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
+# Spring configuration
+spring.main.allow-bean-definition-overriding=true
+
 # User Security
 spring.security.user.name=admin
 spring.security.user.password={noop}admin
-spring.main.allow-bean-definition-overriding=true
 
 # Http Encoding
 server.servlet.encoding.charset=UTF-8
diff --git a/site/src/main/resources/logback-spring.xml b/site/src/main/resources/logback-spring.xml
deleted file mode 100644
index b71e34118..000000000
--- a/site/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
--->
-<configuration>
-   <include resource="org/springframework/boot/logging/logback/base.xml" />
-
-   <logger name="org.eclipse.hawkbit.eventbus.DeadEventListener" level="WARN" />
-   <Logger name="org.springframework.boot.actuate.audit.listener.AuditListener" level="WARN" />
-
-   <Logger name="org.hibernate.validator.internal.util.Version" level="WARN" />
-
-   <!-- Security Log with hints on potential attacks -->
-   <logger name="server-security" level="INFO" />
-   
-   <!-- Suppressing "More than one Servlet Mapping defined. WebSocket may not work" 
-   error due to the way VaadinServletConfiguration configures the endpoints mapping ("/UI" and "/UI/*"). 
-   At the end only the first "/UI" is taken for websocket communication.  -->
-   <logger name="org.atmosphere.util.IOUtils" level="OFF" />
-
-   <Root level="INFO">
-      <appender-ref ref="CONSOLE" />
-   </Root>
-
-</configuration>
\ No newline at end of file