diff --git a/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf b/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
index 6a4c9a4af..89b330246 100644
--- a/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
+++ b/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
@@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 
 [program:snmptrapd]
-command = /usr/sbin/%(program_name)s -f -n -Lo -p /var/run/snmptrapd.pid -c /etc/snmp/%(program_name)s.conf
+command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs/:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf
 auto_start = true
 autorestart = true
 priority = 100
diff --git a/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf b/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
index 6a4c9a4af..89b330246 100644
--- a/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
+++ b/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
@@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 
 [program:snmptrapd]
-command = /usr/sbin/%(program_name)s -f -n -Lo -p /var/run/snmptrapd.pid -c /etc/snmp/%(program_name)s.conf
+command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs/:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf
 auto_start = true
 autorestart = true
 priority = 100
diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile
index 8d89cc8ef..90d2f71e8 100644
--- a/snmptraps/ubuntu/Dockerfile
+++ b/snmptraps/ubuntu/Dockerfile
@@ -62,9 +62,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             -e "/^LOGFILE=/s/=.*/=\"\/var\/lib\/zabbix\/snmptraps\/snmptraps.log\"/" \
         "/etc/snmp/snmptrapfmt.conf" && \
     rm -rf /tmp/snmptrapfmt_1.14+nmu1ubuntu2_amd64.deb && \
-    apt-get ${APT_FLAGS_COMMON} purge \
-            snmp-mibs-downloader \
-            wget && \
     apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf b/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
index 6a4c9a4af..86b471372 100644
--- a/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
+++ b/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
@@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 
 [program:snmptrapd]
-command = /usr/sbin/%(program_name)s -f -n -Lo -p /var/run/snmptrapd.pid -c /etc/snmp/%(program_name)s.conf
+command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs:/var/lib/snmp/mibs/iana:/var/lib/snmp/mibs/ietf:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf
 auto_start = true
 autorestart = true
 priority = 100