diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss
index 5928dbd4ddb0..da5588b01094 100644
--- a/dockers/docker-orchagent/base_image_files/monit_swss
+++ b/dockers/docker-orchagent/base_image_files/monit_swss
@@ -10,7 +10,6 @@
 ##  portmgrd
 ##  buffermgrd
 ##  nbrmgrd
-##  vxlanmgrd
 ###############################################################################
 check process orchagent matching "/usr/bin/orchagent -d /var/log/swss"
     if does not exist for 5 times within 5 cycles then alert
@@ -39,5 +38,3 @@ check process buffermgrd matching "/usr/bin/buffermgrd -l"
 check process nbrmgrd matching "/usr/bin/nbrmgrd"
     if does not exist for 5 times within 5 cycles then alert
 
-check process vxlanmgrd matching "/usr/bin/vxlanmgrd"
-    if does not exist for 5 times within 5 cycles then alert
diff --git a/platform/template/docker-orchagent-base.mk b/platform/template/docker-orchagent-base.mk
index 04b49ebfdcbb..022bb19fa9c4 100644
--- a/platform/template/docker-orchagent-base.mk
+++ b/platform/template/docker-orchagent-base.mk
@@ -32,4 +32,5 @@ $(DOCKER_ORCHAGENT_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ORCHAGENT_BASE)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw
 
 $(DOCKER_ORCHAGENT_BASE)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
+$(DOCKER_ORCHAGENT_BASE)_BASE_IMAGE_FILES += monit_swss:/etc/monit/conf.d
 $(DOCKER_ORCHAGENT_BASE)_FILES += $(ARP_UPDATE_SCRIPT) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)