diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/agent/alpine/run_zabbix_component.sh
+++ b/agent/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/agent/ubuntu/run_zabbix_component.sh
+++ b/agent/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/java-gateway/alpine/run_zabbix_component.sh
+++ b/java-gateway/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/java-gateway/ubuntu/run_zabbix_component.sh
+++ b/java-gateway/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/proxy-mysql/alpine/run_zabbix_component.sh
+++ b/proxy-mysql/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/proxy-mysql/ubuntu/run_zabbix_component.sh
+++ b/proxy-mysql/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/proxy-sqlite3/alpine/run_zabbix_component.sh
+++ b/proxy-sqlite3/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh
+++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/server-mysql/alpine/run_zabbix_component.sh
+++ b/server-mysql/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/server-mysql/ubuntu/run_zabbix_component.sh
+++ b/server-mysql/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/server-pgsql/alpine/run_zabbix_component.sh
+++ b/server-pgsql/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/server-pgsql/ubuntu/run_zabbix_component.sh
+++ b/server-pgsql/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/web-apache-mysql/alpine/run_zabbix_component.sh
+++ b/web-apache-mysql/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/web-apache-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/web-nginx-mysql/alpine/run_zabbix_component.sh
+++ b/web-nginx-mysql/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/web-nginx-pgsql/alpine/run_zabbix_component.sh
+++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then
diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
index fa26fa515..fbb0ef982 100755
--- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
@@ -234,6 +234,8 @@ mysql_query() {
 
 psql_query() {
     query=$1
+    db=$2
+
     local result=""
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
@@ -241,7 +243,7 @@ psql_query() {
     fi
 
     result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" 2>/dev/null);
+             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
 
     unset PGPASSWORD
 
@@ -337,11 +339,11 @@ create_db_schema_postgresql() {
     local type=$1
 
     DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'")
+                                         c.relnamespace WHERE  n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
 
     if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
         echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
+        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}")
     fi
 
     if [ -z "${ZBX_DB_VERSION}" ]; then