diff --git a/dockers/docker-fpm-frr/supervisord.conf b/dockers/docker-fpm-frr/supervisord.conf
index ee04e00fc3..a01ed8fd09 100644
--- a/dockers/docker-fpm-frr/supervisord.conf
+++ b/dockers/docker-fpm-frr/supervisord.conf
@@ -86,7 +86,7 @@ stderr_logfile=syslog
 command=/usr/local/bin/bgpmon
 priority=6
 autostart=false
-autorestart=false
+autorestart=true
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
diff --git a/src/sonic-bgpcfgd/bgpmon_proj/__init__.py b/src/sonic-bgpcfgd/bgpmon/__init__.py
similarity index 100%
rename from src/sonic-bgpcfgd/bgpmon_proj/__init__.py
rename to src/sonic-bgpcfgd/bgpmon/__init__.py
diff --git a/src/sonic-bgpcfgd/bgpmon_proj/bgpmon.py b/src/sonic-bgpcfgd/bgpmon/bgpmon.py
similarity index 100%
rename from src/sonic-bgpcfgd/bgpmon_proj/bgpmon.py
rename to src/sonic-bgpcfgd/bgpmon/bgpmon.py
diff --git a/src/sonic-bgpcfgd/setup.py b/src/sonic-bgpcfgd/setup.py
index e2a3e58e37..29d441e09a 100755
--- a/src/sonic-bgpcfgd/setup.py
+++ b/src/sonic-bgpcfgd/setup.py
@@ -12,7 +12,7 @@ setuptools.setup(name='sonic-bgpcfgd',
       scripts=['bgpcfgd'],
       entry_points={
           'console_scripts': [
-              'bgpmon = bgpmon_proj.bgpmon:main',
+              'bgpmon = bgpmon.bgpmon:main',
           ]
       },
       install_requires=['jinja2>=2.10', 'netaddr', 'pyyaml'],