diff --git a/monkey/monkey_island/cc/services/telemetry/processing/scan.py b/monkey/monkey_island/cc/services/telemetry/processing/scan.py
index 4e34b9a19..3b532ff22 100644
--- a/monkey/monkey_island/cc/services/telemetry/processing/scan.py
+++ b/monkey/monkey_island/cc/services/telemetry/processing/scan.py
@@ -2,9 +2,15 @@ import copy
 
 from monkey_island.cc.database import mongo
 from monkey_island.cc.services.telemetry.processing.utils import get_edge_by_scan_or_exploit_telemetry
+from monkey_island.cc.services.telemetry.zero_trust_tests.data_endpoints import test_open_data_endpoints
 
 
 def process_scan_telemetry(telemetry_json):
+    update_edges_and_nodes_based_on_scan_telemetry(telemetry_json)
+    test_open_data_endpoints(telemetry_json)
+
+
+def update_edges_and_nodes_based_on_scan_telemetry(telemetry_json):
     edge = get_edge_by_scan_or_exploit_telemetry(telemetry_json)
     data = copy.deepcopy(telemetry_json['data']['machine'])
     ip_address = data.pop("ip_addr")
@@ -19,7 +25,6 @@ def process_scan_telemetry(telemetry_json):
         {"$push": {"scans": new_scan},
          "$set": {"ip_address": ip_address, 'domain_name': domain_name}}
     )
-
     node = mongo.db.node.find_one({"_id": edge["to"]})
     if node is not None:
         scan_os = new_scan["data"]["os"]
diff --git a/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/data_endpoints.py b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/data_endpoints.py
new file mode 100644
index 000000000..e0aabf413
--- /dev/null
+++ b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/data_endpoints.py
@@ -0,0 +1,16 @@
+import json
+
+BAD_ENDPOINTS = {
+    "tcp-80": "Open HTTP server."
+}
+
+
+def test_open_data_endpoints(telemetry_json):
+    services = telemetry_json["data"]["machine"]["services"]
+    for service_name, service_data in services.items():
+        if service_name in BAD_ENDPOINTS:
+            # TODO Create finding
+            print("found open {} service on address {}, details: {}".format(
+                service_data["display_name"],
+                telemetry_json["data"]["machine"]["ip_addr"],
+                json.dumps(service_data)))