diff --git a/drone_simulator.py b/drone_simulator.py
index c9e3330..0862a17 100644
--- a/drone_simulator.py
+++ b/drone_simulator.py
@@ -101,7 +101,7 @@ class SwedishDroneSimulator:
     def generate_devices(self, num_devices: int) -> List[DroneDevice]:
         """Generate drone detection devices at Swedish sensitive locations"""
         devices = []
-        device_id_base = 1941875380
+        device_id_base = 1001  # Use simple device IDs starting from 1001
         
         all_locations = []
         for category, locations in SWEDISH_LOCATIONS.items():
@@ -251,7 +251,7 @@ class SwedishDroneSimulator:
             
             payload = {
                 "type": "heartbeat",
-                "key": f"device_{device.device_id}_key",
+                "key": str(device.device_id),  # Use device ID directly as key
                 "battery_level": device.battery_level,
                 "signal_strength": device.signal_strength,
                 "temperature": device.temperature