diff --git a/lib/utils/firebase_controller.dart b/lib/utils/firebase_controller.dart
index 06a8a339..9c779eb9 100644
--- a/lib/utils/firebase_controller.dart
+++ b/lib/utils/firebase_controller.dart
@@ -28,7 +28,7 @@ abstract class FirebaseController {
   static const String CHANNEL_ID = 'fluffychat_push';
   static const String CHANNEL_NAME = 'FluffyChat push channel';
   static const String CHANNEL_DESCRIPTION = 'Push notifications for FluffyChat';
-  static const String APP_ID = 'chat.fluffy.fluffychat.experimental';
+  static const String APP_ID = 'chat.fluffy.fluffychat';
   static const String GATEWAY_URL = 'https://janian.de:7023/';
   static const String PUSHER_FORMAT = 'event_id_only';
 
diff --git a/pubspec.lock b/pubspec.lock
index 70124e8b..2f5ea2e2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -286,12 +286,10 @@ packages:
   firebase_messaging:
     dependency: "direct main"
     description:
-      path: "packages/firebase_messaging"
-      ref: master
-      resolved-ref: f60943a60a6a09b5afce2b7dfe04a8c094037a32
-      url: "git@gitlab.com:famedly/libraries/flutterfire.git"
-    source: git
-    version: "7.0.2"
+      name: firebase_messaging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.0.3"
   flushbar:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 822a2e76..39229a52 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,11 +20,7 @@ dependencies:
   image_picker: ^0.6.7+14
   url_launcher: ^5.7.10
   cached_network_image: ^2.3.3
-  firebase_messaging:
-    git:
-      url: git@gitlab.com:famedly/libraries/flutterfire.git
-      path: packages/firebase_messaging
-      ref: master
+  firebase_messaging: ^7.0.3
   flutter_local_notifications: ^3.0.1+6
   # desktop_notifications: ^0.0.0-dev.4  // Currently blocked by: https://github.com/canonical/desktop_notifications.dart/issues/5
   matrix_link_text: ^0.3.2