diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
index 35455d3df..716f96ff1 100644
--- a/proxy-mysql/alpine/Dockerfile
+++ b/proxy-mysql/alpine/Dockerfile
@@ -6,7 +6,7 @@ ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
 ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
 ARG DB_TYPE=mysql
 ENV TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN addgroup zabbix && \
     adduser -S \
diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile
index 9aac7771b..a0f75e2c5 100644
--- a/proxy-mysql/ubuntu/Dockerfile
+++ b/proxy-mysql/ubuntu/Dockerfile
@@ -6,7 +6,7 @@ ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG DB_TYPE=mysql
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile
index 51159812c..a6337f8c1 100644
--- a/proxy-sqlite3/alpine/Dockerfile
+++ b/proxy-sqlite3/alpine/Dockerfile
@@ -6,7 +6,7 @@ ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
 ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
 ARG DB_TYPE=sqlite3
 ENV TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN addgroup zabbix && \
     adduser -S \
diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
index bce30687b..b3f4d0820 100644
--- a/proxy-sqlite3/ubuntu/Dockerfile
+++ b/proxy-sqlite3/ubuntu/Dockerfile
@@ -6,7 +6,7 @@ ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG DB_TYPE=sqlite3
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
index 3f6341abb..e3391edaf 100644
--- a/server-mysql/alpine/Dockerfile
+++ b/server-mysql/alpine/Dockerfile
@@ -6,7 +6,7 @@ ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
 ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
 ARG DB_TYPE=mysql
 ENV TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN addgroup zabbix && \
     adduser -S \
diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
index ef2eeb9bd..919b1c871 100644
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@@ -6,7 +6,7 @@ ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG DB_TYPE=mysql
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile
index d4b04a74a..f7a7fa432 100644
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@@ -6,7 +6,7 @@ ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
 ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
 ARG DB_TYPE=postgresql
 ENV TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN addgroup zabbix && \
     adduser -S \
diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
index a7a5b63fa..f55c39244 100644
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@@ -6,7 +6,7 @@ ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG DB_TYPE=postgresql
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm
-ENV MIBDIRS=/var/lib/zabbix/mibs MIBS=+ALL
+ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
 
 RUN locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \