diff --git a/cfgmgr/intfmgr.cpp b/cfgmgr/intfmgr.cpp
index cd509b3bbd..e7365f538d 100644
--- a/cfgmgr/intfmgr.cpp
+++ b/cfgmgr/intfmgr.cpp
@@ -30,19 +30,27 @@ IntfMgr::IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, c
 }
 
 void IntfMgr::setIntfIp(const string &alias, const string &opCmd,
-                        const string &ipPrefixStr, const bool ipv4)
+                        const IpPrefix &ipPrefix)
 {
-    stringstream cmd;
-    string res;
+    stringstream    cmd;
+    string          res;
+    string          ipPrefixStr = ipPrefix.to_string();
+    string          broadcastIpStr = ipPrefix.getBroadcastIp().to_string();
+    int             prefixLen = ipPrefix.getMaskLength();
 
-    if (ipv4)
+    if (ipPrefix.isV4())
     {
-        cmd << IP_CMD << " address " << opCmd << " " << ipPrefixStr << " dev " << alias;
+        (prefixLen < 31) ?
+        (cmd << IP_CMD << " address " << opCmd << " " << ipPrefixStr << " broadcast " << broadcastIpStr <<" dev " << alias) :
+        (cmd << IP_CMD << " address " << opCmd << " " << ipPrefixStr << " dev " << alias);
     }
     else
     {
-        cmd << IP_CMD << " -6 address " << opCmd << " " << ipPrefixStr << " dev " << alias;
+        (prefixLen < 127) ?
+        (cmd << IP_CMD << " -6 address " << opCmd << " " << ipPrefixStr << " broadcast " << broadcastIpStr << " dev " << alias) :
+        (cmd << IP_CMD << " -6 address " << opCmd << " " << ipPrefixStr << " dev " << alias);
     }
+
     int ret = swss::exec(cmd.str(), res);
     if (ret)
     {
@@ -202,7 +210,7 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,
         // Set Interface IP except for lo
         if (!is_lo)
         {
-            setIntfIp(alias, "add", ip_prefix.to_string(), ip_prefix.isV4());
+            setIntfIp(alias, "add", ip_prefix);
         }
 
         std::vector<FieldValueTuple> fvVector;
@@ -219,7 +227,7 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,
         // Set Interface IP except for lo
         if (!is_lo)
         {
-            setIntfIp(alias, "del", ip_prefix.to_string(), ip_prefix.isV4());
+            setIntfIp(alias, "del", ip_prefix);
         }
         m_appIntfTableProducer.del(appKey);
         m_stateIntfTable.del(keys[0] + state_db_key_delimiter + keys[1]);
diff --git a/cfgmgr/intfmgr.h b/cfgmgr/intfmgr.h
index d10b5d8b4c..a250ff65fb 100644
--- a/cfgmgr/intfmgr.h
+++ b/cfgmgr/intfmgr.h
@@ -21,7 +21,7 @@ class IntfMgr : public Orch
     Table m_cfgIntfTable, m_cfgVlanIntfTable;
     Table m_statePortTable, m_stateLagTable, m_stateVlanTable, m_stateVrfTable, m_stateIntfTable;
 
-    void setIntfIp(const string &alias, const string &opCmd, const string &ipPrefixStr, const bool ipv4 = true);
+    void setIntfIp(const string &alias, const string &opCmd, const IpPrefix &ipPrefix);
     void setIntfVrf(const string &alias, const string vrfName);
     bool doIntfGeneralTask(const vector<string>& keys, const vector<FieldValueTuple>& data, const string& op);
     bool doIntfAddrTask(const vector<string>& keys, const vector<FieldValueTuple>& data, const string& op);