diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
index 8f83e05efc..e392711f53 100644
--- a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
+++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
@@ -13,7 +13,7 @@
 [program:dhcp6relay]
 command=/usr/sbin/dhcp6relay
 {#- Dual ToR Option #}
-{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -d{% endif %}
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0 {% endif %}
 
 priority=3
 autostart=false
diff --git a/src/dhcprelay b/src/dhcprelay
index a4b15d8ba4..3578eb3378 160000
--- a/src/dhcprelay
+++ b/src/dhcprelay
@@ -1 +1 @@
-Subproject commit a4b15d8ba429c2799d3927f8dca376745af08c1a
+Subproject commit 3578eb337860fa98672655d4182d2df4ce2b3bfe