diff --git a/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF
index 587f0d8635f..7a6e6171681 100644
--- a/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.mongodb,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sailing.domain.igtimiadapter.persistence
 Import-Package: org.osgi.framework
 Bundle-Activator: com.sap.sailing.domain.igtimiadapter.persistence.impl.Activator
diff --git a/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
index a7d809ddfc3..21b85cf42dc 100644
--- a/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: com.sap.sse.mongodb,
  com.sap.sse,
  com.sap.sailing.server.gateway.serialization.shared.android,
  com.sap.sse.shared.android,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sailing.domain.persistence,
  com.sap.sailing.domain.persistence.impl;
   x-friends:="com.sap.sailing.domain.persistence.test,
diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
index fad37d559db..831cfd39f57 100644
--- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
+++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
@@ -41,7 +41,6 @@ import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.IndexOptions;
 import com.mongodb.client.model.RenameCollectionOptions;
 import com.mongodb.client.result.DeleteResult;
-import com.mongodb.util.JSON;
 import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
 import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
 import com.sap.sailing.domain.abstractlog.race.CompetitorResult.MergeState;
@@ -1269,7 +1268,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
             if (dbRegatta.containsKey(FieldNames.REGATTA_REGATTA_CONFIGURATION.name())) {
                 try {
                     JSONObject json = Helpers.toJSONObjectSafe(new JSONParser()
-                            .parse(JSON.serialize(dbRegatta.get(FieldNames.REGATTA_REGATTA_CONFIGURATION.name()))));
+                            .parse(((Document) dbRegatta.get(FieldNames.REGATTA_REGATTA_CONFIGURATION.name())).toJson()));
                     configuration = RegattaConfigurationJsonDeserializer.create().deserialize(json);
                 } catch (JsonDeserializationException | ParseException e) {
                     logger.log(Level.WARNING, "Error loading racing procedure configration for regatta.", e);
@@ -2485,7 +2484,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
         MongoCollection<Document> collection = database.getCollection(CollectionNames.COMPETITORS.name());
         try {
             for (Document o : collection.find()) {
-                JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(JSON.serialize(o)));
+                JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(o.toJson()));
                 DynamicCompetitor c = competitorWithBoatRefDeserializer.deserialize(json);
                 // ensure that in case there should be multiple competitors with equal IDs in the DB
                 // only one will survive
@@ -2532,7 +2531,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
                     try {
                         logger.log(Level.INFO, "Bug2822 DB-Migration: Load old competitors with embedded boats from COMPETITORS_BAK.");
                         for (Document o : collection.find()) {
-                            JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(JSON.serialize(o)));
+                            JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(o.toJson()));
                             CompetitorWithBoat c = legacyCompetitorWithBoatDeserializer.deserialize(json);
                             // accept only the first instance for any given ID
                             if (!competitorsById.containsKey(c.getId())) {
@@ -2555,7 +2554,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
         MongoCollection<Document> collection = database.getCollection(CollectionNames.BOATS.name());
         try {
             for (Document o : collection.find()) {
-                JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(JSON.serialize(o)));
+                JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(o.toJson()));
                 DynamicBoat b = boatDeserializer.deserialize(json);
                 result.add(b);
             }
@@ -2607,7 +2606,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
         DeviceConfiguration configuration = null;
         try {
             JsonDeserializer<DeviceConfiguration> deserializer = DeviceConfigurationJsonDeserializer.create();
-            JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(JSON.serialize(configObject)));
+            JSONObject json = Helpers.toJSONObjectSafe(new JSONParser().parse(configObject.toJson()));
             configuration = deserializer.deserialize(json);
         } catch (JsonDeserializationException | ParseException e) {
             logger.log(Level.SEVERE,
diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF
index 81dbe9152d3..fbb1d459487 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@ Require-Bundle: com.sap.sailing.domain.shared.android,
  org.junit;bundle-version="4.8.2",
  com.sap.sse.common,
  com.sap.sailing.server.gateway.serialization.shared.android,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sailing.domain.racelog.tracking.test.mock
 Automatic-Module-Name: com.sap.sailing.domain.racelogtrackingadapter.testsupport
diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
index e1772ba9edb..2f7d884fe83 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sse,
  com.sap.sailing.server.gateway.serialization.shared.android,
  com.sap.sse.mail,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Import-Package: com.google.zxing;version="3.1.0",
  com.mongodb,
  com.sap.sse.concurrent,
diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
index 3abe7c9fe3a..e8c2180d414 100644
--- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: com.sap.sailing.domain.swisstimingadapter,
  com.sap.sse.common,
  com.sap.sailing.domain.persistence,
  com.sap.sse,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sailing.domain.swisstimingadapter.persistence,
  com.sap.sailing.domain.swisstimingadapter.persistence.impl;x-friends:="com.sap.sailing.domain.swisstimingadapter.test,com.sap.sailing.mongodb.test"
 Import-Package: org.osgi.framework,
diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
index cf6b8ec9a08..02d8a87771c 100644
--- a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: com.sap.sailing.domain,
  org.hamcrest.core;bundle-version="1.1.0",
  com.sap.sse,
  com.sap.sse.common,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Bundle-ClassPath: resources/,
  .
 Import-Package: com.sap.sailing.server
diff --git a/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
index f77ec08dbd5..9d6f5c7262a 100644
--- a/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: com.sap.sse.mongodb,
  com.sap.sse.common,
  com.sap.sailing.domain.persistence,
  com.sap.sse,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sailing.domain.tractracadapter.persistence,
  com.sap.sailing.domain.tractracadapter.persistence.impl;x-friends:="com.sap.sailing.mongodb.test"
 Import-Package: org.osgi.framework,
diff --git a/java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF
index 1c13328a325..e64539513b3 100755
--- a/java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@ Require-Bundle: com.sap.sailing.domain.persistence,
  com.sap.sailing.expeditionconnector.common,
  com.sap.sailing.server.gateway.serialization.shared.android,
  com.sap.sse,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sailing.expeditionconnector.persistence
 Automatic-Module-Name: com.sap.sailing.expeditionconnector.persistence
diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
index 82fabcd640f..e7868987bf7 100644
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -59,7 +59,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.expeditionconnector.common,
  org.mp4parser.isoparser;bundle-version="1.9.37",
  com.sap.sse.datamining.ui,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.servlet;version="3.1.0",
diff --git a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
index b40f293bb90..f4bb0dd67eb 100644
--- a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@ Require-Bundle: com.sap.sse.mongodb,
  com.sap.sailing.domain.common;bundle-version="1.0.0",
  org.hamcrest;bundle-version="1.1.0",
  com.sap.sse.common,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Automatic-Module-Name: com.sap.sailing.media.persistence.test
diff --git a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
index 6e86deee6ea..970c9f3dd30 100644
--- a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
  com.sap.sse.common,
  jcl.over.slf4j;bundle-version="1.6.4";resolution:=optional,
  slf4j.api;bundle-version="1.6.4";resolution:=optional,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Bundle-ClassPath: lib/cglib-nodep-2.2.3.jar,
  .
 Automatic-Module-Name: com.sap.sailing.selenium.test
diff --git a/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF
index 291442e1081..027236c1e70 100644
--- a/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: javax.servlet;bundle-version="3.1.0",
  com.sap.sse.mongodb;bundle-version="1.0.0",
  com.sap.sse.common,
  com.sap.sse,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Bundle-ClassPath: .
 Web-ContextPath: /sailingserver/test-support
 Import-Package: org.osgi.framework,
diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
index 0dca706f51a..6c5bcdca04b 100644
--- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
@@ -61,8 +61,8 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.geocoding,
  com.googlecode.java-diff-utils,
  com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0",
- org.eclipse.orbit.mongodb;bundle-version="3.2.2",
- com.sap.sailing.server.interface;bundle-version="1.0.0"
+ com.sap.sailing.server.interface;bundle-version="1.0.0",
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Bundle-ClassPath: .
 Web-ContextPath: /sailingserver
 Export-Package: com.sap.sailing.server.gateway,
diff --git a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
index b001596265d..0d674363083 100644
--- a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
@@ -31,5 +31,5 @@ Require-Bundle: com.sap.sailing.server,
  com.sap.sailing.server.gateway,
  javax.ws.rs,
  com.sap.sailing.server.testsupport,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Automatic-Module-Name: com.sap.sailing.server.replication.test
diff --git a/java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
index 3b3d4b6c7d9..a0cc4cbcae8 100644
--- a/java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
@@ -34,6 +34,6 @@ Require-Bundle: com.sap.sailing.server,
  org.apache.shiro.web;bundle-version="1.2.2",
  org.apache.shiro.core;bundle-version="1.2.2",
  javax.servlet;bundle-version="3.1.0",
- org.eclipse.orbit.mongodb;bundle-version="3.2.2",
- com.sap.sailing.server.interface
+ com.sap.sailing.server.interface,
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Automatic-Module-Name: com.sap.sailing.server.testsupport
diff --git a/java/com.sap.sailing.server/META-INF/MANIFEST.MF b/java/com.sap.sailing.server/META-INF/MANIFEST.MF
index da1dd9f1e57..5c109ac0c1b 100644
--- a/java/com.sap.sailing.server/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server/META-INF/MANIFEST.MF
@@ -39,8 +39,8 @@ Require-Bundle: com.sap.sailing.domain,
  org.apache.shiro.core;bundle-version="1.2.2",
  javax.servlet;bundle-version="3.1.0",
  com.sap.sse.mail,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2",
- com.sap.sailing.server.interface;bundle-version="1.0.0"
+ com.sap.sailing.server.interface;bundle-version="1.0.0",
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Bundle-ClassPath: .
 Export-Package: com.sap.sailing.server,
  com.sap.sailing.server.anniversary,
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 92baa5364ed..ec6bac81dec 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
@@ -107,7 +107,7 @@
          id="org.mongodb.mongo-java-driver"
          download-size="0"
          install-size="0"
-         version="2.13.0.RELEASE"
+         version="3.6.4"
          unpack="false"/>
 
    <plugin
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-2.13.0.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-2.13.0.jar
deleted file mode 100644
index 6555bbd36f0..00000000000
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-2.13.0.jar and /dev/null 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
new file mode 100755
index 00000000000..8410d662e00
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4-sources.jar 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
new file mode 100755
index 00000000000..48dde049f4a
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-3.6.4.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 d9678b87a7f..70742267ed2 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,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="148">
+<?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="149">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="javax.ws.rs" version="1.1.1.v20130318-1750"/>
@@ -55,7 +55,6 @@
 <unit id="org.jdom.source" version="1.1.1.v201101151400"/>
 <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
 <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
-<unit id="org.eclipse.orbit.mongodb" version="3.2.2.v20170222-2110"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -256,7 +255,7 @@
 <plugin id="org.junit.source"/>
 <plugin id="org.jvnet.mimepull"/>
 <plugin id="org.mockito.mockito-core"/>
-<plugin id="org.eclipse.orbit.mongodb"/>
+<plugin id="org.mongodb.mongo-java-driver"/>
 <plugin id="org.objectweb.asm"/>
 <plugin id="org.objectweb.asm.source"/>
 <plugin id="org.objenesis"/>
diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml
index f134e5cdbb4..f083a0d236f 100644
--- a/java/com.sap.sse.feature.runtime/feature.xml
+++ b/java/com.sap.sse.feature.runtime/feature.xml
@@ -17,6 +17,13 @@
       [Enter License Description here.]
    </license>
 
+   <plugin
+         id="org.mongodb.mongo-java-driver"
+         download-size="0"
+         install-size="0"
+         version="3.6.4"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.jetty.osgi.boot"
          download-size="0"
@@ -444,11 +451,4 @@
          version="3.4.0.v20170111-1608"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.orbit.mongodb"
-         download-size="0"
-         install-size="0"
-         version="3.2.2.v20170222-2110"
-         unpack="false"/>
-
 </feature>
diff --git a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
index 279cffb4e9b..4365b26af0c 100644
--- a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
@@ -22,5 +22,5 @@ Require-Bundle: org.apache.servicemix.bundles.aws-java-sdk;bundle-version="1.9.8
  com.sap.sse.operationaltransformation,
  com.sap.sse,
  org.apache.commons.io,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Automatic-Module-Name: com.sap.sse.filestorage
diff --git a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF b/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF
index 8186acf2021..43e890156b7 100644
--- a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.common,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sse.mongodb
 Bundle-ActivationPolicy: lazy
 Import-Package: com.sap.sailing.util,
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 fe52fab37ad..04124beb5ec 100755
--- a/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Import-Package: org.apache.shiro.session;version="1.2.2",
  org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.sap.sse.mongodb,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2",
- com.sap.sse.common
+ com.sap.sse.common,
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sse.security.persistence
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 5a9352a6de5..a9edaa96566 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
@@ -15,7 +15,7 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
  com.sap.sse.mail.replication.testsupport,
  org.objenesis;bundle-version="2.1.0",
  org.mockito.mockito-core;bundle-version="1.10.14",
- org.eclipse.orbit.mongodb;bundle-version="3.2.2",
- com.sap.sse.replication;bundle-version="1.0.0"
+ com.sap.sse.replication;bundle-version="1.0.0",
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 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.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
index 17ba5a44c9d..2257e9f8a42 100755
--- a/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  com.sap.sse.security.userstore.mongodb,
  com.sap.sse.mongodb,
  com.sap.sse.mail,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2",
- jcl.over.slf4j;bundle-version="1.6.4"
+ jcl.over.slf4j;bundle-version="1.6.4",
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Import-Package: org.apache.shiro.session.mgt
 Automatic-Module-Name: com.sap.sse.security.test
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 abdb322ae55..879ceea5c28 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
@@ -15,7 +15,7 @@ Require-Bundle: com.sap.sse.security,
  com.sap.sse.common,
  com.sap.sse.security.common,
  com.sap.sse.shared.android,
- org.eclipse.orbit.mongodb;bundle-version="3.2.2"
+ org.mongodb.mongo-java-driver;bundle-version="3.6.4"
 Export-Package: com.sap.sse.security.userstore.mongodb,
  com.sap.sse.security.userstore.mongodb.impl;x-friends:="com.sap.sse.security.test"
 Automatic-Module-Name: com.sap.sse.security.userstore.mongodb
diff --git a/java/target/start b/java/target/start
index 33bdd8e486a..dd8e2771e05 100755
--- a/java/target/start
+++ b/java/target/start
@@ -143,7 +143,7 @@ if [[ $PARAM == "" ]] || [[ $PARAM == "no-update" ]]; then
         if [[ $SERVER_PORT == "" ]] || [[ $SERVER_ACTIVE == "" ]]; then
             echo "Something went wrong with startup. Please check the logs..."
             if [[ $SERVER_STARTUP_NOTIFY != "" ]]; then
-                echo "Startup of java server failed - check the logs ($SERVER_ACTIVE)\n\n$NETSTAT\n$PROCESS_INFO" | mail -r simon.marcel.pamies@sap.com -s "Server $INSTANCE_ID startup failed!" $SERVER_STARTUP_NOTIFY
+                echo "Startup of java server $SERVER_NAME on $INSTANCE_ID failed - check the logs ($SERVER_ACTIVE)\n\n$NETSTAT\n$PROCESS_INFO" | mail -r simon.marcel.pamies@sap.com -s "Server $INSTANCE_ID startup failed!" $SERVER_STARTUP_NOTIFY
             fi
             exit
         fi
@@ -153,9 +153,9 @@ if [[ $PARAM == "" ]] || [[ $PARAM == "no-update" ]]; then
 
     if [[ $SERVER_STARTUP_NOTIFY != "" ]]; then
         if [[ ! -z "$ON_AMAZON" ]]; then
-            echo "Go to http://$INSTANCE_DNS:$SERVER_PORT to reach your instance!" | mail -s "Server $INSTANCE_ID started up!" -a env.sh $SERVER_STARTUP_NOTIFY
+            echo "Go to http://$INSTANCE_DNS:$SERVER_PORT to reach your instance!" | mail -s "Server $SERVER_NAME on $INSTANCE_ID started up!" -a env.sh $SERVER_STARTUP_NOTIFY
         else
-            echo "OK" | mail -s "Server $INSTANCE_ID started up!" -a env.sh $SERVER_STARTUP_NOTIFY
+            echo "OK" | mail -s "Server $SERVER_NAME on $INSTANCE_ID started up!" -a env.sh $SERVER_STARTUP_NOTIFY
         fi
     fi
 elif [[ $PARAM == "debug" ]]; then