diff --git a/files/build_templates/eventd.service.j2 b/files/build_templates/eventd.service.j2
index 0ad7f52ee83d..1aaedefd1227 100644
--- a/files/build_templates/eventd.service.j2
+++ b/files/build_templates/eventd.service.j2
@@ -14,4 +14,4 @@ ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 RestartSec=30
 
 [Install]
-WantedBy=sonic.target
+WantedBy=multi-user.target
diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk
index 727449ce2250..7e649b987c93 100644
--- a/rules/docker-config-engine-bullseye.mk
+++ b/rules/docker-config-engine-bullseye.mk
@@ -18,7 +18,6 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY3)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_LOAD_DOCKERS += $(DOCKER_BASE_BULLSEYE)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(SWSS_VARS_TEMPLATE)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(RSYSLOG_PLUGIN_CONF_J2)
-$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(DOCKER_EVENTD)_PLUGIN)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT)
 
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS = $($(DOCKER_BASE_BULLSEYE)_DBG_DEPENDS) \
diff --git a/slave.mk b/slave.mk
index 76274b21b39e..e884aa4416e4 100644
--- a/slave.mk
+++ b/slave.mk
@@ -1076,6 +1076,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MODELS_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CTRMGRD)) \
         $(addprefix $(FILES_PATH)/,$($(SONIC_CTRMGRD)_FILES)) \
+        $(addprefix $(FILES_PATH)/,$($(DOCKER_EVENTD)_PLUGIN)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MGMT_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_HOST_SERVICES_PY3))
diff --git a/src/sonic-eventd/src/eventd.cpp b/src/sonic-eventd/src/eventd.cpp
index a379e824a930..9b164fbe38b3 100644
--- a/src/sonic-eventd/src/eventd.cpp
+++ b/src/sonic-eventd/src/eventd.cpp
@@ -228,6 +228,13 @@ capture_service::do_capture()
 
         switch(cap_state) {
         case CAP_STATE_INIT:
+            /*
+             * In this state check against cache, if duplicate
+             * When duplicate or new one seen, remove the entry from pre-exist map
+             * Stay in this state, until the pre-exist cache is empty or as many
+             * messages as in cache are seen, as in worst case even if you see
+             * duplicate of each, it will end with first m_events.size()
+             */
             {
                 bool add = true;
                 init_cnt--;