diff --git a/vector-app/src/gplay/AndroidManifest.xml b/vector-app/src/gplay/AndroidManifest.xml
index a5f0eae6be..3aa6fbcb2b 100755
--- a/vector-app/src/gplay/AndroidManifest.xml
+++ b/vector-app/src/gplay/AndroidManifest.xml
@@ -8,18 +8,12 @@
             android:name="firebase_analytics_collection_deactivated"
             android:value="true" />
 
-        <receiver
-            android:name="im.vector.app.push.fcm.EmbeddedFCMDistributor"
-            android:enabled="true"
-            android:exported="false">
-
+        <service android:name="im.vector.app.push.fcm.FirebaseReceiver"
+            android:exported="false" >
             <intent-filter>
-                <action android:name="org.unifiedpush.android.distributor.REGISTER" />
-                <action android:name="org.unifiedpush.android.distributor.UNREGISTER" />
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
-
-        </receiver>
-
+        </service>
     </application>
 
 </manifest>
diff --git a/vector/build.gradle b/vector/build.gradle
index 65adc7089c..a5538053fc 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -257,7 +257,7 @@ dependencies {
     // UnifiedPush
     implementation 'com.github.UnifiedPush:android-connector:2.0.1'
     // UnifiedPush gplay flavor only
-    gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.3') {
+    gplayImplementation('com.google.firebase:firebase-messaging:23.0.8') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector/src/fdroid/AndroidManifest.xml
index 29dac6533e..15db89ca13 100644
--- a/vector/src/fdroid/AndroidManifest.xml
+++ b/vector/src/fdroid/AndroidManifest.xml
@@ -28,20 +28,6 @@
             android:enabled="true"
             android:exported="false" />
 
-        <receiver
-            android:name=".fdroid.receiver.KeepInternalDistributor"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <!--
-                This action is checked to track installed and uninstalled distributors.
-                We declare it to keep the background sync as an internal
-                unifiedpush distributor.
-                -->
-                <action android:name="org.unifiedpush.android.distributor.REGISTER" />
-            </intent-filter>
-        </receiver>
-
         <service
             android:name=".fdroid.service.GuardAndroidService"
             android:exported="false"
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedFCMDistributor.kt b/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedFCMDistributor.kt
deleted file mode 100644
index 14600ccbb3..0000000000
--- a/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedFCMDistributor.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.push.fcm
-
-import android.content.Context
-import org.unifiedpush.android.embedded_fcm_distributor.EmbeddedDistributorReceiver
-
-class EmbeddedFCMDistributor : EmbeddedDistributorReceiver() {
-    override fun getEndpoint(context: Context, token: String, instance: String): String {
-        // Here token is the FCM Token, used by the gateway (sygnal)
-        return token
-    }
-}
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/FirebaseReceiver.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FirebaseReceiver.kt
new file mode 100644
index 0000000000..eb983fc8c5
--- /dev/null
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/FirebaseReceiver.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.push.fcm
+
+import android.content.Intent
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.FcmHelper
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.features.settings.VectorPreferences
+import org.json.JSONObject
+import org.unifiedpush.android.connector.ACTION_MESSAGE
+import org.unifiedpush.android.connector.EXTRA_BYTES_MESSAGE
+import org.unifiedpush.android.connector.EXTRA_TOKEN
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class FirebaseReceiver : FirebaseMessagingService() {
+    @Inject lateinit var fcmHelper: FcmHelper
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var pushersManager: PushersManager
+
+    override fun onNewToken(token: String) {
+        Timber.d("New Firebase token")
+        fcmHelper.storeFcmToken(token)
+        if (vectorPreferences.areNotificationEnabledForDevice() && activeSessionHolder.hasActiveSession()) {
+            pushersManager.enqueueRegisterPusher(token, getString(R.string.default_push_gateway_http_url))
+        }
+    }
+
+    override fun onMessageReceived(message: RemoteMessage) {
+        Timber.d("New Firebase message")
+        val intent = Intent()
+        intent.action = ACTION_MESSAGE
+        intent.setPackage(baseContext.packageName)
+        intent.putExtra(EXTRA_BYTES_MESSAGE, JSONObject(message.data as Map<*, *>).toString().toByteArray())
+        intent.putExtra(EXTRA_TOKEN, fcmHelper.getFcmToken())
+        baseContext.sendBroadcast(intent)
+    }
+}
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index c4022576c3..29eef172ae 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -423,6 +423,20 @@
                 <action android:name="org.unifiedpush.android.connector.REGISTRATION_REFUSED" />
             </intent-filter>
         </receiver>
+
+        <receiver
+            android:name=".core.pushers.KeepInternalDistributor"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <!--
+                This action is checked to track installed and uninstalled distributors.
+                We declare it to keep the background sync as an internal
+                unifiedpush distributor.
+                -->
+                <action android:name="org.unifiedpush.android.distributor.REGISTER" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt b/vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
similarity index 96%
rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
rename to vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
index 3feee8c63b..63725f01a3 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.fdroid.receiver
+package im.vector.app.core.pushers
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt b/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
index 8e88e44627..ec7cb50732 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
@@ -46,6 +46,8 @@ import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
+import org.unifiedpush.android.connector.EXTRA_BYTES_MESSAGE
+import org.unifiedpush.android.connector.EXTRA_TOKEN
 import org.unifiedpush.android.connector.MessagingReceiver
 import timber.log.Timber
 import javax.inject.Inject
@@ -60,6 +62,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
     @Inject lateinit var notifiableEventResolver: NotifiableEventResolver
     @Inject lateinit var pushersManager: PushersManager
+    @Inject lateinit var fcmHelper: FcmHelper
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var vectorPreferences: VectorPreferences
     @Inject lateinit var vectorDataStore: VectorDataStore
@@ -166,6 +169,19 @@ class VectorMessagingReceiver : MessagingReceiver() {
         }
     }
 
+    override fun onReceive(context: Context, intent: Intent) {
+        // Injections happens here
+        super.onReceive(context, intent)
+
+        // if it is from FirebaseReceiver, then the token has been rejected
+        if (unifiedPushHelper.isEmbeddedDistributor()
+                && intent.getStringExtra(EXTRA_TOKEN) == fcmHelper.getFcmToken()) {
+            intent.getByteArrayExtra(EXTRA_BYTES_MESSAGE)?.let {
+                onMessage(context, it, "")
+            }
+        }
+    }
+
     /**
      * Internal receive method.
      *