diff --git a/.config/reverse-proxy.config.php b/.config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/.config/reverse-proxy.config.php
+++ b/.config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/16.0/apache/config/reverse-proxy.config.php b/16.0/apache/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/16.0/apache/config/reverse-proxy.config.php
+++ b/16.0/apache/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/16.0/fpm-alpine/config/reverse-proxy.config.php b/16.0/fpm-alpine/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/16.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/16.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/16.0/fpm/config/reverse-proxy.config.php b/16.0/fpm/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/16.0/fpm/config/reverse-proxy.config.php
+++ b/16.0/fpm/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/17.0/apache/config/reverse-proxy.config.php b/17.0/apache/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/17.0/apache/config/reverse-proxy.config.php
+++ b/17.0/apache/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/17.0/fpm-alpine/config/reverse-proxy.config.php b/17.0/fpm-alpine/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/17.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/17.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/17.0/fpm/config/reverse-proxy.config.php b/17.0/fpm/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/17.0/fpm/config/reverse-proxy.config.php
+++ b/17.0/fpm/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/18.0/apache/config/reverse-proxy.config.php b/18.0/apache/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/18.0/apache/config/reverse-proxy.config.php
+++ b/18.0/apache/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/18.0/fpm-alpine/config/reverse-proxy.config.php b/18.0/fpm-alpine/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/18.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/18.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/18.0/fpm/config/reverse-proxy.config.php b/18.0/fpm/config/reverse-proxy.config.php
index e38c3d04..75ab44e6 100644
--- a/18.0/fpm/config/reverse-proxy.config.php
+++ b/18.0/fpm/config/reverse-proxy.config.php
@@ -1,30 +1,35 @@
 <?php
-if (getenv('OVERWRITEHOST')) {
-  $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+$overwritehost = getenv('OVERWRITEHOST');
+if ($overwritehost) {
+  $CONFIG['overwritehost'] = $overwritehost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-if (getenv('OVERWRITEPROTOCOL')) {
-  $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteprotocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-if (getenv('OVERWRITEWEBROOT')) {
-  $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+$overwritewebroot = getenv('OVERWRITEWEBROOT');
+if ($overwritewebroot) {
+  $CONFIG['overwritewebroot'] = $overwritewebroot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-if (getenv('OVERWRITECONDADDR')) {
-  $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+$overwritecondaddr = getenv('OVERWRITECONDADDR');
+if ($overwritecondaddr) {
+  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-if (getenv('TRUSTED_PROXIES')) {
-  $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+$trusted_proxies = getenv('TRUSTED_PROXIES');
+if ($trusted_proxies) {
+  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
 } else {
   $CONFIG['trusted_proxies'] = null;
 }