diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 246eb2a50..a782c5b5c 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -151,13 +151,13 @@
     <dependency>
       <groupId>javax.measure</groupId>
       <artifactId>unit-api</artifactId>
-      <version>2.1.2</version>
+      <version>2.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>si.uom</groupId>
       <artifactId>si-units</artifactId>
-      <version>2.0.1</version>
+      <version>2.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index a358819bb..aaecb2e09 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -478,13 +478,13 @@
     <dependency>
       <groupId>org.openhab.osgiify</groupId>
       <artifactId>si.uom.si-units</artifactId>
-      <version>2.0.1</version>
+      <version>2.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>si.uom</groupId>
       <artifactId>si-quantity</artifactId>
-      <version>2.0.1</version>
+      <version>2.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 4e80a6bce..7960ac780 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -27,10 +27,10 @@
 		<!-- Measurement -->
 		<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
 		<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.0</bundle>
-		<bundle dependency="true">mvn:javax.measure/unit-api/2.1.2</bundle>
+		<bundle dependency="true">mvn:javax.measure/unit-api/2.1.3</bundle>
 		<!-- The si.uom:si-units manifest has no Export-Package entry. As workaround this OSGi-ify bundle is used. -->
-		<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.0.1</bundle>
-		<bundle dependency="true">mvn:si.uom/si-quantity/2.0.1</bundle>
+		<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.1</bundle>
+		<bundle dependency="true">mvn:si.uom/si-quantity/2.1</bundle>
 		<bundle dependency="true">mvn:tech.units/indriya/2.1.2</bundle>
 		<bundle dependency="true">mvn:tech.uom.lib/uom-lib-common/2.1</bundle>
 
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index baf81fc47..a447b1fe6 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -36,8 +36,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -60,4 +58,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 2d76a7c7c..f36362589 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -33,8 +33,6 @@ Fragment-Host: org.openhab.core.automation
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -54,4 +52,6 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
index 57be16f3b..f10265316 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -34,8 +34,6 @@ Fragment-Host: org.openhab.core.automation
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -55,4 +53,6 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
index 60cd592fc..aa55b3369 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -33,8 +33,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -55,4 +53,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
index b2de942fd..5702531e8 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -34,8 +34,6 @@ Fragment-Host: org.openhab.core.automation
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -55,4 +53,6 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index c2e20c209..9e7157d2b 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -34,8 +34,6 @@ Fragment-Host: org.openhab.core.automation
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -55,4 +53,6 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
index 082e9b419..a8dcff0e5 100644
--- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
@@ -36,8 +36,6 @@ Fragment-Host: org.openhab.core.binding.xml
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -57,4 +55,6 @@ Fragment-Host: org.openhab.core.binding.xml
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index 05441dff4..1d20f08ae 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -36,8 +36,6 @@ Fragment-Host: org.openhab.core.config.core
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -53,4 +51,6 @@ Fragment-Host: org.openhab.core.config.core
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
index 68c097ef0..c9a05532b 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -33,8 +33,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -56,4 +54,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index b8b0dc77b..066f7a37d 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -39,8 +39,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -63,4 +61,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
index 34ee8e431..ed4fe16a8 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
@@ -37,8 +37,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -60,5 +58,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
-
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
index 20e78b6ee..0ab083f50 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -46,8 +46,6 @@ Provide-Capability: \
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -68,4 +66,6 @@ Provide-Capability: \
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 3f9ea96f7..34ad23f48 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -32,8 +32,6 @@ Fragment-Host: org.openhab.core.config.dispatch
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -50,4 +48,6 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun
index bc289e87d..36c7dec50 100644
--- a/itests/org.openhab.core.config.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun
@@ -31,8 +31,6 @@ Fragment-Host: org.openhab.core.config.xml
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	xstream;version='[1.4.18,1.4.19)',\
@@ -50,4 +48,6 @@ Fragment-Host: org.openhab.core.config.xml
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 9d17aaddb..be6277752 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -39,8 +39,6 @@ feature.openhab-config: \
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	xstream;version='[1.4.18,1.4.19)',\
@@ -59,4 +57,6 @@ feature.openhab-config: \
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
index daab6dd97..34f3bbf9e 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -55,8 +55,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -94,4 +92,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.cxf.cxf-rt-rs-client;version='[3.4.5,3.4.6)',\
 	org.apache.cxf.cxf-rt-rs-sse;version='[3.4.5,3.4.6)',\
 	org.apache.cxf.cxf-rt-security;version='[3.4.5,3.4.6)',\
-	org.apache.cxf.cxf-rt-transports-http;version='[3.4.5,3.4.6)'
+	org.apache.cxf.cxf-rt-transports-http;version='[3.4.5,3.4.6)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun
index 69f7e3b5c..e7e253e24 100644
--- a/itests/org.openhab.core.model.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.core.tests/itest.bndrun
@@ -59,8 +59,6 @@ Fragment-Host: org.openhab.core.model.core
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
@@ -107,4 +105,7 @@ Fragment-Host: org.openhab.core.model.core
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 18f088dad..08307ec4e 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -56,8 +56,6 @@ Fragment-Host: org.openhab.core.model.item
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
@@ -105,4 +103,7 @@ Fragment-Host: org.openhab.core.model.item
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 95120f702..45a504aa6 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -58,8 +58,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
@@ -107,5 +105,8 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
 -runblacklist: bnd.identity;id='jakarta.activation-api'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index e705a2fe8..b8831c393 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -58,8 +58,6 @@ Fragment-Host: org.openhab.core.model.script
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -107,4 +105,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 4f2feceb7..ac95ff5c3 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -64,8 +64,6 @@ Fragment-Host: org.openhab.core.model.thing
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
@@ -118,4 +116,6 @@ Fragment-Host: org.openhab.core.model.thing
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index 6a74eeab6..1aa352e84 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -31,8 +31,6 @@ Fragment-Host: org.openhab.core.storage.json
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -49,4 +47,6 @@ Fragment-Host: org.openhab.core.storage.json
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index 5a1dfcca3..036b1089e 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -36,8 +36,6 @@ Fragment-Host: org.openhab.core
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.openhab.core;version='[3.2.0,3.2.1)',\
@@ -52,4 +50,6 @@ Fragment-Host: org.openhab.core
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 51b3d8159..a8926e9e0 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -42,8 +42,6 @@ Fragment-Host: org.openhab.core.thing
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -65,4 +63,6 @@ Fragment-Host: org.openhab.core.thing
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
index 516b2a471..2decfee61 100644
--- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
@@ -33,8 +33,6 @@ Fragment-Host: org.openhab.core.thing.xml
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	xstream;version='[1.4.18,1.4.19)',\
@@ -56,4 +54,6 @@ Fragment-Host: org.openhab.core.thing.xml
 	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index a5f8bae4f..1e6ae4b80 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -39,8 +39,6 @@ Fragment-Host: org.openhab.core.voice
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	si-units;version='[2.0.1,2.0.2)',\
-	si.uom.si-quantity;version='[2.0.1,2.0.2)',\
 	tech.units.indriya;version='[2.1.2,2.1.3)',\
 	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
@@ -69,4 +67,6 @@ Fragment-Host: org.openhab.core.voice
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
-	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'
+	biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
+	si-units;version='[2.1.0,2.1.1)',\
+	si.uom.si-quantity;version='[2.1.0,2.1.1)'