diff --git a/build.gradle b/build.gradle
index 77055883f..b131793a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,9 +74,9 @@ ext {
     supportConstraintLayout = 'androidx.constraintlayout:constraintlayout:2.0.1'
 
     androidxPreference = 'androidx.preference:preference:1.1.1'
-    androidRoom = 'androidx.room:room-runtime:2.2.5'
-    androidRoomRxJava = 'androidx.room:room-rxjava2:2.2.5'
-    supportRoom = 'androidx.room:room-compiler:2.2.5'
+    androidRoom = 'androidx.room:room-runtime:2.4.2'
+    androidRoomRxJava = 'androidx.room:room-rxjava3:2.4.2'
+    supportRoom = 'androidx.room:room-compiler:2.4.2'
 
 
     def lifecycle_version = "2.2.0"
@@ -102,11 +102,11 @@ ext {
     retrofit2 = "com.squareup.retrofit2:retrofit:$retrofit_version"
     retrofitGson2 = "com.squareup.retrofit2:converter-gson:$retrofit_version"
     retrofitAdapters2 = "com.squareup.retrofit2:retrofit-adapters:$retrofit_version"
-    retrofitRxJava2 = "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
+    retrofitRxJava3 = "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
 
     // RxJava dependencies.
-    rxJava = 'io.reactivex.rxjava2:rxjava:2.2.21'
-    rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    rxJava = 'io.reactivex.rxjava3:rxjava:3.0.0'
+    rxAndroid = 'io.reactivex.rxjava3:rxandroid:3.0.0'
     rxPreferences = 'com.f2prateek.rx.preferences2:rx-preferences:2.0.1'
 
     // RxBindings
diff --git a/gradle.properties b/gradle.properties
index 0ad272845..8c9d019c1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,4 +11,5 @@
 sdk.dir=/home/matthes/opt/android/sdk
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiYWthc2hyYW1qeW90aGkiLCJhIjoiY2wxODc5ZGZlMGFueTNrcnp6Z3Q5aG9zcCJ9.a4WxmdZTsH8h_jzqfcWSqQ
\ No newline at end of file
diff --git a/org.envirocar.algorithm/src/main/java/org/envirocar/algorithm/MeasurementProvider.java b/org.envirocar.algorithm/src/main/java/org/envirocar/algorithm/MeasurementProvider.java
index 42298f6e1..31b09fbe0 100644
--- a/org.envirocar.algorithm/src/main/java/org/envirocar/algorithm/MeasurementProvider.java
+++ b/org.envirocar.algorithm/src/main/java/org/envirocar/algorithm/MeasurementProvider.java
@@ -22,7 +22,7 @@
 import org.envirocar.obd.events.PropertyKeyEvent;
 import org.envirocar.obd.events.Timestamped;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.app/src/org/envirocar/app/BaseApplication.java b/org.envirocar.app/src/org/envirocar/app/BaseApplication.java
index 55fe7b783..19451a917 100644
--- a/org.envirocar.app/src/org/envirocar/app/BaseApplication.java
+++ b/org.envirocar.app/src/org/envirocar/app/BaseApplication.java
@@ -55,6 +55,7 @@
 import javax.inject.Inject;
 
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
 
 
 /**
@@ -119,17 +120,17 @@ public void onCreate() {
 
         // debug logging setting listener
         this.disposables.add(
-                ApplicationSettings.getDebugLoggingObservable(this)
+                (Disposable) ApplicationSettings.getDebugLoggingObservable(this)
                         .doOnNext(this::setDebugLogging)
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
 
         // obfuscation setting changed listener
         this.disposables.add(
-                ApplicationSettings.getObfuscationObservable(this)
+                (Disposable) ApplicationSettings.getObfuscationObservable(this)
                         .doOnNext(bool -> LOG.info("Obfuscation enabled: %s", bool.toString()))
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
 
         // register Intentfilter for logging screen changes
         IntentFilter screenIntentFilter = new IntentFilter();
@@ -147,7 +148,7 @@ public void onCreate() {
                             }
                         })
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
     }
 
     @Override
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/ApplicationSettings.java b/org.envirocar.app/src/org/envirocar/app/handler/ApplicationSettings.java
index d1bd112d4..ae403ebf7 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/ApplicationSettings.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/ApplicationSettings.java
@@ -31,7 +31,7 @@
 import org.envirocar.app.R;
 import org.envirocar.app.recording.RecordingType;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java
index 2e106bbdc..3f693f682 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java
@@ -51,11 +51,11 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.Scheduler;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java b/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java
index 3259d2c13..c828ba44b 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java
@@ -38,7 +38,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/TrackDAOHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/TrackDAOHandler.java
index b9ac37fe2..043a63c50 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/TrackDAOHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/TrackDAOHandler.java
@@ -37,8 +37,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java
index dfe0b1424..287279cdc 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java
@@ -48,11 +48,11 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.Single;
 import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/TrackUploadHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/TrackUploadHandler.java
index c1fdc76b9..02ead2289 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/TrackUploadHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/TrackUploadHandler.java
@@ -42,12 +42,12 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableOperator;
 import io.reactivex.ObservableTransformer;
 import io.reactivex.Observer;
 import io.reactivex.functions.Function;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/agreement/AgreementManager.java b/org.envirocar.app/src/org/envirocar/app/handler/agreement/AgreementManager.java
index 06f0de859..cd1b57b55 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/agreement/AgreementManager.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/agreement/AgreementManager.java
@@ -44,12 +44,12 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.ObservableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java
index 7c302f5ac..f3a0eeea3 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java
@@ -60,7 +60,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java
index 64bf472ff..a264afcd1 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java
@@ -40,7 +40,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java b/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java
index 417e288a4..f1f6a8eae 100644
--- a/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java
+++ b/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java
@@ -45,7 +45,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/injection/modules/SchedulerModule.java b/org.envirocar.app/src/org/envirocar/app/injection/modules/SchedulerModule.java
index 6c0f56cee..757aad157 100644
--- a/org.envirocar.app/src/org/envirocar/app/injection/modules/SchedulerModule.java
+++ b/org.envirocar.app/src/org/envirocar/app/injection/modules/SchedulerModule.java
@@ -24,9 +24,9 @@
 
 import dagger.Module;
 import dagger.Provides;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Module
 public class SchedulerModule {
diff --git a/org.envirocar.app/src/org/envirocar/app/interactor/UploadAllTracks.java b/org.envirocar.app/src/org/envirocar/app/interactor/UploadAllTracks.java
index 813048f06..bab3903a7 100644
--- a/org.envirocar.app/src/org/envirocar/app/interactor/UploadAllTracks.java
+++ b/org.envirocar.app/src/org/envirocar/app/interactor/UploadAllTracks.java
@@ -37,10 +37,10 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableOperator;
-import io.reactivex.Scheduler;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/interactor/UploadTrack.java b/org.envirocar.app/src/org/envirocar/app/interactor/UploadTrack.java
index 34d2bf6f7..18b235055 100644
--- a/org.envirocar.app/src/org/envirocar/app/interactor/UploadTrack.java
+++ b/org.envirocar.app/src/org/envirocar/app/interactor/UploadTrack.java
@@ -29,8 +29,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/interactor/ValidateAcceptedTerms.java b/org.envirocar.app/src/org/envirocar/app/interactor/ValidateAcceptedTerms.java
index cb2e67eda..ef6bca8e6 100644
--- a/org.envirocar.app/src/org/envirocar/app/interactor/ValidateAcceptedTerms.java
+++ b/org.envirocar.app/src/org/envirocar/app/interactor/ValidateAcceptedTerms.java
@@ -43,10 +43,10 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.functions.Function;
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java b/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java
index dd477e87d..1bd46d69d 100644
--- a/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java
@@ -42,7 +42,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java b/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java
index ce31474af..af423c77b 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java
@@ -46,7 +46,7 @@
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
@@ -119,7 +119,7 @@ public void onCreate() {
                     }
                 })
                 .doOnError(LOG::error)
-                .subscribe());
+                .doOnSubscribe());
     }
 
     @Override
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java b/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java
index f5133983d..0ddc5d9cb 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java
@@ -35,7 +35,7 @@
 
 import java.util.Locale;
 
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java b/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java
index e417aaee2..dc5835506 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java
@@ -43,7 +43,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java b/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java
index 8c45433a3..e48f67185 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java
@@ -41,7 +41,7 @@
 import org.envirocar.core.events.recording.RecordingNewMeasurementEvent;
 import org.envirocar.core.logging.Logger;
 
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java b/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java
index f1ce16669..0cd7f0b84 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java
@@ -39,8 +39,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.ObservableTransformer;
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java b/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java
index 0c3b8df20..be58568bb 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java
@@ -59,17 +59,17 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.functions.Consumer;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
@@ -192,7 +192,7 @@ public void startRecording(Service service, RecordingListener listener) {
         // subscribe for preference changes
         disposables.add(ApplicationSettings.getTrackTrimDurationObservable(context)
                 .doOnNext(newDuration -> this.trackTrimDuration = newDuration)
-                .subscribe());
+                .doOnSubscribe());
     }
 
     @Override
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java b/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java
index 170fa9a20..7890a1f8b 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java
@@ -61,14 +61,14 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
@@ -163,7 +163,7 @@ public void startRecording(Service service, RecordingListener listener) {
         // subscribe for preference changes
         disposables.add(ApplicationSettings.getCampaignProfileObservable(context)
                 .doOnNext(campaign -> this.cycleCommandProfile = getCycleCommandProfile(campaign))
-                .subscribe());
+                .doOnSubscribe());
     }
 
     @Override
diff --git a/org.envirocar.app/src/org/envirocar/app/recording/strategy/obd/OBDConnectionHandler.java b/org.envirocar.app/src/org/envirocar/app/recording/strategy/obd/OBDConnectionHandler.java
index 57c906ae5..5938358c3 100644
--- a/org.envirocar.app/src/org/envirocar/app/recording/strategy/obd/OBDConnectionHandler.java
+++ b/org.envirocar.app/src/org/envirocar/app/recording/strategy/obd/OBDConnectionHandler.java
@@ -38,11 +38,11 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.functions.Cancellable;
 
 
diff --git a/org.envirocar.app/src/org/envirocar/app/rxutils/RxBroadcastReceiver.java b/org.envirocar.app/src/org/envirocar/app/rxutils/RxBroadcastReceiver.java
index 2e48d793f..ce2c49c70 100644
--- a/org.envirocar.app/src/org/envirocar/app/rxutils/RxBroadcastReceiver.java
+++ b/org.envirocar.app/src/org/envirocar/app/rxutils/RxBroadcastReceiver.java
@@ -28,10 +28,10 @@
 import java.lang.ref.WeakReference;
 
 import io.reactivex.Emitter;
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/services/TrackUploadService.java b/org.envirocar.app/src/org/envirocar/app/services/TrackUploadService.java
index 3e3fba2a4..b96caf5ac 100644
--- a/org.envirocar.app/src/org/envirocar/app/services/TrackUploadService.java
+++ b/org.envirocar.app/src/org/envirocar/app/services/TrackUploadService.java
@@ -46,12 +46,12 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java
index 6b1d0e9e9..7e78d43a8 100644
--- a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java
+++ b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java
@@ -132,7 +132,7 @@ public void onCreate() {
                             updateAutoRecording();
                         })
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
     }
 
     @Override
diff --git a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/GPSAutoRecordingStrategy.java b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/GPSAutoRecordingStrategy.java
index 48eaa2cb5..836bccf4a 100644
--- a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/GPSAutoRecordingStrategy.java
+++ b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/GPSAutoRecordingStrategy.java
@@ -95,7 +95,7 @@ public void run(AutoRecordingCallback callback) {
                 RxBroadcastReceiver.create(service, new IntentFilter(TRANSITIONS_RECEIVER_ACTION))
                         .doOnNext(this::onReceiveTransitionIntent)
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
     }
 
     @Override
diff --git a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java
index 04276b4cf..5fa4e8b78 100644
--- a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java
+++ b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java
@@ -44,12 +44,12 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.exceptions.Exceptions;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
@@ -118,7 +118,7 @@ public void run(AutoRecordingCallback callback) {
                     updateDetectionObservable();
                 })
                 .doOnError(LOG::error)
-                .subscribe());
+                .doOnSubscribe());
 
         isCarSelected = carHandler.getCar() != null;
 
diff --git a/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java b/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java
index c4fedcd89..da3b4ebb8 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java
@@ -66,10 +66,10 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 /**
  * @authro dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/views/SplashScreenActivity.java b/org.envirocar.app/src/org/envirocar/app/views/SplashScreenActivity.java
index 3eb38922e..d0a66226d 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/SplashScreenActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/SplashScreenActivity.java
@@ -36,14 +36,14 @@
 import javax.inject.Inject;
 
 import butterknife.ButterKnife;
-import io.reactivex.Completable;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionActivity.java b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionActivity.java
index cab99c09f..7712c2481 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionActivity.java
@@ -58,11 +58,11 @@
 import butterknife.ButterKnife;
 import butterknife.BindView;
 import butterknife.OnClick;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAddCarFragment.java b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAddCarFragment.java
index a73a00e12..d67661ec3 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAddCarFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAddCarFragment.java
@@ -53,12 +53,12 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import info.hoang8f.android.segmented.SegmentedGroup;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class CarSelectionAddCarFragment extends BaseInjectorFragment {
     private static final Logger LOG = Logger.getLogger(CarSelectionAddCarFragment.class);
diff --git a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAttributesFragment.java b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAttributesFragment.java
index 96eda2a27..e5b8c76c7 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAttributesFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionAttributesFragment.java
@@ -57,14 +57,14 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnTextChanged;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class CarSelectionAttributesFragment extends BaseInjectorFragment {
 
diff --git a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionHsnTsnFragment.java b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionHsnTsnFragment.java
index 488a4bca0..58fa55d2e 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionHsnTsnFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/carselection/CarSelectionHsnTsnFragment.java
@@ -57,14 +57,14 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnEditorAction;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class CarSelectionHsnTsnFragment extends BaseInjectorFragment {
 
diff --git a/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java b/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java
index f34db736e..3dbe67dd0 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java
@@ -113,11 +113,11 @@
 import butterknife.OnCheckedChanged;
 import butterknife.OnClick;
 import info.hoang8f.android.segmented.SegmentedGroup;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.observers.DisposableCompletableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static android.app.Activity.RESULT_OK;
 
diff --git a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java
index 03081a1bf..bb5da32f3 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java
@@ -62,8 +62,8 @@
 import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
index 53f096cde..834057072 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
@@ -76,8 +76,8 @@
 import butterknife.ButterKnife;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
 
diff --git a/org.envirocar.app/src/org/envirocar/app/views/login/SigninActivity.java b/org.envirocar.app/src/org/envirocar/app/views/login/SigninActivity.java
index 2a93f0613..addb5b953 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/login/SigninActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/login/SigninActivity.java
@@ -54,9 +54,9 @@
 import butterknife.OnClick;
 import butterknife.OnEditorAction;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.observers.DisposableCompletableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.app/src/org/envirocar/app/views/login/SignupActivity.java b/org.envirocar.app/src/org/envirocar/app/views/login/SignupActivity.java
index 8c6afff00..729244ea7 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/login/SignupActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/login/SignupActivity.java
@@ -69,10 +69,10 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java b/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java
index b0d577814..47b34a24f 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java
@@ -56,9 +56,9 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import pub.devrel.easypermissions.EasyPermissions;
 import pub.devrel.easypermissions.PermissionRequest;
 
diff --git a/org.envirocar.app/src/org/envirocar/app/views/others/OthersFragment.java b/org.envirocar.app/src/org/envirocar/app/views/others/OthersFragment.java
index ee1771ffc..a739b0a5a 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/others/OthersFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/others/OthersFragment.java
@@ -59,10 +59,10 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.observers.DisposableCompletableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java b/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java
index ad5dc59e6..ca626d739 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java
@@ -54,9 +54,9 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java
index 9b9640db5..9b6bc1f66 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java
@@ -64,7 +64,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 /**
@@ -205,7 +205,7 @@ protected void onSwitchViewsButtonClicked() {
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .doOnNext(ignore -> switchViews())
                 .doOnError(LOG::error)
-                .subscribe();
+                .doOnSubscribe();
     }
 
     @OnClick(R.id.activity_recscreen_stopbutton)
@@ -231,7 +231,7 @@ public void onGpsSatelliteFixEvent(GpsSatelliteFixEvent event) {
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .doOnNext(e -> this.gpsImage.setEnabled(e.mGpsSatelliteFix.isFix()))
                 .doOnError(LOG::error)
-                .subscribe();
+                .doOnSubscribe();
     }
 
     @Subscribe
@@ -246,7 +246,7 @@ public void onStartingTimeEvent(StartingTimeEvent event) {
                         timerText.stop();
                 })
                 .doOnError(LOG::error)
-                .subscribe();
+                .doOnSubscribe();
     }
 
     @Subscribe
@@ -259,7 +259,7 @@ public void onBluetoothStateEvent(BluetoothStateChangedEvent event) {
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .doOnNext(e -> this.bluetoothImage.setEnabled(e.isBluetoothEnabled))
                 .doOnError(LOG::error)
-                .subscribe();
+                .doOnSubscribe();
     }
 
     @Subscribe
@@ -272,7 +272,7 @@ public void onDrivingStateEvent(DrivingDetectedEvent event) {
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .doOnNext(e -> this.bluetoothImage.setEnabled(e.mDrivingDetected))
                 .doOnError(LOG::error)
-                .subscribe();
+                .doOnSubscribe();
     }
 
     @Subscribe
@@ -281,7 +281,7 @@ public void onDistanceUpdateEvent(DistanceValueUpdateEvent event) {
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .doOnNext(e -> distanceText.setText(String.format("%s km", DECIMAL_FORMATTER.format(e.mDistanceValue))))
                 .doOnError(LOG::error)
-                .subscribe();
+                .doOnSubscribe();
     }
 
     @Subscribe
@@ -290,7 +290,7 @@ public void onAvrgSpeedEvent(AvrgSpeedUpdateEvent event) {
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .doOnNext(e -> speedText.setText(String.format("%s km/h", Integer.toString(e.mAvrgSpeed))))
                 .doOnError(LOG::error)
-                .subscribe();
+                .doOnSubscribe();
     }
 
     @Subscribe
diff --git a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java
index 3a1a5bd99..99f85d181 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java
@@ -72,7 +72,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnTouch;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/views/trackdetails/MapExpandedActivity.java b/org.envirocar.app/src/org/envirocar/app/views/trackdetails/MapExpandedActivity.java
index b4c830e5e..30966af1a 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/trackdetails/MapExpandedActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/trackdetails/MapExpandedActivity.java
@@ -67,7 +67,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnTouch;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static android.view.View.GONE;
 
diff --git a/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackDetailsActivity.java b/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackDetailsActivity.java
index b865dcf70..02b6b263a 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackDetailsActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackDetailsActivity.java
@@ -77,7 +77,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackStatisticsActivity.java b/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackStatisticsActivity.java
index 26e8bf469..e0db755f7 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackStatisticsActivity.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/trackdetails/TrackStatisticsActivity.java
@@ -48,7 +48,7 @@
 import butterknife.ButterKnife;
 import butterknife.BindView;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import lecho.lib.hellocharts.formatter.SimpleAxisValueFormatter;
 import lecho.lib.hellocharts.gesture.ZoomType;
 import lecho.lib.hellocharts.listener.DummyVieportChangeListener;
diff --git a/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardAdapter.java b/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardAdapter.java
index 9745f972c..c537618ae 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardAdapter.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardAdapter.java
@@ -52,7 +52,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardFragment.java b/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardFragment.java
index 5036bdec1..0e6a2637d 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/tracklist/AbstractTrackListCardFragment.java
@@ -68,11 +68,11 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
diff --git a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java
index 1c1c2c160..cb1f4a8d4 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java
@@ -56,9 +56,9 @@
 
 import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**
diff --git a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java
index 60d3e8289..d9eb53aee 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java
@@ -45,8 +45,8 @@
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**
diff --git a/org.envirocar.app/tests/android/java/org/envirocar/app/test/CarDatabaseTest.java b/org.envirocar.app/tests/android/java/org/envirocar/app/test/CarDatabaseTest.java
index 46b374fdc..1e008a514 100644
--- a/org.envirocar.app/tests/android/java/org/envirocar/app/test/CarDatabaseTest.java
+++ b/org.envirocar.app/tests/android/java/org/envirocar/app/test/CarDatabaseTest.java
@@ -38,7 +38,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.Single;
 import io.reactivex.observers.DisposableCompletableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
diff --git a/org.envirocar.app/tests/android/java/org/envirocar/app/test/InterpolationMeasurementProviderTest.java b/org.envirocar.app/tests/android/java/org/envirocar/app/test/InterpolationMeasurementProviderTest.java
index 4c03ed955..201716da3 100644
--- a/org.envirocar.app/tests/android/java/org/envirocar/app/test/InterpolationMeasurementProviderTest.java
+++ b/org.envirocar.app/tests/android/java/org/envirocar/app/test/InterpolationMeasurementProviderTest.java
@@ -32,7 +32,7 @@
 import java.util.List;
 
 import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class InterpolationMeasurementProviderTest {
 
diff --git a/org.envirocar.app/tests/android/java/org/envirocar/app/test/dao/TrackDAOTest.java b/org.envirocar.app/tests/android/java/org/envirocar/app/test/dao/TrackDAOTest.java
index f9a7ede05..fe8c51e9d 100644
--- a/org.envirocar.app/tests/android/java/org/envirocar/app/test/dao/TrackDAOTest.java
+++ b/org.envirocar.app/tests/android/java/org/envirocar/app/test/dao/TrackDAOTest.java
@@ -50,12 +50,12 @@
 import java.util.Date;
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @RunWith(AndroidJUnit4.class)
 public class TrackDAOTest {
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/EnviroCarDB.java b/org.envirocar.core/src/main/java/org/envirocar/core/EnviroCarDB.java
index 674f58de7..70c7a1869 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/EnviroCarDB.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/EnviroCarDB.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
@@ -106,6 +106,6 @@ public interface EnviroCarDB {
     void updateTrackMetadata(final Track track, final TrackMetadata trackMetadata) throws
             TrackSerializationException;
 
-    Observable<TrackMetadata> updateTrackMetadataObservable(final Track track, final TrackMetadata trackMetadata) throws
+    io.reactivex.rxjava3.core.Observable updateTrackMetadataObservable(final Track track, final TrackMetadata trackMetadata) throws
             TrackSerializationException;
 }
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/UserManager.java b/org.envirocar.core/src/main/java/org/envirocar/core/UserManager.java
index 514593869..07b5d3bcb 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/UserManager.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/UserManager.java
@@ -20,7 +20,7 @@
 
 import org.envirocar.core.entity.User;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/dao/AnnouncementDAO.java b/org.envirocar.core/src/main/java/org/envirocar/core/dao/AnnouncementDAO.java
index 3238d97fc..3adad4167 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/dao/AnnouncementDAO.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/dao/AnnouncementDAO.java
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/dao/CarDAO.java b/org.envirocar.core/src/main/java/org/envirocar/core/dao/CarDAO.java
index 4a0f6ed28..3341e0a11 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/dao/CarDAO.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/dao/CarDAO.java
@@ -29,7 +29,8 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 
 /**p
  * TODO JavaDoc
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/dao/FuelingDAO.java b/org.envirocar.core/src/main/java/org/envirocar/core/dao/FuelingDAO.java
index 1bbc6ea49..1bfe50d62 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/dao/FuelingDAO.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/dao/FuelingDAO.java
@@ -27,7 +27,8 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/dao/TrackDAO.java b/org.envirocar.core/src/main/java/org/envirocar/core/dao/TrackDAO.java
index e58a456f0..e88e73942 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/dao/TrackDAO.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/dao/TrackDAO.java
@@ -28,7 +28,8 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserDAO.java b/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserDAO.java
index 5ebf0bf43..2a174242f 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserDAO.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserDAO.java
@@ -26,7 +26,8 @@
 import org.envirocar.core.exception.ResourceConflictException;
 import org.envirocar.core.exception.UnauthorizedException;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserStatisticsDAO.java b/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserStatisticsDAO.java
index 1c48d8114..7c538362e 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserStatisticsDAO.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/dao/UserStatisticsDAO.java
@@ -23,7 +23,8 @@
 import org.envirocar.core.exception.DataRetrievalFailureException;
 import org.envirocar.core.exception.UnauthorizedException;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 
 
 /**
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/entity/MeasurementTable.java b/org.envirocar.core/src/main/java/org/envirocar/core/entity/MeasurementTable.java
index fc261634e..8bda42177 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/entity/MeasurementTable.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/entity/MeasurementTable.java
@@ -35,7 +35,8 @@
 import java.util.List;
 import java.util.Map;
 
-import io.reactivex.functions.Function;
+
+import io.reactivex.rxjava3.functions.Function;
 
 @Entity(tableName = "measurements")
 public class MeasurementTable {
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/entity/TrackTable.java b/org.envirocar.core/src/main/java/org/envirocar/core/entity/TrackTable.java
index 00583e64a..c86381fb2 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/entity/TrackTable.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/entity/TrackTable.java
@@ -33,7 +33,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.functions.Function;
 
 @Entity(tableName = "tracks")
 public class TrackTable {
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetAggregatedUserStatistic.java b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetAggregatedUserStatistic.java
index ee91f999e..4cd55e3a8 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetAggregatedUserStatistic.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetAggregatedUserStatistic.java
@@ -31,8 +31,12 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+
 
 @Singleton
 public class GetAggregatedUserStatistic extends Interactor<AggregatedUserStatistic, GetAggregatedUserStatistic.Params> {
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestPrivacyStatement.java b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestPrivacyStatement.java
index edd7e02a0..ceedf5428 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestPrivacyStatement.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestPrivacyStatement.java
@@ -29,8 +29,8 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * @author dewall
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestTermsOfUse.java b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestTermsOfUse.java
index 8368fa220..ff5a39051 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestTermsOfUse.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetLatestTermsOfUse.java
@@ -28,8 +28,8 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * @author dewall
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetUserStatistic.java b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetUserStatistic.java
index 6e22d96a3..bb742ae48 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetUserStatistic.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/GetUserStatistic.java
@@ -28,8 +28,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * @author dewall
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/Interactor.java b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/Interactor.java
index 7a5d173e2..9cf0a319a 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/interactor/Interactor.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/interactor/Interactor.java
@@ -20,10 +20,10 @@
 
 import com.google.common.base.Preconditions;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 /**
  * @author dewall
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/repository/PrivacyStatementRepository.java b/org.envirocar.core/src/main/java/org/envirocar/core/repository/PrivacyStatementRepository.java
index de6c0d98d..fcae2b564 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/repository/PrivacyStatementRepository.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/repository/PrivacyStatementRepository.java
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/repository/TermsOfUseRepository.java b/org.envirocar.core/src/main/java/org/envirocar/core/repository/TermsOfUseRepository.java
index 89b75bf10..a44090550 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/repository/TermsOfUseRepository.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/repository/TermsOfUseRepository.java
@@ -25,7 +25,7 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/repository/UserStatisticRepository.java b/org.envirocar.core/src/main/java/org/envirocar/core/repository/UserStatisticRepository.java
index 6138e0d70..061083599 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/repository/UserStatisticRepository.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/repository/UserStatisticRepository.java
@@ -21,7 +21,8 @@
 import org.envirocar.core.entity.User;
 import org.envirocar.core.entity.UserStatistic;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 
 /**
  * @author dewall
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/utils/PermissionUtils.java b/org.envirocar.core/src/main/java/org/envirocar/core/utils/PermissionUtils.java
index a47df94a6..ae05086d0 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/utils/PermissionUtils.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/utils/PermissionUtils.java
@@ -25,8 +25,8 @@
 
 import androidx.core.app.ActivityCompat;
 
-import io.reactivex.Completable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.functions.Function;
 
 /**
  * @author dewall
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/AbstractReactiveAcceptDialog.java b/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/AbstractReactiveAcceptDialog.java
index ce41f5d26..9949314c4 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/AbstractReactiveAcceptDialog.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/AbstractReactiveAcceptDialog.java
@@ -27,13 +27,13 @@
 import org.envirocar.core.entity.User;
 import org.envirocar.core.logging.Logger;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactivePrivacyStatementDialog.java b/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactivePrivacyStatementDialog.java
index ec3a9dce5..d647fe7d0 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactivePrivacyStatementDialog.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactivePrivacyStatementDialog.java
@@ -26,7 +26,7 @@
 import org.envirocar.core.exception.TermsOfUseException;
 import org.envirocar.core.logging.Logger;
 
-import io.reactivex.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableEmitter;
 
 /**
  * @author dewall
diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactiveTermsOfUseDialog.java b/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactiveTermsOfUseDialog.java
index 2cddba686..33eab7136 100644
--- a/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactiveTermsOfUseDialog.java
+++ b/org.envirocar.core/src/main/java/org/envirocar/core/utils/rx/dialogs/ReactiveTermsOfUseDialog.java
@@ -27,7 +27,7 @@
 import org.envirocar.core.exception.TermsOfUseException;
 import org.envirocar.core.logging.Logger;
 
-import io.reactivex.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableEmitter;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java
index 40485eaaf..d84d57f1d 100644
--- a/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java
+++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java
@@ -48,10 +48,10 @@
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**
diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDSchedulers.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDSchedulers.java
index f83a4aa5a..74b53be47 100644
--- a/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDSchedulers.java
+++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDSchedulers.java
@@ -20,8 +20,8 @@
 
 import java.util.concurrent.Executors;
 
-import io.reactivex.Scheduler;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class OBDSchedulers {
 
diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/CommandExecutor.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/CommandExecutor.java
index 198c28078..7891f8fe8 100644
--- a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/CommandExecutor.java
+++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/CommandExecutor.java
@@ -31,9 +31,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 
 public class CommandExecutor {
 
diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/ELM327Adapter.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/ELM327Adapter.java
index 967951c72..6f073549d 100644
--- a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/ELM327Adapter.java
+++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/ELM327Adapter.java
@@ -34,7 +34,7 @@
 import java.util.List;
 import java.util.Queue;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/OBDAdapter.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/OBDAdapter.java
index 09be94e29..b46b3d6ac 100644
--- a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/OBDAdapter.java
+++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/OBDAdapter.java
@@ -23,7 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/SyncAdapter.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/SyncAdapter.java
index d02aaa616..7bf6e1666 100644
--- a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/SyncAdapter.java
+++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/SyncAdapter.java
@@ -52,7 +52,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 public abstract class SyncAdapter implements OBDAdapter {
diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/async/AsyncAdapter.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/async/AsyncAdapter.java
index c391305f2..e2de4fb3a 100644
--- a/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/async/AsyncAdapter.java
+++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/adapter/async/AsyncAdapter.java
@@ -40,9 +40,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 
 
 /**
diff --git a/org.envirocar.remote/build.gradle b/org.envirocar.remote/build.gradle
index b44957108..7ad646ece 100644
--- a/org.envirocar.remote/build.gradle
+++ b/org.envirocar.remote/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     api rootProject.ext.retrofit2
     api rootProject.ext.retrofitGson2
     api rootProject.ext.retrofitAdapters2
-    api rootProject.ext.retrofitRxJava2
+    api rootProject.ext.retrofitRxJava3
 
     // third party
     implementation rootProject.ext.apacheCommons
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/BaseRemoteDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/BaseRemoteDAO.java
index 2e17db73c..d70605936 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/BaseRemoteDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/BaseRemoteDAO.java
@@ -28,7 +28,7 @@
 
 import java.io.IOException;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Response;
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheAnnouncementsDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheAnnouncementsDAO.java
index a9ab2a876..75ac08cc5 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheAnnouncementsDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheAnnouncementsDAO.java
@@ -26,7 +26,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheCarDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheCarDAO.java
index 523c913fa..a2771a55f 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheCarDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheCarDAO.java
@@ -28,7 +28,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheFuelingDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheFuelingDAO.java
index ca4ee3219..656422f3f 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheFuelingDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheFuelingDAO.java
@@ -35,7 +35,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CachePrivacyStatementDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CachePrivacyStatementDAO.java
index ac44b38ef..24926ac13 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CachePrivacyStatementDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CachePrivacyStatementDAO.java
@@ -28,7 +28,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTermsOfUseDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTermsOfUseDAO.java
index 5c5d8ab29..f6962e7a3 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTermsOfUseDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTermsOfUseDAO.java
@@ -27,7 +27,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 public class CacheTermsOfUseDAO extends AbstractCacheDAO implements TermsOfUseRepository {
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTrackDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTrackDAO.java
index d05b44e75..69fe40f60 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTrackDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheTrackDAO.java
@@ -28,7 +28,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheUserDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheUserDAO.java
index 8ca81c7b0..add7870bd 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheUserDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/CacheUserDAO.java
@@ -28,7 +28,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * @author dewall
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteAnnouncementsDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteAnnouncementsDAO.java
index 16088295e..67351b18c 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteAnnouncementsDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteAnnouncementsDAO.java
@@ -33,7 +33,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 import retrofit2.Response;
 
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteCarDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteCarDAO.java
index e953554ce..334fc7932 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteCarDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteCarDAO.java
@@ -37,7 +37,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 import retrofit2.Response;
 
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteFuelingDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteFuelingDAO.java
index 569be9756..28c54125b 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteFuelingDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteFuelingDAO.java
@@ -34,7 +34,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Response;
 
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemotePrivacyStatementDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemotePrivacyStatementDAO.java
index f9c2efda5..159873564 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemotePrivacyStatementDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemotePrivacyStatementDAO.java
@@ -29,7 +29,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTermsOfUseDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTermsOfUseDAO.java
index f6fae5a20..ddd7e5bd1 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTermsOfUseDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTermsOfUseDAO.java
@@ -30,7 +30,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTrackDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTrackDAO.java
index 5340fde36..e94cc8d71 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTrackDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteTrackDAO.java
@@ -39,7 +39,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Response;
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserDAO.java
index 9960d5da3..e1e7602c2 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserDAO.java
@@ -36,7 +36,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Response;
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserStatisticsDAO.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserStatisticsDAO.java
index 9d91dce2f..f2a9348b4 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserStatisticsDAO.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/dao/RemoteUserStatisticsDAO.java
@@ -33,7 +33,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 import retrofit2.Response;
 
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/injection/modules/RetrofitModule.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/injection/modules/RetrofitModule.java
index 723948247..6afc2b4c6 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/injection/modules/RetrofitModule.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/injection/modules/RetrofitModule.java
@@ -35,7 +35,7 @@
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
@@ -53,7 +53,7 @@ protected Retrofit provideRetrofit(HttpUrl baseUrl, OkHttpClient client, Gson gs
                 .client(client)
                 .baseUrl(baseUrl)
                 .addConverterFactory(GsonConverterFactory.create(gson))
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .build();
     }
 
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemotePrivacyStatementRepository.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemotePrivacyStatementRepository.java
index 5de921706..a4a11ccbb 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemotePrivacyStatementRepository.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemotePrivacyStatementRepository.java
@@ -30,7 +30,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteRepository.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteRepository.java
index 73780266a..d8ca3f6e2 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteRepository.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteRepository.java
@@ -28,7 +28,7 @@
 
 import java.io.IOException;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Response;
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteTermsOfUseRepository.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteTermsOfUseRepository.java
index 0396d2708..dbdf97f27 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteTermsOfUseRepository.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteTermsOfUseRepository.java
@@ -30,7 +30,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteUserStatisticRepository.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteUserStatisticRepository.java
index d17b33de8..89035b2e8 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteUserStatisticRepository.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/repository/RemoteUserStatisticRepository.java
@@ -26,7 +26,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 
 /**
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/AnnouncementsService.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/AnnouncementsService.java
index 58fbab9da..136e0a05f 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/AnnouncementsService.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/AnnouncementsService.java
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 import retrofit2.http.GET;
 
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/CarService.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/CarService.java
index d80dfb083..b828b0e35 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/CarService.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/CarService.java
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/FuelingService.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/FuelingService.java
index 319b3a382..920a65c8f 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/FuelingService.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/FuelingService.java
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.http.Body;
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/TrackService.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/TrackService.java
index 9d915a233..b6fbdfc75 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/TrackService.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/TrackService.java
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.http.Body;
diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/UserService.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/UserService.java
index 5179016c0..20812b559 100644
--- a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/UserService.java
+++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/UserService.java
@@ -24,7 +24,7 @@
 import org.envirocar.core.entity.UserStatistics;
 import org.envirocar.remote.requests.CreateUserRequest;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.http.Body;
diff --git a/org.envirocar.storage/src/main/java/org/envirocar/storage/DatabaseModule.java b/org.envirocar.storage/src/main/java/org/envirocar/storage/DatabaseModule.java
index 074fb3b10..373031289 100644
--- a/org.envirocar.storage/src/main/java/org/envirocar/storage/DatabaseModule.java
+++ b/org.envirocar.storage/src/main/java/org/envirocar/storage/DatabaseModule.java
@@ -47,7 +47,7 @@
 
 import dagger.Module;
 import dagger.Provides;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * TODO JavaDoc
diff --git a/org.envirocar.storage/src/main/java/org/envirocar/storage/EnviroCarDBImpl.java b/org.envirocar.storage/src/main/java/org/envirocar/storage/EnviroCarDBImpl.java
index ae80eba01..9440a472a 100644
--- a/org.envirocar.storage/src/main/java/org/envirocar/storage/EnviroCarDBImpl.java
+++ b/org.envirocar.storage/src/main/java/org/envirocar/storage/EnviroCarDBImpl.java
@@ -38,9 +38,9 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableTransformer;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableTransformer;
+import io.reactivex.rxjava3.functions.Function;
 
 
 @Singleton
@@ -251,7 +251,7 @@ public void updateTrackMetadata(final Track track, final TrackMetadata trackMeta
         }
     }
 
-    public Observable<TrackMetadata> updateTrackMetadataObservable(
+    public Observable updateTrackMetadataObservable(
             final Track track, final TrackMetadata trackMetadata) {
         return Observable.create(emitter -> {
             try {
diff --git a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalManufacturersDAO.java b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalManufacturersDAO.java
index 6148d5db1..5ea984510 100644
--- a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalManufacturersDAO.java
+++ b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalManufacturersDAO.java
@@ -25,7 +25,8 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 import io.reactivex.Single;
 
 
diff --git a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalPowerSourcesDAO.java b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalPowerSourcesDAO.java
index 45de57149..1cd8c4e3d 100644
--- a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalPowerSourcesDAO.java
+++ b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalPowerSourcesDAO.java
@@ -25,7 +25,8 @@
 
 import java.util.List;
 
-import io.reactivex.Single;
+
+import io.reactivex.rxjava3.core.Single;
 
 
 @Dao
diff --git a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalTrackDAONew.java b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalTrackDAONew.java
index 56400a37d..16b6520b4 100644
--- a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalTrackDAONew.java
+++ b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalTrackDAONew.java
@@ -32,7 +32,8 @@
 import java.util.List;
 
 import io.reactivex.Flowable;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+
 
 @Dao
 public interface LocalTrackDAONew {
diff --git a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalVehicleDAO.java b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalVehicleDAO.java
index df13f86c8..20f74ddbb 100644
--- a/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalVehicleDAO.java
+++ b/org.envirocar.storage/src/main/java/org/envirocar/storage/dao/LocalVehicleDAO.java
@@ -25,8 +25,8 @@
 
 import java.util.List;
 
-import io.reactivex.Observable;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
 
 @Dao
 public interface LocalVehicleDAO extends BaseLocalCarDAO<Vehicles> {