diff --git a/bundles/org.openhab.ui.cometvisu/pom.xml b/bundles/org.openhab.ui.cometvisu/pom.xml
index 33c02374c..068819d1d 100644
--- a/bundles/org.openhab.ui.cometvisu/pom.xml
+++ b/bundles/org.openhab.ui.cometvisu/pom.xml
@@ -35,12 +35,12 @@
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.boot</artifactId>
+      <artifactId>org.openhab.core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core</artifactId>
+      <artifactId>org.openhab.core.io.net</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/bundles/org.openhab.ui.habot/pom.xml b/bundles/org.openhab.ui.habot/pom.xml
index 37fe3f0d3..e4763e6b4 100644
--- a/bundles/org.openhab.ui.habot/pom.xml
+++ b/bundles/org.openhab.ui.habot/pom.xml
@@ -29,12 +29,7 @@
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.boot</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.ui</artifactId>
+      <artifactId>org.openhab.core.automation</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -42,6 +37,11 @@
       <artifactId>org.openhab.core.io.rest</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core.model.script</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
       <artifactId>org.openhab.core.semantics</artifactId>
@@ -49,7 +49,12 @@
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.automation</artifactId>
+      <artifactId>org.openhab.core.ui</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.core.bundles</groupId>
+      <artifactId>org.openhab.core.voice</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/NotificationService.java b/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/NotificationService.java
index c8cf4dad0..41dc292ce 100644
--- a/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/NotificationService.java
+++ b/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/NotificationService.java
@@ -40,7 +40,7 @@ import org.bouncycastle.jce.interfaces.ECPublicKey;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
 import org.jose4j.lang.JoseException;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.ui.habot.notification.internal.webpush.Notification;
 import org.openhab.ui.habot.notification.internal.webpush.PushService;
 import org.openhab.ui.habot.notification.internal.webpush.Subscription;
@@ -174,7 +174,7 @@ public class NotificationService {
         encodedKeys.add(BaseEncoding.base64Url().encode(privateKey));
 
         // write the public key, then the private key in encoded form on separate lines in the file
-        File file = new File(ConfigConstants.getUserDataFolder() + File.separator + VAPID_KEYS_FILE_NAME);
+        File file = new File(OpenHAB.getUserDataFolder() + File.separator + VAPID_KEYS_FILE_NAME);
         file.getParentFile().mkdirs();
         IOUtils.writeLines(encodedKeys, System.lineSeparator(), new FileOutputStream(file));
 
@@ -188,7 +188,7 @@ public class NotificationService {
     private void loadVAPIDKeys() {
         try {
             List<String> encodedKeys = IOUtils.readLines(
-                    new FileInputStream(ConfigConstants.getUserDataFolder() + File.separator + VAPID_KEYS_FILE_NAME));
+                    new FileInputStream(OpenHAB.getUserDataFolder() + File.separator + VAPID_KEYS_FILE_NAME));
             this.publicVAPIDKey = encodedKeys.get(0);
             this.privateVAPIDKey = encodedKeys.get(1);
         } catch (IOException e) {
diff --git a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/AbstractTrainerTest.java b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/AbstractTrainerTest.java
index d0e6b6c56..d0f0a3e78 100644
--- a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/AbstractTrainerTest.java
+++ b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/AbstractTrainerTest.java
@@ -12,14 +12,14 @@
  */
 package org.openhab.ui.habot.test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeMap;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
@@ -48,7 +48,7 @@ public class AbstractTrainerTest {
         public final static String CREATE_RULE = "create-rule";
     }
 
-    @Before
+    @BeforeEach
     public void initializeMockSkills() {
         skills = new ArrayList<Skill>();
 
diff --git a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TokenizerTest.java b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TokenizerTest.java
index 8453027d3..2f5bf8420 100644
--- a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TokenizerTest.java
+++ b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TokenizerTest.java
@@ -12,9 +12,9 @@
  */
 package org.openhab.ui.habot.test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openhab.ui.habot.nlp.internal.AlphaNumericTokenizer;
 
 /**
diff --git a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerDeTest.java b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerDeTest.java
index 08f9185a2..f14ec826b 100644
--- a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerDeTest.java
+++ b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerDeTest.java
@@ -12,9 +12,9 @@
  */
 package org.openhab.ui.habot.test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.internal.IntentTrainer;
 
diff --git a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerEnTest.java b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerEnTest.java
index 772f2c5b3..cde6186c4 100644
--- a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerEnTest.java
+++ b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerEnTest.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.ui.habot.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openhab.ui.habot.nlp.internal.IntentTrainer;
 
 /**
diff --git a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerFrTest.java b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerFrTest.java
index 4fd71bc14..95b127e10 100644
--- a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerFrTest.java
+++ b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerFrTest.java
@@ -12,9 +12,9 @@
  */
 package org.openhab.ui.habot.test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.internal.IntentTrainer;
 
diff --git a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerItTest.java b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerItTest.java
index cffac1dc7..d3f95d291 100644
--- a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerItTest.java
+++ b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerItTest.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.ui.habot.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openhab.ui.habot.nlp.internal.IntentTrainer;
 
 /**
diff --git a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerNlTest.java b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerNlTest.java
index f4172a785..7c68e51e7 100644
--- a/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerNlTest.java
+++ b/bundles/org.openhab.ui.habot/src/test/java/org/openhab/ui/habot/test/TrainerNlTest.java
@@ -12,9 +12,9 @@
  */
 package org.openhab.ui.habot.test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.internal.IntentTrainer;
 
diff --git a/pom.xml b/pom.xml
index d973f6917..9203b4efc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
     <maven.compiler.target>${oh.java.version}</maven.compiler.target>
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
-    <bnd.version>4.3.0</bnd.version>
+    <bnd.version>5.1.2</bnd.version>
     <karaf.version>4.2.7</karaf.version>
     <sat.version>0.10.0</sat.version>
     <spotless.version>1.30.0</spotless.version>
@@ -319,7 +319,7 @@ Import-Package: \\
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>3.0.0-M5</version>
         </plugin>
 
         <plugin>