diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index f6083853c59..34fcf1bcee2 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -239,18 +239,18 @@ def parse_cpg(cpg, hname):
                     keepalive = 60
                 nhopself = 1 if session.find(str(QName(ns, "NextHopSelf"))) is not None else 0
                 if end_router == hname:
-                    bgp_sessions[start_peer] = {
+                    bgp_sessions[start_peer.lower()] = {
                         'name': start_router,
-                        'local_addr': end_peer,
+                        'local_addr': end_peer.lower(),
                         'rrclient': rrclient,
                         'holdtime': holdtime,
                         'keepalive': keepalive,
                         'nhopself': nhopself
                     }
                 else:
-                    bgp_sessions[end_peer] = {
+                    bgp_sessions[end_peer.lower()] = {
                         'name': end_router,
-                        'local_addr': start_peer,
+                        'local_addr': start_peer.lower(),
                         'rrclient': rrclient,
                         'holdtime': holdtime,
                         'keepalive': keepalive,
diff --git a/src/sonic-utilities b/src/sonic-utilities
index ca6fb49169f..bf8d2b430e9 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit ca6fb49169f56fe42744eb74df9d1c72b556ba6d
+Subproject commit bf8d2b430e9dfea4fc9f9626acb2663aa527da91