diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index 4603f481..a0309031 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -40,7 +40,7 @@ ApplicationWindow {
         property string graphStyle: "bars"
         property string style: "light"
         property bool showHiddenOptions: false
-        property string cloudEnvironment: "community"
+        property string cloudEnvironment: "Community"
         property bool showConnectionTabs: false
         property int tabCount: 1
     }
diff --git a/packaging/android/build.gradle b/packaging/android/build.gradle
index 7fbd9137..7c7c793a 100644
--- a/packaging/android/build.gradle
+++ b/packaging/android/build.gradle
@@ -28,8 +28,7 @@ apply plugin: 'com.android.application'
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.google.android.gms:play-services-base:15.0.1'
-    compile 'com.google.firebase:firebase-core:16.0.1'
-    compile 'com.google.firebase:firebase-messaging:17.3.0'
+    compile 'com.google.firebase:firebase-messaging:18.0.0'
     compile 'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar'
 }