diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py
index 988515026..038e51d9b 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py
@@ -1,5 +1,5 @@
 from common.utils.attack_utils import ScanStatus
-from monkey_island.cc.database import mongo
+from monkey_island.cc.models import Monkey
 from monkey_island.cc.services.attack.technique_reports import AttackTechnique
 
 
@@ -10,35 +10,12 @@ class T1016(AttackTechnique):
     scanned_msg = ""
     used_msg = "Monkey gathered network configurations on systems in the network."
 
-    query = [
-        {"$match": {"telem_category": "system_info", "data.network_info": {"$exists": True}}},
-        {
-            "$project": {
-                "machine": {"hostname": "$data.hostname", "ips": "$data.network_info.networks"},
-                "networks": "$data.network_info.networks",
-            }
-        },
-        {
-            "$addFields": {
-                "_id": 0,
-                "networks": 0,
-                "info": [
-                    {
-                        "used": {
-                            "$and": [{"$ifNull": ["$networks", False]}, {"$gt": ["$networks", {}]}]
-                        },
-                        "name": {"$literal": "Network interface info"},
-                    },
-                ],
-            }
-        },
-    ]
-
     @staticmethod
     def get_report_data():
         def get_technique_status_and_data():
-            network_info = list(mongo.db.telemetry.aggregate(T1016.query))
-            status = ScanStatus.USED.value if network_info else ScanStatus.UNSCANNED.value
+            network_info = T1016._get_network_info()
+            used_info = [entry for entry in network_info if entry["info"][0]["used"]]
+            status = ScanStatus.USED.value if used_info else ScanStatus.UNSCANNED.value
             return (status, network_info)
 
         status, network_info = get_technique_status_and_data()
@@ -46,3 +23,14 @@ class T1016(AttackTechnique):
         data = T1016.get_base_data_by_status(status)
         data.update({"network_info": network_info})
         return data
+
+    @staticmethod
+    def _get_network_info():
+        network_info = []
+        for monkey in Monkey.objects():
+            entry = {"machine": {"hostname": monkey.hostname, "ips": monkey.ip_addresses}}
+            info = [{"used": bool(monkey.networks), "name": "Network interface info"}]
+            entry["info"] = info
+            network_info.append(entry)
+
+        return network_info