diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ad6672d84..9b9236809f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+- Fixes configuration of jetty listener address with system property `jetty.host` ([#1173](https://github.com/scm-manager/scm-manager/pull/1173), [#1174](https://github.com/scm-manager/scm-manager/pull/1174))
+
 ## [2.0.0] - 2020-06-04
 ### Added
 - Detect renamed files in git and hg diffs ([#1157](https://github.com/scm-manager/scm-manager/pull/1157))
diff --git a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
index b7a5a7efef..89f9d56ca4 100644
--- a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
@@ -57,6 +57,9 @@
             </Item>
           </Array>
         </Arg>
+        <Set name="host">
+          <SystemProperty name="jetty.host" default="0.0.0.0" />
+        </Set>
         <Set name="port">
           <SystemProperty name="jetty.port" default="8080" />
         </Set>
@@ -67,7 +70,8 @@
   <New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
     <Set name="contextPath">/scm</Set>
     <Set name="war">
-      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war</Set>
+      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war
+    </Set>
     <!-- disable directory listings -->
     <Call name="setInitParameter">
       <Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>
diff --git a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
index b7a5a7efef..89f9d56ca4 100644
--- a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
@@ -57,6 +57,9 @@
             </Item>
           </Array>
         </Arg>
+        <Set name="host">
+          <SystemProperty name="jetty.host" default="0.0.0.0" />
+        </Set>
         <Set name="port">
           <SystemProperty name="jetty.port" default="8080" />
         </Set>
@@ -67,7 +70,8 @@
   <New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
     <Set name="contextPath">/scm</Set>
     <Set name="war">
-      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war</Set>
+      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war
+    </Set>
     <!-- disable directory listings -->
     <Call name="setInitParameter">
       <Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>
diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
index b7a5a7efef..89f9d56ca4 100644
--- a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
@@ -57,6 +57,9 @@
             </Item>
           </Array>
         </Arg>
+        <Set name="host">
+          <SystemProperty name="jetty.host" default="0.0.0.0" />
+        </Set>
         <Set name="port">
           <SystemProperty name="jetty.port" default="8080" />
         </Set>
@@ -67,7 +70,8 @@
   <New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
     <Set name="contextPath">/scm</Set>
     <Set name="war">
-      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war</Set>
+      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war
+    </Set>
     <!-- disable directory listings -->
     <Call name="setInitParameter">
       <Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>
diff --git a/scm-packaging/unix/src/main/fs/conf/server-config.xml b/scm-packaging/unix/src/main/fs/conf/server-config.xml
index 46ab3eb514..08814ccf68 100644
--- a/scm-packaging/unix/src/main/fs/conf/server-config.xml
+++ b/scm-packaging/unix/src/main/fs/conf/server-config.xml
@@ -57,6 +57,9 @@
             </Item>
           </Array>
         </Arg>
+        <Set name="host">
+          <SystemProperty name="jetty.host" default="0.0.0.0" />
+        </Set>
         <Set name="port">
           <SystemProperty name="jetty.port" default="8080" />
         </Set>
@@ -67,7 +70,8 @@
   <New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
     <Set name="contextPath">/scm</Set>
     <Set name="war">
-      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war</Set>
+      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war
+    </Set>
     <!-- disable directory listings -->
     <Call name="setInitParameter">
       <Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>
diff --git a/scm-packaging/windows/src/main/fs/conf/server-config.xml b/scm-packaging/windows/src/main/fs/conf/server-config.xml
index b7a5a7efef..89f9d56ca4 100644
--- a/scm-packaging/windows/src/main/fs/conf/server-config.xml
+++ b/scm-packaging/windows/src/main/fs/conf/server-config.xml
@@ -57,6 +57,9 @@
             </Item>
           </Array>
         </Arg>
+        <Set name="host">
+          <SystemProperty name="jetty.host" default="0.0.0.0" />
+        </Set>
         <Set name="port">
           <SystemProperty name="jetty.port" default="8080" />
         </Set>
@@ -67,7 +70,8 @@
   <New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
     <Set name="contextPath">/scm</Set>
     <Set name="war">
-      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war</Set>
+      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war
+    </Set>
     <!-- disable directory listings -->
     <Call name="setInitParameter">
       <Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>