diff --git a/.github/workflows/nightly_enterprise.yml b/.github/workflows/nightly_enterprise.yml
index 9cd80fe094..d1d77b45f5 100644
--- a/.github/workflows/nightly_enterprise.yml
+++ b/.github/workflows/nightly_enterprise.yml
@@ -28,15 +28,6 @@ jobs:
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
-      - name: Install towncrier
-        run: |
-          python3 -m pip install towncrier
-      - name: Prepare changelog file
-        run: |
-          mv towncrier.toml towncrier.toml.bak
-          sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
-          rm towncrier.toml.bak
-          yes n | towncrier build --version nightly
       - name: Build and upload Nightly application
         run: |
           ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
diff --git a/.idea/copyright/Enterprise.xml b/.idea/copyright/Element_Enterprise.xml
similarity index 92%
rename from .idea/copyright/Enterprise.xml
rename to .idea/copyright/Element_Enterprise.xml
index 2d430b4613..e8c3019732 100644
--- a/.idea/copyright/Enterprise.xml
+++ b/.idea/copyright/Element_Enterprise.xml
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
     <option name="notice" value="© &amp;#36;today.year New Vector Limited, Element Software SARL, Element Software Inc.,&#10;and Element Software GmbH (the &quot;Element Group&quot;) only make this file available&#10;under a proprietary license model.&#10;&#10;Without a proprietary license with us, you cannot use this file. The terms of&#10;the proprietary license agreement between you and any member of the Element Group&#10;shall always apply to your use of this file. Unauthorised use, copying, distribution,&#10;or modification of this file, via any medium, is strictly prohibited.&#10;&#10;For details about the licensing terms, you must either visit our website or contact&#10;a member of our sales team." />
-    <option name="myName" value="Enterprise" />
+    <option name="myName" value="Element Enterprise" />
   </copyright>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index 69d52afca4..2e68dd339f 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,7 +1,7 @@
 <component name="CopyrightManager">
   <settings default="Element FOSS">
     <module2copyright>
-      <element module="Enterprise" copyright="Enterprise" />
+      <element module="Enterprise" copyright="Element Enterprise" />
     </module2copyright>
   </settings>
 </component>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7bc3504d84..af70c6ae39 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -153,10 +153,18 @@ android {
                 // artifactType = "AAB"
                 // artifactPath = "$rootDir/app/build/outputs/bundle/nightly/app-nightly.aab"
                 releaseNotesFile = "tools/release/ReleaseNotesNightly.md"
-                groups = "external-testers"
+                groups = if (isEnterpriseBuild) {
+                    "enterprise-testers"
+                } else {
+                    "external-testers"
+                }
                 // This should not be required, but if I do not add the appId, I get this error:
                 // "App Distribution halted because it had a problem uploading the APK: [404] Requested entity was not found."
-                appId = "1:912726360885:android:e17435e0beb0303000427c"
+                appId = if (isEnterpriseBuild) {
+                    "1:912726360885:android:3f7e1fe644d99d5a00427c"
+                } else {
+                    "1:912726360885:android:e17435e0beb0303000427c"
+                }
             }
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3872a18fd..49da0a2b22 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,11 +40,9 @@
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
             android:exported="false">
-
             <meta-data
                 android:name='androidx.lifecycle.ProcessLifecycleInitializer'
                 android:value='androidx.startup' />
-
         </provider>
 
         <activity
@@ -146,12 +144,6 @@
             </intent-filter>
         </activity-alias>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="remove" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
diff --git a/docs/nightly_build.md b/docs/nightly_build.md
index 9fa9ea9bb6..3a3345d662 100644
--- a/docs/nightly_build.md
+++ b/docs/nightly_build.md
@@ -42,7 +42,7 @@ Then you can run the following commands (which are also used in the file for [th
 
 ```sh
 git checkout develop
-./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
+./gradlew assembleGplayNightly appDistributionUploadGplayNightly
 ```
 
 Then you can reset the change on the codebase.
diff --git a/libraries/pushproviders/firebase/README.md b/libraries/pushproviders/firebase/README.md
index 204ac6dd19..a2a7ad97ed 100644
--- a/libraries/pushproviders/firebase/README.md
+++ b/libraries/pushproviders/firebase/README.md
@@ -4,4 +4,4 @@
 
 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.
+To be able to change the values set to `google_app_id` in the file `build.gradle.kts` of 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 `build.gradle.kts` files.
diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts
index d1c9f62ef0..28b58b1faa 100644
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
@@ -22,9 +25,43 @@ android {
     namespace = "io.element.android.libraries.pushproviders.firebase"
 
     buildTypes {
-        release {
+        getByName("release") {
             isMinifyEnabled = true
             consumerProguardFiles("consumer-proguard-rules.pro")
+            resValue(
+                type = "string",
+                name = "google_app_id",
+                value = if (isEnterpriseBuild) {
+                    "1:912726360885:android:d273c2077ec3291500427c"
+                } else {
+                    "1:912726360885:android:d097de99a4c23d2700427c"
+                }
+            )
+        }
+        getByName("debug") {
+            resValue(
+                type = "string",
+                name = "google_app_id",
+                value = if (isEnterpriseBuild) {
+                    "1:912726360885:android:f8de9126a94143d300427c"
+                } else {
+                    "1:912726360885:android:def0a4e454042e9b00427c"
+                }
+            )
+        }
+        register("nightly") {
+            isMinifyEnabled = true
+            consumerProguardFiles("consumer-proguard-rules.pro")
+            matchingFallbacks += listOf("release")
+            resValue(
+                type = "string",
+                name = "google_app_id",
+                value = if (isEnterpriseBuild) {
+                    "1:912726360885:android:3f7e1fe644d99d5a00427c"
+                } else {
+                    "1:912726360885:android:e17435e0beb0303000427c"
+                }
+            )
         }
     }
 }
diff --git a/libraries/pushproviders/firebase/src/debug/res/values/firebase.xml b/libraries/pushproviders/firebase/src/debug/res/values/firebase.xml
deleted file mode 100644
index 540f0e9bbe..0000000000
--- a/libraries/pushproviders/firebase/src/debug/res/values/firebase.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/nightly/res/values/firebase.xml b/libraries/pushproviders/firebase/src/nightly/res/values/firebase.xml
deleted file mode 100644
index f793ba93f9..0000000000
--- a/libraries/pushproviders/firebase/src/nightly/res/values/firebase.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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
deleted file mode 100644
index d563b43d05..0000000000
--- a/libraries/pushproviders/firebase/src/release/res/values/firebase.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="google_app_id" translatable="false">1:912726360885:android:d097de99a4c23d2700427c</string>
-</resources>
diff --git a/tools/release/ReleaseNotesNightly.md b/tools/release/ReleaseNotesNightly.md
index 02f7641646..0c1a2e5393 100644
--- a/tools/release/ReleaseNotesNightly.md
+++ b/tools/release/ReleaseNotesNightly.md
@@ -1,5 +1,3 @@
-# Element X Android nightly build
-
 See which PRs have been merged recently here:
 
 https://github.com/element-hq/element-x-android/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Aclosed