diff --git a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
index b10fdb6412e..6dd5202d204 100755
--- a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+++ b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
@@ -104,17 +104,59 @@
          unpack="false"/>
 
    <plugin
-         id="org.mongodb.mongo-java-driver"
+         id="org.mongodb.mongodb-driver-legacy"
          download-size="0"
          install-size="0"
-         version="3.6.4"
+         version="4.3.1"
          unpack="false"/>
 
    <plugin
-         id="org.mongodb.mongo-java-driver.source"
+         id="org.mongodb.mongodb-driver-legacy.source"
          download-size="0"
          install-size="0"
-         version="3.6.4"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.bson"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.bson.source"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-core"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-core.source"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-sync"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-sync"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
          unpack="false"/>
 
    <plugin
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/bson-4.3.1-sources.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/bson-4.3.1-sources.jar
new file mode 100755
index 00000000000..f77f07398e5
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/bson-4.3.1-sources.jar differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/bson-4.3.1.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/bson-4.3.1.jar
new file mode 100755
index 00000000000..440432c2095
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/bson-4.3.1.jar differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4-sources.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4-sources.jar
deleted file mode 100755
index af89e9a2806..00000000000
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4-sources.jar and /dev/null differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4.jar
deleted file mode 100755
index 48dde049f4a..00000000000
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4.jar and /dev/null differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-core-4.3.1-sources.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-core-4.3.1-sources.jar
new file mode 100755
index 00000000000..e54a0d8633c
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-core-4.3.1-sources.jar differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-core-4.3.1.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-core-4.3.1.jar
new file mode 100755
index 00000000000..c6fe38b6a33
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-core-4.3.1.jar differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-legacy-4.3.1-sources.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-legacy-4.3.1-sources.jar
new file mode 100755
index 00000000000..4fe07561587
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-legacy-4.3.1-sources.jar differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-legacy-4.3.1.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-legacy-4.3.1.jar
new file mode 100755
index 00000000000..b62acb93d3b
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-legacy-4.3.1.jar differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-sync-4.3.1-sources.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-sync-4.3.1-sources.jar
new file mode 100755
index 00000000000..1d759c17288
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-sync-4.3.1-sources.jar differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-sync-4.3.1.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-sync-4.3.1.jar
new file mode 100755
index 00000000000..a9cd2dfb8f6
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongodb-driver-sync-4.3.1.jar differ
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
index 547b87781be..6380727b433 100755
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Race Analysis Target" sequenceNumber="185">
+<target name="Race Analysis Target" sequenceNumber="192">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="javax.ws.rs" version="1.1.1.v20130318-1750"/>
@@ -266,8 +266,14 @@
 <plugin id="org.junit.source"/>
 <plugin id="org.jvnet.mimepull"/>
 <plugin id="org.mockito.mockito-core"/>
-<plugin id="org.mongodb.mongo-java-driver"/>
-<plugin id="org.mongodb.mongo-java-driver.source"/>
+<plugin id="org.mongodb.bson"/>
+<plugin id="org.mongodb.bson.source"/>
+<plugin id="org.mongodb.driver-core"/>
+<plugin id="org.mongodb.driver-core.source"/>
+<plugin id="org.mongodb.driver-sync"/>
+<plugin id="org.mongodb.driver-sync.source"/>
+<plugin id="org.mongodb.mongodb-driver-legacy"/>
+<plugin id="org.mongodb.mongodb-driver-legacy.source"/>
 <plugin id="org.objenesis"/>
 <plugin id="routeconverter"/>
 <plugin id="slf4j.api"/>
diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml
index fb12b62df11..6cebedcb100 100644
--- a/java/com.sap.sse.feature.runtime/feature.xml
+++ b/java/com.sap.sse.feature.runtime/feature.xml
@@ -18,17 +18,59 @@
    </license>
 
    <plugin
-         id="org.mongodb.mongo-java-driver"
+         id="org.mongodb.mongodb-driver-legacy"
          download-size="0"
          install-size="0"
-         version="3.6.4"
+         version="4.3.1"
          unpack="false"/>
 
    <plugin
-         id="org.mongodb.mongo-java-driver.source"
+         id="org.mongodb.mongodb-driver-legacy.source"
          download-size="0"
          install-size="0"
-         version="3.6.4"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-core"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-core.source"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.bson"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.bson.source"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-sync"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.mongodb.driver-sync"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"
          unpack="false"/>
 
    <plugin
diff --git a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
index afd3dc02157..0dc3dfb4330 100644
--- a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
@@ -20,8 +20,10 @@ Require-Bundle: com.amazon.aws.aws-java-api,
  com.sap.sse.operationaltransformation,
  com.sap.sse,
  org.apache.commons.io,
- org.mongodb.mongo-java-driver;bundle-version="3.6.4",
  org.apache.shiro.core,
  com.sap.sailing.domain.common,
- com.sap.sse.security
+ com.sap.sse.security,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Automatic-Module-Name: com.sap.sse.filestorage
diff --git a/java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF
index 179d821f59b..1ff1266a70d 100755
--- a/java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF
@@ -9,8 +9,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: com.sap.sse.landscape.aws.persistence
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.mongodb.mongo-java-driver;bundle-version="3.6.4",
- com.sap.sse.mongodb,
+Require-Bundle: com.sap.sse.mongodb,
  com.sap.sse.common,
- com.sap.sse.landscape
+ com.sap.sse.landscape,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sse.landscape.aws.persistence
diff --git a/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF
index a1537a00ee3..fc7654bbbef 100755
--- a/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.hamcrest;bundle-version="1.1.0",
  org.junit;bundle-version="4.8.2",
  org.objenesis;bundle-version="2.1.0",
- org.mongodb.mongo-java-driver;bundle-version="3.6.4",
- com.sap.sailing.landscape
+ com.sap.sailing.landscape,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: org.mockito,
  org.mockito.stubbing;version="1.10.14"
diff --git a/java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF
index 8dccae07d3d..261e16599e2 100755
--- a/java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF
@@ -24,7 +24,9 @@ Require-Bundle: com.amazon.aws.aws-java-api;bundle-version="2.13.50",
  com.sap.sse.landscape.aws.common,
  com.sap.sse.replication.interfaces,
  com.sap.sse.operationaltransformation,
- org.mongodb.mongo-java-driver
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Web-ContextPath: /landscape
 Import-Package: org.apache.shiro;version="1.2.2",
  org.osgi.framework;version="1.8.0",
diff --git a/java/com.sap.sse.landscape/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape/META-INF/MANIFEST.MF
index cc787aa76e1..6872eb93f05 100755
--- a/java/com.sap.sse.landscape/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.landscape/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Export-Package: com.sap.sse.landscape,
  com.sap.sse.landscape.ssh
 Require-Bundle: com.sap.sse.common,
  com.jcraft.jsch;bundle-version="0.1.54",
- org.mongodb.mongo-java-driver,
  com.sap.sse.landscape,
  org.json.simple,
  org.apache.httpcomponents.httpcore;bundle-version="4.4.9",
@@ -27,5 +26,8 @@ Require-Bundle: com.sap.sse.common,
  com.sap.sse.landscape.common,
  com.sap.sse.shared.android,
  com.sap.sse,
- com.sap.sse.replication.interfaces
+ com.sap.sse.replication.interfaces,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Bundle-ActivationPolicy: lazy
diff --git a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF b/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF
index 53d19708060..43401eab148 100644
--- a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF
@@ -6,7 +6,9 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.common,
- org.mongodb.mongo-java-driver;bundle-version="3.6.4"
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1"
 Export-Package: com.sap.sse.mongodb
 Bundle-ActivationPolicy: lazy
 Import-Package: org.osgi.framework;version="1.6.0"
diff --git a/java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF b/java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF
index 9be57b4bc99..d0083830a50 100644
--- a/java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF
@@ -7,8 +7,10 @@ Bundle-Vendor: SAP
 Automatic-Module-Name: com.sap.sse.replication.persistence
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.replication.interfaces,
- org.mongodb.mongo-java-driver;bundle-version="3.6.4",
- com.sap.sse.common
+ com.sap.sse.common,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: com.sap.sse.mongodb,
  org.osgi.framework;version="1.8.0"
 Export-Package: com.sap.sse.replication.persistence
diff --git a/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF b/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF
index 31d15a3d292..3a94285d140 100755
--- a/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF
@@ -14,6 +14,8 @@ Import-Package: org.apache.shiro.session;version="1.2.2",
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.sap.sse.mongodb,
  com.sap.sse.common,
- org.mongodb.mongo-java-driver;bundle-version="3.6.4"
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sse.security.persistence,
  com.sap.sse.security.persistence.impl
diff --git a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
index a9edaa96566..4fa60883946 100644
--- a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
@@ -16,6 +16,8 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
  org.objenesis;bundle-version="2.1.0",
  org.mockito.mockito-core;bundle-version="1.10.14",
  com.sap.sse.replication;bundle-version="1.0.0",
- org.mongodb.mongo-java-driver;bundle-version="3.6.4"
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: org.osgi.util.tracker;version="1.5.1"
 Automatic-Module-Name: com.sap.sse.security.replication.test
diff --git a/java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF b/java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF
index 7ef87fc0792..ea3a754ac5b 100755
--- a/java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF
@@ -7,8 +7,10 @@ Bundle-Vendor: SAP
 Automatic-Module-Name: com.sap.sse.security.storemerging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.mongodb,
- org.mongodb.mongo-java-driver,
  com.sap.sse.security.interface,
  com.sap.sse.security.userstore.mongodb,
- com.sap.sse.common
+ com.sap.sse.common,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: com.sap.sse.security
diff --git a/java/com.sap.sse.security.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
index 7761f76a2ad..dc34f687c75 100755
--- a/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
@@ -12,13 +12,15 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  com.sap.sse.mongodb,
  com.sap.sse.mail,
  jcl.over.slf4j;bundle-version="1.6.4",
- org.mongodb.mongo-java-driver;bundle-version="3.6.4",
  slf4j.api;bundle-version="1.6.4",
  jcl.over.slf4j;bundle-version="1.6.4",
  org.mockito.mockito-core;bundle-version="1.10.14",
  org.objenesis;bundle-version="2.1.0",
  org.hamcrest;bundle-version="1.1.0",
- com.sap.sailing.domain.common
+ com.sap.sailing.domain.common,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: com.sap.sse.security.shared,
  com.sap.sse.security.ui.shared,
  org.apache.shiro.session.mgt
diff --git a/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF b/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
index 7a9256c4685..52577776d02 100644
--- a/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
@@ -16,11 +16,13 @@ Require-Bundle: org.apache.shiro.core;bundle-version="1.2.2",
  com.sap.sse.common,
  com.sap.sse.security.common,
  com.sap.sse.shared.android,
- org.mongodb.mongo-java-driver;bundle-version="3.6.4",
  com.sap.sse.replication,
  com.sap.sse,
  com.sap.sse.security.interface,
- com.sap.sse.security
+ com.sap.sse.security,
+ org.mongodb.driver-core;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sse.security.userstore.mongodb,
  com.sap.sse.security.userstore.mongodb.impl;x-friends:="com.sap.sse.security.storemerging,com.sap.sse.security.test"
 Automatic-Module-Name: com.sap.sse.security.userstore.mongodb