diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
index 495d3f440..b483e3370 100755
--- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
@@ -349,11 +349,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
index 5f8cf2878..04c88948a 100755
--- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
@@ -346,11 +346,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
index 5f8cf2878..04c88948a 100755
--- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
@@ -346,11 +346,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
index 5f8cf2878..04c88948a 100755
--- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
@@ -346,11 +346,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
index 5f8cf2878..04c88948a 100755
--- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -346,11 +346,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
index 05ac7b655..0dc980a46 100755
--- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
@@ -362,11 +362,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
index 92a88736a..26098a557 100755
--- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
@@ -359,11 +359,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
index 92a88736a..26098a557 100755
--- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
@@ -359,11 +359,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
index 92a88736a..26098a557 100755
--- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
@@ -359,11 +359,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile
index 1768c6b57..15fc3b721 100644
--- a/Dockerfiles/server-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@@ -122,7 +122,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
 EXPOSE 10051/TCP
 
 WORKDIR ${ZABBIX_USER_HOME_DIR}
-    
+
 VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"]
 
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
index 92a88736a..26098a557 100755
--- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
@@ -359,11 +359,10 @@ create_db_schema_mysql() {
 }
 
 update_zbx_config() {
-    export ZBX_DB_HOST="${DB_SERVER_HOST}"
-    export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    if [ -n "${DB_SERVER_SOCKET}" ]; then
-        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-    fi
+    test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
+    test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
+
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
index 69cfb8488..025d2b264 100755
--- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
@@ -24,7 +24,7 @@ fi
 
 # DefaultRuntimeDir configuration option value
 export APACHE_RUN_DIR="/tmp/apache2"
-    
+
 # Default directories
 # Apache main configuration file
 HTTPD_CONF_FILE="/etc/apache2/httpd.conf"
diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
index 4e97a986b..83452cdd2 100755
--- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
@@ -24,7 +24,7 @@ fi
 
 # DefaultRuntimeDir configuration option value
 export APACHE_RUN_DIR="/tmp/httpd"
-    
+
 # Default directories
 # Apache main configuration file
 HTTPD_CONF_FILE="/etc/httpd/conf/httpd.conf"