diff --git a/Changelog.md b/Changelog.md
index f678c1d80f28aa1d3b3ded3b8222da9dd013920e..81a94466738cdccacde2ac23d8dcc9cf7107c9a0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.18] - 2025-05-30
+- Add 15s timeout to inventory-provider GET request, instead of default no timeout
+
 ## [0.17] - 2025-05-20
 - Add 120s timeout to get-interface-stats in case it gets stuck
 
diff --git a/brian_polling_manager/inventory.py b/brian_polling_manager/inventory.py
index 4831b78876885c4ab1cbb3d968e03bf1f2bdd797..74ef95550cdd0083e5a5fbab8ef6a16da79c799a 100644
--- a/brian_polling_manager/inventory.py
+++ b/brian_polling_manager/inventory.py
@@ -135,7 +135,8 @@ def load_inventory_json(api_route, base_urls, schema):
 
     rsp = requests.get(
         f'{url}/{api_route}',
-        headers={'Accept': 'application/json'})
+        headers={'Accept': 'application/json'},
+        timeout=15)
     rsp.raise_for_status()
 
     result = rsp.json()
diff --git a/setup.py b/setup.py
index 02971bfe5a1f876bb8f9a0bca95421bebbc38439..df4f9dcaca694761a4ef9f73a7d3776f15a0084d 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='brian-polling-manager',
-    version="0.17",
+    version="0.18",
     author='GEANT',
     author_email='swd@geant.org',
     description='service for managing BRIAN polling checks',