diff --git a/.env_agent b/.env_agent
index 6992de324..ded214452 100644
--- a/.env_agent
+++ b/.env_agent
@@ -1,3 +1,4 @@
+# ZBX_SOURCEIP=
 # ZBX_DEBUGLEVEL=3
 # ZBX_ENABLEREMOTECOMMANDS=0
 # ZBX_LOGREMOTECOMMANDS=0
@@ -6,6 +7,7 @@
 # ZBX_PASSIVESERVERS=
 # ZBX_ACTIVE_ALLOW=true
 # ZBX_ACTIVESERVERS=
+# ZBX_LISTENIP=
 # ZBX_STARTAGENTS=3
 # ZBX_HOSTNAME=
 # ZBX_HOSTNAMEITEM=system.hostname
diff --git a/.env_prx b/.env_prx
index d01883584..9b68b7d0a 100644
--- a/.env_prx
+++ b/.env_prx
@@ -3,6 +3,7 @@
 # ZBX_SERVER_PORT=10051
 # ZBX_HOSTNAME=zabbix-proxy-$db_type
 # ZBX_HOSTNAMEITEM=system.hostname
+# ZBX_SOURCEIP=
 # ZBX_DEBUGLEVEL=3
 # ZBX_PROXYLOCALBUFFER=0
 # ZBX_PROXYOFFLINEBUFFER=1
@@ -26,6 +27,7 @@
 # ZBX_VMWARECACHESIZE=8M
 # ZBX_VMWARETIMEOUT=10
 # ZBX_ENABLE_SNMP_TRAPS=false
+# ZBX_LISTENIP=
 # ZBX_HOUSEKEEPINGFREQUENCY=1
 # ZBX_CACHESIZE=8M
 # ZBX_STARTDBSYNCERS=4
diff --git a/.env_srv b/.env_srv
index ec5fbdf6a..26de82dd0 100644
--- a/.env_srv
+++ b/.env_srv
@@ -1,3 +1,4 @@
+# ZBX_LISTENIP=
 # ZBX_DEBUGLEVEL=3
 # ZBX_STARTPOLLERS=5
 # ZBX_IPMIPOLLERS=0
@@ -18,6 +19,7 @@ ZBX_STARTJAVAPOLLERS=5
 # ZBX_VMWARECACHESIZE=8M
 # ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=true
+# ZBX_SOURCEIP=
 # ZBX_HOUSEKEEPINGFREQUENCY=1
 # ZBX_MAXHOUSEKEEPERDELETE=5000
 # ZBX_SENDERFREQUENCY=30
diff --git a/agent/alpine/README.md b/agent/alpine/README.md
index 8ae8a709d..d53d18acd 100644
--- a/agent/alpine/README.md
+++ b/agent/alpine/README.md
@@ -126,6 +126,7 @@ The variable is used to specify timeout for processing checks. By default, value
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
@@ -136,6 +137,7 @@ ZBX_REFRESHACTIVECHECKS=120
 ZBX_BUFFERSEND=5
 ZBX_BUFFERSIZE=100
 ZBX_MAXLINESPERSECOND=20
+ZBX_LISTENIP=
 ZBX_UNSAFEUSERPARAMETERS=0
 ZBX_TLSCONNECT=unencrypted
 ZBX_TLSACCEPT=unencrypted
diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/agent/alpine/run_zabbix_component.sh
+++ b/agent/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/agent/ubuntu/README.md b/agent/ubuntu/README.md
index 8ae8a709d..d53d18acd 100644
--- a/agent/ubuntu/README.md
+++ b/agent/ubuntu/README.md
@@ -126,6 +126,7 @@ The variable is used to specify timeout for processing checks. By default, value
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
@@ -136,6 +137,7 @@ ZBX_REFRESHACTIVECHECKS=120
 ZBX_BUFFERSEND=5
 ZBX_BUFFERSIZE=100
 ZBX_MAXLINESPERSECOND=20
+ZBX_LISTENIP=
 ZBX_UNSAFEUSERPARAMETERS=0
 ZBX_TLSCONNECT=unencrypted
 ZBX_TLSACCEPT=unencrypted
diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/agent/ubuntu/run_zabbix_component.sh
+++ b/agent/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/java-gateway/alpine/run_zabbix_component.sh
+++ b/java-gateway/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/java-gateway/ubuntu/run_zabbix_component.sh
+++ b/java-gateway/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md
index 846aa8388..f7f52839b 100644
--- a/proxy-mysql/alpine/README.md
+++ b/proxy-mysql/alpine/README.md
@@ -134,6 +134,7 @@ Additionally the image allows to specify many other environment variables listed
 
 ```
 ZBX_HOSTNAMEITEM=system.hostname
+ZBX_SOURCEIP=
 ZBX_PROXYLOCALBUFFER=0
 ZBX_PROXYOFFLINEBUFFER=1
 ZBX_PROXYHEARTBEATFREQUENCY=60
@@ -155,6 +156,7 @@ ZBX_VMWAREPERFFREQUENCY=60
 ZBX_VMWARECACHESIZE=8M
 ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_LISTENIP=
 ZBX_HOUSEKEEPINGFREQUENCY=1
 ZBX_CACHESIZE=8M
 ZBX_STARTDBSYNCERS=4
diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/proxy-mysql/alpine/run_zabbix_component.sh
+++ b/proxy-mysql/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md
index 846aa8388..f7f52839b 100644
--- a/proxy-mysql/ubuntu/README.md
+++ b/proxy-mysql/ubuntu/README.md
@@ -134,6 +134,7 @@ Additionally the image allows to specify many other environment variables listed
 
 ```
 ZBX_HOSTNAMEITEM=system.hostname
+ZBX_SOURCEIP=
 ZBX_PROXYLOCALBUFFER=0
 ZBX_PROXYOFFLINEBUFFER=1
 ZBX_PROXYHEARTBEATFREQUENCY=60
@@ -155,6 +156,7 @@ ZBX_VMWAREPERFFREQUENCY=60
 ZBX_VMWARECACHESIZE=8M
 ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_LISTENIP=
 ZBX_HOUSEKEEPINGFREQUENCY=1
 ZBX_CACHESIZE=8M
 ZBX_STARTDBSYNCERS=4
diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/proxy-mysql/ubuntu/run_zabbix_component.sh
+++ b/proxy-mysql/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md
index 482891f64..f595829a7 100644
--- a/proxy-sqlite3/alpine/README.md
+++ b/proxy-sqlite3/alpine/README.md
@@ -113,6 +113,7 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_SOURCEIP=
 ZBX_HOSTNAMEITEM=system.hostname
 ZBX_PROXYLOCALBUFFER=0
 ZBX_PROXYOFFLINEBUFFER=1
@@ -135,6 +136,7 @@ ZBX_VMWAREPERFFREQUENCY=60
 ZBX_VMWARECACHESIZE=8M
 ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_LISTENIP=
 ZBX_HOUSEKEEPINGFREQUENCY=1
 ZBX_CACHESIZE=8M
 ZBX_STARTDBSYNCERS=4
diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/proxy-sqlite3/alpine/run_zabbix_component.sh
+++ b/proxy-sqlite3/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md
index 482891f64..f595829a7 100644
--- a/proxy-sqlite3/ubuntu/README.md
+++ b/proxy-sqlite3/ubuntu/README.md
@@ -113,6 +113,7 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_SOURCEIP=
 ZBX_HOSTNAMEITEM=system.hostname
 ZBX_PROXYLOCALBUFFER=0
 ZBX_PROXYOFFLINEBUFFER=1
@@ -135,6 +136,7 @@ ZBX_VMWAREPERFFREQUENCY=60
 ZBX_VMWARECACHESIZE=8M
 ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_LISTENIP=
 ZBX_HOUSEKEEPINGFREQUENCY=1
 ZBX_CACHESIZE=8M
 ZBX_STARTDBSYNCERS=4
diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh
+++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md
index 88030e4af..fcc0dc97c 100644
--- a/server-mysql/alpine/README.md
+++ b/server-mysql/alpine/README.md
@@ -103,6 +103,7 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_LISTENIP=
 ZBX_STARTPOLLERS=5
 ZBX_IPMIPOLLERS=0
 ZBX_STARTPOLLERSUNREACHABLE=1
@@ -121,6 +122,7 @@ ZBX_VMWAREPERFFREQUENCY=60
 ZBX_VMWARECACHESIZE=8M
 ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_SOURCEIP=
 ZBX_HOUSEKEEPINGFREQUENCY=1
 ZBX_MAXHOUSEKEEPERDELETE=5000
 ZBX_SENDERFREQUENCY=30
diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/server-mysql/alpine/run_zabbix_component.sh
+++ b/server-mysql/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md
index 88030e4af..fcc0dc97c 100644
--- a/server-mysql/ubuntu/README.md
+++ b/server-mysql/ubuntu/README.md
@@ -103,6 +103,7 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_LISTENIP=
 ZBX_STARTPOLLERS=5
 ZBX_IPMIPOLLERS=0
 ZBX_STARTPOLLERSUNREACHABLE=1
@@ -121,6 +122,7 @@ ZBX_VMWAREPERFFREQUENCY=60
 ZBX_VMWARECACHESIZE=8M
 ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_SOURCEIP=
 ZBX_HOUSEKEEPINGFREQUENCY=1
 ZBX_MAXHOUSEKEEPERDELETE=5000
 ZBX_SENDERFREQUENCY=30
diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/server-mysql/ubuntu/run_zabbix_component.sh
+++ b/server-mysql/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md
index 55634ab1d..49b2f7395 100644
--- a/server-pgsql/alpine/README.md
+++ b/server-pgsql/alpine/README.md
@@ -102,6 +102,7 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_LISTENIP=
 ZBX_STARTPOLLERS=5
 ZBX_IPMIPOLLERS=0
 ZBX_STARTPOLLERSUNREACHABLE=1
@@ -120,6 +121,7 @@ ZBX_VMWAREPERFFREQUENCY=60
 ZBX_VMWARECACHESIZE=8M
 ZBX_VMWARETIMEOUT=10
 ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_SOURCEIP=
 ZBX_HOUSEKEEPINGFREQUENCY=1
 ZBX_MAXHOUSEKEEPERDELETE=5000
 ZBX_SENDERFREQUENCY=30
diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/server-pgsql/alpine/run_zabbix_component.sh
+++ b/server-pgsql/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/server-pgsql/ubuntu/run_zabbix_component.sh
+++ b/server-pgsql/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-apache-mysql/alpine/run_zabbix_component.sh
+++ b/web-apache-mysql/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-apache-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-apache-pgsql/alpine/run_zabbix_component.sh b/web-apache-pgsql/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-apache-pgsql/alpine/run_zabbix_component.sh
+++ b/web-apache-pgsql/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-apache-pgsql/ubuntu/run_zabbix_component.sh b/web-apache-pgsql/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-apache-pgsql/ubuntu/run_zabbix_component.sh
+++ b/web-apache-pgsql/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-nginx-mysql/alpine/run_zabbix_component.sh
+++ b/web-nginx-mysql/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-nginx-pgsql/alpine/run_zabbix_component.sh
+++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
index 1c8840f39..cc2595759 100755
--- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
@@ -519,7 +519,7 @@ update_zbx_config() {
     else
         update_config_var $ZBX_CONFIG "ListenPort"
     fi
-    update_config_var $ZBX_CONFIG "SourceIP"
+    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
     update_config_var $ZBX_CONFIG "LogType" "console"
     update_config_var $ZBX_CONFIG "LogFile"
     update_config_var $ZBX_CONFIG "LogFileSize"
@@ -756,7 +756,7 @@ prepare_zbx_agent_config() {
     fi
 
     update_config_var $ZBX_AGENT_CONFIG "ListenPort"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "{$ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
     ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}