diff --git a/src/StorageLeaf.py b/src/StorageLeaf.py
index 45991e8fb4d859e8b93002c7a031b7f5530fa8b8..e5493fc37c5509b8992c47359231b0a46aaa7355 100644
--- a/src/StorageLeaf.py
+++ b/src/StorageLeaf.py
@@ -8,6 +8,7 @@ from starlette.responses import RedirectResponse, FileResponse
 
 from Settings import SETTINGS
 from logic import Constants
+from logic.DiscoveryService import DiscoveryService
 from logic.database import Models, Schemas
 from logic.database.Database import engine
 from logic.routers import DeviceRouter
@@ -51,6 +52,11 @@ app.include_router(DeviceRouter.router)
 app.include_router(SensorRouter.router)
 app.include_router(MeasurementRouter.router)
 
+discoverySettings = SETTINGS['discovery']
+discoverySettings['apiPort'] = SETTINGS['server']['port']
+discoveryService = DiscoveryService(**discoverySettings)
+discoveryService.start()
+
 if __name__ == '__main__':
     serverSettings = SETTINGS['server']
     protocol = 'https' if serverSettings['useSSL'] else 'http'
diff --git a/src/logic/DiscoveryService.py b/src/logic/DiscoveryService.py
index 9e7be34490cc611daac72cc1584667081e175ea2..194c13f393703c05d1f2d69560c278d75f9de290 100644
--- a/src/logic/DiscoveryService.py
+++ b/src/logic/DiscoveryService.py
@@ -18,7 +18,7 @@ class DiscoveryService:
         self._shouldStop = False
 
     def start(self):
-        LOGGER.debug("Start discovery thread")
+        LOGGER.debug(f'Start discovery thread (listening on {self._discoveryPort}, responding on {self._responsePort})')
 
         x = threading.Thread(target=self.__loop)
         x.start()
diff --git a/src/version.json b/src/version.json
index 9e300a243da544b7903c23c5e97f38b1391eff82..634ac2ea3c60d6f557887643019c585d73460da0 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,7 +1,7 @@
 {
     "version": {
-        "name": "v2.0.1",
-        "code": 9,
-        "date": "16.01.21"
+        "name": "v2.0.2",
+        "code": 10,
+        "date": "17.01.21"
     }
 }
\ No newline at end of file