diff --git a/files/build_templates/bmp.service.j2 b/files/build_templates/bmp.service.j2
deleted file mode 100644
index 72ab295d04d..00000000000
--- a/files/build_templates/bmp.service.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=BMP container
-Requires=database.service
-After=database.service
-Before=ntp-config.service
-BindsTo=sonic.target
-After=sonic.target
-StartLimitIntervalSec=1200
-StartLimitBurst=3
-
-[Service]
-User={{ sonicadmin_user }}
-ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start
-ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait
-ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop
-RestartSec=30
diff --git a/files/build_templates/per_namespace/bmp.service.j2 b/files/build_templates/per_namespace/bmp.service.j2
new file mode 100644
index 00000000000..f493deb8d8f
--- /dev/null
+++ b/files/build_templates/per_namespace/bmp.service.j2
@@ -0,0 +1,16 @@
+[Unit]
+Description=BMP container
+Requires=database{% if multi_instance == 'true' %}@%i{% endif %}.service
+After=database{% if multi_instance == 'true' %}@%i{% endif %}.service
+Before=ntp-config.service
+BindsTo=sonic.target
+After=sonic.target
+StartLimitIntervalSec=1200
+StartLimitBurst=3
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
+ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
+ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
+RestartSec=30