diff --git a/monkey/monkey_island/cc/agent_event_handlers/scan_event_handler.py b/monkey/monkey_island/cc/agent_event_handlers/scan_event_handler.py
new file mode 100644
index 000000000..2d1da09e6
--- /dev/null
+++ b/monkey/monkey_island/cc/agent_event_handlers/scan_event_handler.py
@@ -0,0 +1,91 @@
+from ipaddress import IPv4Interface
+from logging import getLogger
+from typing import Union
+
+from typing_extensions import TypeAlias
+
+from common.agent_events import PingScanEvent, TCPScanEvent
+from common.types import PortStatus
+from monkey_island.cc.models import CommunicationType, Machine
+from monkey_island.cc.repository import (
+    IAgentRepository,
+    IMachineRepository,
+    INodeRepository,
+    RetrievalError,
+    StorageError,
+    UnknownRecordError,
+)
+
+ScanEvent: TypeAlias = Union[PingScanEvent, TCPScanEvent]
+
+logger = getLogger(__name__)
+
+
+class ScanEventHandler:
+    """
+    Handles scan event and makes changes to Machine and Node states base on it
+    """
+
+    def __init__(
+        self,
+        agent_repository: IAgentRepository,
+        machine_repository: IMachineRepository,
+        node_repository: INodeRepository,
+    ):
+        self._agent_repository = agent_repository
+        self._machine_repository = machine_repository
+        self._node_repository = node_repository
+
+    def handle_ping_scan_event(self, event: PingScanEvent):
+        if not event.response_received:
+            return
+
+        try:
+            target_machine = self._get_target_machine(event)
+
+            self._update_target_machine_os(target_machine, event)
+            self._update_nodes(target_machine, event)
+        except (RetrievalError, StorageError, TypeError, UnknownRecordError):
+            logger.exception("Unable to process ping scan data")
+
+    def handle_tcp_scan_event(self, event: TCPScanEvent):
+        open_ports = [port for port, status in event.ports.items() if status == PortStatus.OPEN]
+
+        if not open_ports:
+            return
+
+        try:
+            target_machine = self._get_target_machine(event)
+
+            self._update_nodes(target_machine, event)
+        except (RetrievalError, StorageError, UnknownRecordError):
+            logger.exception("Unable to process tcp scan data")
+
+    def _get_target_machine(self, event: ScanEvent) -> Machine:
+        try:
+            target_machines = self._machine_repository.get_machines_by_ip(event.target)
+            print(target_machines)
+            return target_machines[0]
+        except UnknownRecordError:
+            machine = Machine(
+                id=self._machine_repository.get_new_id(),
+                network_interfaces=[IPv4Interface(event.target)],
+            )
+            self._machine_repository.upsert_machine(machine)
+            return machine
+
+    def _update_nodes(self, target_machine: Machine, event: ScanEvent):
+        src_machine = self._get_source_machine(event)
+
+        self._node_repository.upsert_communication(
+            src_machine.id, target_machine.id, CommunicationType.SCANNED
+        )
+
+    def _get_source_machine(self, event: ScanEvent) -> Machine:
+        agent = self._agent_repository.get_agent_by_id(event.source)
+        return self._machine_repository.get_machine_by_id(agent.machine_id)
+
+    def _update_target_machine_os(self, machine: Machine, event: PingScanEvent):
+        if event.os is not None and machine.operating_system is None:
+            machine.operating_system = event.os
+            self._machine_repository.upsert_machine(machine)