diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
index 9d7782162..495d3f440 100755
--- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
@@ -351,8 +351,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 6e32ff852..5f8cf2878 100755
--- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
@@ -348,8 +348,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 6e32ff852..5f8cf2878 100755
--- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
@@ -348,8 +348,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 6e32ff852..5f8cf2878 100755
--- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
@@ -348,8 +348,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 6e32ff852..5f8cf2878 100755
--- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -348,8 +348,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 1a998f53d..05ac7b655 100755
--- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
@@ -364,8 +364,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 65829573c..92a88736a 100755
--- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
@@ -361,8 +361,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 65829573c..92a88736a 100755
--- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
@@ -361,8 +361,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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 65829573c..92a88736a 100755
--- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
@@ -361,8 +361,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     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/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
index 65829573c..92a88736a 100755
--- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
@@ -361,8 +361,9 @@ create_db_schema_mysql() {
 update_zbx_config() {
     export ZBX_DB_HOST="${DB_SERVER_HOST}"
     export ZBX_DB_PORT="${DB_SERVER_PORT}"
-    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
-
+    if [ -n "${DB_SERVER_SOCKET}" ]; then
+        export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
+    fi
     export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
 
     if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then