diff --git a/gradle/changelog/forward_header.yaml b/gradle/changelog/forward_header.yaml
new file mode 100644
index 0000000000..6c90bc1458
--- /dev/null
+++ b/gradle/changelog/forward_header.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Enabling forward headers and log appender with environment variable
diff --git a/scm-server/src/main/java/sonia/scm/server/ServerConfigYaml.java b/scm-server/src/main/java/sonia/scm/server/ServerConfigYaml.java
index 62036ef932..f42f9a39a7 100644
--- a/scm-server/src/main/java/sonia/scm/server/ServerConfigYaml.java
+++ b/scm-server/src/main/java/sonia/scm/server/ServerConfigYaml.java
@@ -25,9 +25,9 @@
 package sonia.scm.server;
 
 public class ServerConfigYaml {
-  
+
   private static final String SCM_SERVER_PREFIX = "SCM_";
-  
+
   // ### Server
   private String addressBinding = "0.0.0.0";
   private int port = 8080;
@@ -161,7 +161,7 @@ public class ServerConfigYaml {
 
   static boolean getEnvWithDefault(String envKey, boolean configValue) {
     String value = getEnv(envKey);
-    return value != null ? Boolean.getBoolean(value) : configValue;
+    return value != null ? Boolean.parseBoolean(value) : configValue;
   }
 
   private static String getEnv(String envKey) {
diff --git a/scm-webapp/src/main/java/sonia/scm/config/ServerConfigYaml.java b/scm-webapp/src/main/java/sonia/scm/config/ServerConfigYaml.java
index 55f505883a..e6fae50559 100644
--- a/scm-webapp/src/main/java/sonia/scm/config/ServerConfigYaml.java
+++ b/scm-webapp/src/main/java/sonia/scm/config/ServerConfigYaml.java
@@ -123,7 +123,7 @@ public class ServerConfigYaml {
 
   static boolean getEnvWithDefault(String envKey, boolean configValue) {
     String value = getEnv(envKey);
-    return value != null ? Boolean.getBoolean(value) : configValue;
+    return value != null ? Boolean.parseBoolean(value) : configValue;
   }
 
   private static String getEnv(String envKey) {