diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 43c5248876f..62ea0c6b7f4 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'bnd-7'
     paths-ignore:
       - '.github/**/*.md'
   pull_request:
@@ -11,6 +12,8 @@ on:
       - 'main'
     paths-ignore:
       - '.github/**/*.md'
+  schedule:
+    - cron: '0 3 * * *'
   workflow_dispatch:
 
 jobs:
@@ -69,7 +72,7 @@ jobs:
 
       - name: Build
         id: build
-        run: mvn clean verify -B -T 1.5C -U
+        run: mvn clean verify -B -DskipChecks=true -T 1.5C -U
         env:
           MAVEN_OPTS: >-
             -Xmx2g
diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun
index 6b48ac8a27c..1677e694519 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -34,7 +34,6 @@ Fragment-Host: org.openhab.core.addon
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -61,4 +60,5 @@ Fragment-Host: org.openhab.core.addon
 	org.openhab.core.addon.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.config.core;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
-	org.openhab.base-fixes;version='[1.0.0,1.0.1)'
+	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index aa66d13dd16..e970760728a 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -70,4 +69,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.openhab.core.io.net;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 144dab3b0cb..8f283b213d1 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 249f29b4359..1ae2f3f4789 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 af8a495d68a..e8f9f832db6 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -65,4 +64,5 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 6dd0913a1e6..3472513a4ad 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index ecd0ce801fe..63d0e1ce587 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index 53b88e4bfc3..8427ba68492 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -31,7 +31,6 @@ Fragment-Host: org.openhab.core.config.core
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -63,4 +62,5 @@ Fragment-Host: org.openhab.core.config.core
 	org.openhab.core.config.core.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 660e7c8a32d..1e390181d76 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -31,7 +31,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
 	javax.jmdns;version='[3.5.8,3.5.9)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index f1b8c437517..7c3a8b41f67 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -31,7 +31,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 8ef16286b5f..9a69fd1b6f4 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
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 fa053964cba..8cd00b2e373 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -40,7 +40,6 @@ Provide-Capability: \
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -76,4 +75,5 @@ Provide-Capability: \
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 4d720adb4c4..48fc8815591 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core.config.dispatch.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 6a02c504517..89b1f8e96ab 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -37,7 +37,6 @@ feature.openhab-config: \
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -65,4 +64,5 @@ feature.openhab-config: \
 	org.openhab.core.ephemeris.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 0eaf7dd727e..efa382a5717 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -10,7 +10,6 @@ Fragment-Host: org.openhab.core.io.net
 	bnd.identity;id='org.apache.aries.spifly.dynamic.bundle'
 
 -runbundles: \
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
@@ -74,4 +73,5 @@ Fragment-Host: org.openhab.core.io.net
 	org.openhab.core.io.net.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 ae97d588564..565b8ce67e9 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -52,7 +52,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
@@ -108,4 +107,5 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 7178a6b927a..7f9fd598e5f 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -42,7 +42,6 @@ Fragment-Host: org.openhab.core.model.item
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -115,5 +114,6 @@ Fragment-Host: org.openhab.core.model.item
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.1.0,4.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 b668c453207..53f61d18213 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -46,7 +46,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -119,5 +118,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.1.0,4.1.1)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index b278764476d..4caaa12c87e 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -45,7 +45,6 @@ Fragment-Host: org.openhab.core.model.script
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -122,4 +121,5 @@ Fragment-Host: org.openhab.core.model.script
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)'
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.1.0,4.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 8de4af86738..29aa023d01c 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -43,7 +43,6 @@ Fragment-Host: org.openhab.core.model.thing
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -124,4 +123,6 @@ Fragment-Host: org.openhab.core.model.thing
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.1.0,4.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 4e75aaf5f13..a50a4189878 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.storage.json
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -61,4 +60,5 @@ Fragment-Host: org.openhab.core.storage.json
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index c39489581df..5611017f575 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -60,4 +59,5 @@ Fragment-Host: org.openhab.core
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.core.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 407c7de4c2a..b02d2191655 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -34,7 +34,6 @@ Fragment-Host: org.openhab.core.thing
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.thing
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.thing.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
-	org.openhab.base-fixes;version='[1.0.0,1.0.1)'
+	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index e50ed771a88..12b03b1c732 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -34,7 +34,6 @@ Fragment-Host: org.openhab.core.voice
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -73,4 +72,5 @@ Fragment-Host: org.openhab.core.voice
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice.tests;version='[4.1.0,4.1.1)',\
-	org.openhab.base-fixes;version='[1.0.0,1.0.1)'
+	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/pom.xml b/pom.xml
index d92eb97a4e2..d3f916744fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -69,7 +69,7 @@
     <maven.compiler.target>${oh.java.version}</maven.compiler.target>
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
-    <bnd.version>6.4.0</bnd.version>
+    <bnd.version>7.0.0-SNAPSHOT</bnd.version>
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.3.0</eea.version>
     <karaf.compile.version>4.4.3</karaf.compile.version>
@@ -116,6 +116,37 @@
     </dependencies>
   </dependencyManagement>
 
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>bnd</id>
+      <name>Bnd snapshots</name>
+      <url>https://bndtools.jfrog.io/bndtools/libs-snapshot-local</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>bnd</id>
+      <name>Bnd snapshots</name>
+      <url>https://bndtools.jfrog.io/bndtools/libs-snapshot-local</url>
+    </pluginRepository>
+  </pluginRepositories>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -205,7 +236,7 @@ Import-Package: \\
           <version>${bnd.version}</version>
           <configuration>
             <failOnChanges>false</failOnChanges>
-            <bndruns/>
+            <bndruns></bndruns>
           </configuration>
           <executions>
             <execution>
@@ -334,15 +365,11 @@ Import-Package: \\
             <!-- The search function is broken without the workaround below -->
             <!-- See: https://stackoverflow.com/questions/52326318/maven-javadoc-search-redirects-to-undefined-url -->
             <additionalJOption>--allow-script-in-comments</additionalJOption>
-            <bottom>
-              <![CDATA[
-                <script>
+            <bottom><![CDATA[<script>
                 if (typeof useModuleDirectories !== 'undefined') {
                   useModuleDirectories = false;
                 }
-                </script>
-              ]]>
-            </bottom>
+                </script>]]></bottom>
           </configuration>
           <dependencies>
             <!-- This newer version fixes issues with resolving tech.units:indriya packages -->
@@ -392,10 +419,8 @@ Import-Package: \\
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.0.0</version>
           <configuration>
-            <argLine>
-              --add-opens java.base/java.net=ALL-UNNAMED
-              --add-opens java.base/java.util=ALL-UNNAMED
-            </argLine>
+            <argLine>--add-opens java.base/java.net=ALL-UNNAMED
+              --add-opens java.base/java.util=ALL-UNNAMED</argLine>
             <systemPropertyVariables>
               <junit.jupiter.execution.timeout.default>15 m</junit.jupiter.execution.timeout.default>
             </systemPropertyVariables>
@@ -542,11 +567,11 @@ Import-Package: \\
                 <file>openhab_codestyle.xml</file>
                 <version>${spotless.eclipse.version}</version>
               </eclipse>
-              <removeUnusedImports/>
+              <removeUnusedImports></removeUnusedImports>
               <importOrder>
                 <file>openhab.importorder</file>
               </importOrder>
-              <endWithNewline/>
+              <endWithNewline></endWithNewline>
             </java>
             <formats>
               <format>
@@ -565,8 +590,8 @@ Import-Package: \\
                   </files>
                   <version>${spotless.eclipse.wtp.version}</version>
                 </eclipseWtp>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace></trimTrailingWhitespace>
+                <endWithNewline></endWithNewline>
               </format>
               <format>
                 <!-- feature.xml -->
@@ -580,8 +605,8 @@ Import-Package: \\
                   </files>
                   <version>${spotless.eclipse.wtp.version}</version>
                 </eclipseWtp>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace></trimTrailingWhitespace>
+                <endWithNewline></endWithNewline>
               </format>
               <format>
                 <!-- pom.xml -->
@@ -595,8 +620,8 @@ Import-Package: \\
                   </files>
                   <version>${spotless.eclipse.wtp.version}</version>
                 </eclipseWtp>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace></trimTrailingWhitespace>
+                <endWithNewline></endWithNewline>
               </format>
             </formats>
           </configuration>
@@ -706,7 +731,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -719,7 +744,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -733,7 +758,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -746,7 +771,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                   </pluginExecutions>
@@ -826,4 +851,5 @@ Import-Package: \\
       </build>
     </profile>
   </profiles>
+
 </project>