diff --git a/build.gradle b/build.gradle
index cac39a9e..15ee13a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,6 +65,7 @@ allprojects {
 
     project.ext {
         slf4jVersion = '1.7.32'
+        logbackVersion = '1.2.6'
         junitVersion = '5.7.2'
         picocliVersion = '4.6.1'
         rootConfigDir = new File(rootDir, 'config')
diff --git a/pgpainless-cli/build.gradle b/pgpainless-cli/build.gradle
index 4c892360..90d1837f 100644
--- a/pgpainless-cli/build.gradle
+++ b/pgpainless-cli/build.gradle
@@ -33,16 +33,17 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
     // https://todd.ginsberg.com/post/testing-system-exit/
     testImplementation 'com.ginsberg:junit5-system-exit:1.1.1'
-    // We want logback logging in tests
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+
+    // implementation "ch.qos.logback:logback-core:1.2.6"
+    // We want logback logging in tests and in the app
+    testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
+    implementation "ch.qos.logback:logback-classic:$logbackVersion"
 
     implementation(project(":pgpainless-sop"))
     implementation(project(":sop-java"))
     implementation(project(":sop-java-picocli"))
 
     implementation "info.picocli:picocli:$picocliVersion"
-    // We don't want logging in the application itself
-    implementation "org.slf4j:slf4j-nop:$slf4jVersion"
 
     // https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
diff --git a/pgpainless-cli/src/main/resources/logback.xml b/pgpainless-cli/src/main/resources/logback.xml
index 13cccf62..559589ef 100644
--- a/pgpainless-cli/src/main/resources/logback.xml
+++ b/pgpainless-cli/src/main/resources/logback.xml
@@ -4,15 +4,23 @@ SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
 SPDX-License-Identifier: Apache-2.0
 -->
 
-<configuration>
+<configuration debug="false">
     <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
         <target>System.err</target>
         <encoder>
-            <pattern>%blue(%-5level) %green(%logger{35}) - %msg %n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <logger name="org.apache" level="INFO ">
-        <appender-ref ref="STDERR"/>
-    </logger>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.out</target>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="error">
+        <appender-ref ref="STDERR" />
+    </root>
+
 </configuration>
\ No newline at end of file
diff --git a/pgpainless-cli/src/test/resources/logback-test.xml b/pgpainless-cli/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..abb1b8fd
--- /dev/null
+++ b/pgpainless-cli/src/test/resources/logback-test.xml
@@ -0,0 +1,25 @@
+<!--
+SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
+
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<configuration debug="false">
+    <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.err</target>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.out</target>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="error">
+        <appender-ref ref="STDERR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/pgpainless-core/build.gradle b/pgpainless-core/build.gradle
index 61a3fda6..c649e71c 100644
--- a/pgpainless-core/build.gradle
+++ b/pgpainless-core/build.gradle
@@ -10,9 +10,11 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
 
+    // Logging
     api "org.slf4j:slf4j-api:$slf4jVersion"
+    testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
+    runtime "ch.qos.logback:logback-classic:$logbackVersion"
 
     api "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
     api "org.bouncycastle:bcpg-jdk15on:$bouncyCastleVersion"
diff --git a/pgpainless-core/src/main/resources/logback.xml b/pgpainless-core/src/main/resources/logback.xml
deleted file mode 100644
index 13cccf62..00000000
--- a/pgpainless-core/src/main/resources/logback.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
-
-SPDX-License-Identifier: Apache-2.0
--->
-
-<configuration>
-    <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
-        <target>System.err</target>
-        <encoder>
-            <pattern>%blue(%-5level) %green(%logger{35}) - %msg %n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.apache" level="INFO ">
-        <appender-ref ref="STDERR"/>
-    </logger>
-</configuration>
\ No newline at end of file
diff --git a/pgpainless-core/src/test/resources/logback-test.xml b/pgpainless-core/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..7e4c3194
--- /dev/null
+++ b/pgpainless-core/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<!--
+SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
+
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<configuration debug="false">
+    <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.err</target>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.out</target>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.pgpainless" level="warn" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <root level="error">
+        <appender-ref ref="STDERR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/pgpainless-sop/build.gradle b/pgpainless-sop/build.gradle
index 4858dbab..6f30b5db 100644
--- a/pgpainless-sop/build.gradle
+++ b/pgpainless-sop/build.gradle
@@ -13,10 +13,12 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    // Logging
+    testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
+    runtime "ch.qos.logback:logback-classic:$logbackVersion"
 
     implementation(project(":pgpainless-core"))
     implementation(project(":sop-java"))
diff --git a/sop-java-picocli/build.gradle b/sop-java-picocli/build.gradle
index 69cd1c52..e5d208fc 100644
--- a/sop-java-picocli/build.gradle
+++ b/sop-java-picocli/build.gradle
@@ -9,6 +9,7 @@ plugins {
 dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
+
     // https://todd.ginsberg.com/post/testing-system-exit/
     testImplementation 'com.ginsberg:junit5-system-exit:1.1.1'
     testImplementation "org.mockito:mockito-core:3.11.2"