diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 74ebfa89d4..772609f482 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -33,8 +33,8 @@ plugins {
     id("com.google.firebase.appdistribution") version "4.0.0"
     id("org.jetbrains.kotlinx.knit") version "0.4.0"
     id("kotlin-parcelize")
-    // TODO Move the plugin to the firebase module?
-    id("com.google.gms.google-services")
+    // To be able to update the firebase.xml files, uncomment and build the project
+    // id("com.google.gms.google-services")
 }
 
 android {
diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json
deleted file mode 100644
index d9aa72f7ba..0000000000
--- a/app/src/debug/google-services.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "project_info": {
-    "project_number": "912726360885",
-    "firebase_url": "https://vector-alpha.firebaseio.com",
-    "project_id": "vector-alpha",
-    "storage_bucket": "vector-alpha.appspot.com"
-  },
-
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:def0a4e454042e9b00427c",
-        "android_client_info": {
-          "package_name": "io.element.android.x.debug"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-hvgoj23p6plt7hikhtdrakihojghaftv.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "io.element.android.x.debug",
-            "certificate_hash": "41bd63b3b612a15d9ba36a5245c393f2a9b992d1"
-          }
-        },
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
diff --git a/app/src/nightly/google-services.json b/app/src/nightly/google-services.json
deleted file mode 100644
index 31b022b3f2..0000000000
--- a/app/src/nightly/google-services.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "912726360885",
-    "firebase_url": "https://vector-alpha.firebaseio.com",
-    "project_id": "vector-alpha",
-    "storage_bucket": "vector-alpha.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:e17435e0beb0303000427c",
-        "android_client_info": {
-          "package_name": "io.element.android.x.nightly"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
diff --git a/app/src/release/google-services.json b/app/src/release/google-services.json
deleted file mode 100644
index 16fd1e855c..0000000000
--- a/app/src/release/google-services.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "912726360885",
-    "firebase_url": "https://vector-alpha.firebaseio.com",
-    "project_id": "vector-alpha",
-    "storage_bucket": "vector-alpha.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:d097de99a4c23d2700427c",
-        "android_client_info": {
-          "package_name": "io.element.android.x"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
diff --git a/libraries/pushproviders/firebase/README.md b/libraries/pushproviders/firebase/README.md
new file mode 100644
index 0000000000..204ac6dd19
--- /dev/null
+++ b/libraries/pushproviders/firebase/README.md
@@ -0,0 +1,7 @@
+# Firebase
+
+## Configuration
+
+In order to make this module only know about Firebase, the plugin `com.google.gms.google-services` has been disabled from the `app` module.
+
+To be able to change the values in the file `firebase.xml` from this module, you should enable the plugin `com.google.gms.google-services` again, copy the file `google-services.json` to the folder `/app/src/main`, build the project, and check the generated file `app/build/generated/res/google-services/<buildtype>/values/values.xml` to import the generated values into the `firebase.xml` files.
diff --git a/libraries/pushproviders/firebase/src/debug/res/values/firebase.xml b/libraries/pushproviders/firebase/src/debug/res/values/firebase.xml
new file mode 100644
index 0000000000..540f0e9bbe
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/debug/res/values/firebase.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="google_app_id" translatable="false">1:912726360885:android:def0a4e454042e9b00427c</string>
+</resources>
diff --git a/libraries/pushproviders/firebase/src/main/res/values/firebase.xml b/libraries/pushproviders/firebase/src/main/res/values/firebase.xml
new file mode 100644
index 0000000000..163717db91
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/res/values/firebase.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="default_web_client_id" translatable="false">912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com</string>
+    <string name="firebase_database_url" translatable="false">https://vector-alpha.firebaseio.com</string>
+    <string name="gcm_defaultSenderId" translatable="false">912726360885</string>
+    <string name="google_api_key" translatable="false">AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c</string>
+    <string name="google_crash_reporting_api_key" translatable="false">AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c</string>
+    <string name="google_storage_bucket" translatable="false">vector-alpha.appspot.com</string>
+    <string name="project_id" translatable="false">vector-alpha</string>
+</resources>
diff --git a/libraries/pushproviders/firebase/src/nightly/res/values/firebase.xml b/libraries/pushproviders/firebase/src/nightly/res/values/firebase.xml
new file mode 100644
index 0000000000..f793ba93f9
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/nightly/res/values/firebase.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="google_app_id" translatable="false">1:912726360885:android:e17435e0beb0303000427c</string>
+</resources>
diff --git a/libraries/pushproviders/firebase/src/release/res/values/firebase.xml b/libraries/pushproviders/firebase/src/release/res/values/firebase.xml
new file mode 100644
index 0000000000..d563b43d05
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/release/res/values/firebase.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="google_app_id" translatable="false">1:912726360885:android:d097de99a4c23d2700427c</string>
+</resources>