diff --git a/dockers/docker-snmp-sv2/snmpd b/dockers/docker-snmp-sv2/snmpd
index 4b35c6cc936..576c366d2ba 100644
--- a/dockers/docker-snmp-sv2/snmpd
+++ b/dockers/docker-snmp-sv2/snmpd
@@ -8,4 +8,4 @@ export MIBS=
 SNMPDRUN=yes
 
 # snmpd options (use syslog, close stdin/out/err).
-SNMPDOPTS='-LS4d -Lf /dev/null -u snmp -g snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable -p /run/snmpd.pid'
+SNMPDOPTS='-LS4d -Lf /dev/null -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable -p /run/snmpd.pid'
diff --git a/files/image_config/snmp/snmp.yml b/files/image_config/snmp/snmp.yml
index 13c9d7bd7d7..86f76c3a5cc 100644
--- a/files/image_config/snmp/snmp.yml
+++ b/files/image_config/snmp/snmp.yml
@@ -1 +1,3 @@
 snmp_rocommunity: public
+snmp_location: public
+