diff --git a/files/build_templates/gbsyncd.service.j2 b/files/build_templates/gbsyncd.service.j2
deleted file mode 100644
index 732d9c8933..0000000000
--- a/files/build_templates/gbsyncd.service.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description={{docker_container_name}} service
-Requires=database.service updategraph.service
-ConditionPathExists=!/usr/share/sonic/hwsku/gearbox_config.json
-After=database.service updategraph.service
-After=interfaces-config.service
-After=swss.service
-BindsTo=sonic.target
-After=sonic.target
-Before=ntp-config.service
-
-[Service]
-User=root
-Environment=sonic_asic_platform={{ sonic_asic_platform }}
-Environment=gbsyncd_platform={{ docker_container_name }}
-ExecCondition=/usr/bin/gbsyncd-platform.sh
-ExecStartPre=/usr/local/bin/gbsyncd.sh start
-ExecStart=/usr/local/bin/gbsyncd.sh wait
-ExecStop=/usr/local/bin/gbsyncd.sh stop
-
-[Install]
-WantedBy=sonic.target
diff --git a/files/build_templates/per_namespace/gbsyncd.service.j2 b/files/build_templates/per_namespace/gbsyncd.service.j2
new file mode 100644
index 0000000000..90a92b7e85
--- /dev/null
+++ b/files/build_templates/per_namespace/gbsyncd.service.j2
@@ -0,0 +1,22 @@
+[Unit]
+Description={{docker_container_name}} service
+Requires=database{% if multi_instance == 'true' %}@%i{% endif %}.service updategraph.service
+ConditionPathExists=!/usr/share/sonic/hwsku/gearbox_config.json
+After=database{% if multi_instance == 'true' %}@%i{% endif %}.service updategraph.service
+After=interfaces-config.service
+After=swss{% if multi_instance == 'true' %}@%i{% endif %}.service
+BindsTo=sonic.target
+After=sonic.target
+Before=ntp-config.service
+
+[Service]
+User=root
+Environment=sonic_asic_platform={{ sonic_asic_platform }}
+Environment=gbsyncd_platform={{ docker_container_name }}
+ExecCondition=/usr/bin/gbsyncd-platform.sh
+ExecStartPre=/usr/local/bin/gbsyncd.sh start{% if multi_instance == 'true' %} %i{% endif %}
+ExecStart=/usr/local/bin/gbsyncd.sh wait{% if multi_instance == 'true' %} %i{% endif %}
+ExecStop=/usr/local/bin/gbsyncd.sh stop{% if multi_instance == 'true' %} %i{% endif %}
+
+[Install]
+WantedBy=sonic.target