diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
index de6879c4372..9c379404bc1 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -88,7 +88,7 @@ dependent_startup_wait_for=bgpd:running
 command=/usr/local/bin/bgpmon
 priority=6
 autostart=false
-autorestart=false
+autorestart=true
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
diff --git a/dockers/docker-sonic-restapi/restapi.sh b/dockers/docker-sonic-restapi/restapi.sh
index d009507a7bc..3a0997a2e66 100755
--- a/dockers/docker-sonic-restapi/restapi.sh
+++ b/dockers/docker-sonic-restapi/restapi.sh
@@ -18,10 +18,10 @@ do
         if [[ -n "$certs" ]]; then
                 SERVER_CRT=`sonic-cfggen -d -v "RESTAPI['certs']['server_crt']"`
                 SERVER_KEY=`sonic-cfggen -d -v "RESTAPI['certs']['server_key']"`
-                CLIENT_CA_CRT=`sonic-cfggen -d -v "RESTAPI['certs']['client_ca_crt']"`
+                CA_CRT=`sonic-cfggen -d -v "RESTAPI['certs']['ca_crt']"`
                 CLIENT_CRT_CNAME=`sonic-cfggen -d -v "RESTAPI['certs']['client_crt_cname']"`
-                if [[ -f $SERVER_CRT && -f $SERVER_KEY && -f $CLIENT_CA_CRT ]]; then
-                    RESTAPI_ARGS+=" -enablehttps=true -servercert=$SERVER_CRT -serverkey=$SERVER_KEY -clientcert=$CLIENT_CA_CRT -clientcertcommonname=$CLIENT_CRT_CNAME"
+                if [[ -f $SERVER_CRT && -f $SERVER_KEY && -f $CA_CRT ]]; then
+                    RESTAPI_ARGS+=" -enablehttps=true -servercert=$SERVER_CRT -serverkey=$SERVER_KEY -clientcert=$CA_CRT -clientcertcommonname=$CLIENT_CRT_CNAME"
                     break
                 fi
         fi
diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 4bc76c6aa6f..2e3ba9da21a 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -1139,7 +1139,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
         'certs': {
             'server_crt': '/etc/sonic/credentials/restapiserver.crt',
             'server_key': '/etc/sonic/credentials/restapiserver.key',
-            'client_ca_crt': '/etc/sonic/credentials/restapiclient.crt',
+            'ca_crt': '/etc/sonic/credentials/restapica.crt',
             'client_crt_cname': 'client.restapi.sonic'
         }
     }