diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 16ebbe5e..3e3bd5cb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,10 +8,12 @@ plugins {
     alias(libs.plugins.kotlinParcelize)
     alias(libs.plugins.kotlinKapt)
     alias(libs.plugins.ksp)
+    id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
 }
 
 android {
-    namespace = "com.twofasapp"
+    namespace = "at.anexia"
 
     defaultConfig {
         applicationId = "at.anexia.authenticator"
diff --git a/app/google-services.json b/app/google-services.json
new file mode 100644
index 00000000..2f56effa
--- /dev/null
+++ b/app/google-services.json
@@ -0,0 +1,48 @@
+{
+  "project_info": {
+    "project_number": "657102836550",
+    "firebase_url": "https://anexia-authenticator.firebaseio.com",
+    "project_id": "anexia-authenticator",
+    "storage_bucket": "anexia-authenticator.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:657102836550:android:c9cac23552969ace",
+        "android_client_info": {
+          "package_name": "at.anexia.authenticator"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "657102836550-o61kdidhndmkg6bq3g69hpt3eub75bjv.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "at.anexia.authenticator",
+            "certificate_hash": "1f38c2c5ac3245599fbe5e7c91dff0f1c69ce3b8"
+          }
+        },
+        {
+          "client_id": "657102836550-3lm99dicqd8d66ksrfom7i506v2dlvnf.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD__lK86WTn4nzrv4NTwO2bAG2GxG5QVME"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "657102836550-3lm99dicqd8d66ksrfom7i506v2dlvnf.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b93e08c3..b31cb387 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.twofasapp">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -52,7 +51,7 @@
         </provider>
 
         <service
-            android:name=".data.push.FcmMessagingService"
+            android:name="com.twofasapp.data.push.FcmMessagingService"
             android:exported="false"
             android:stopWithTask="false">
             <intent-filter>
@@ -79,7 +78,7 @@
         </service>
 
         <receiver
-            android:name=".widgets.WidgetProvider"
+            android:name="com.twofasapp.widgets.WidgetProvider"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -95,7 +94,7 @@
 
         <!-- ACTIVITIES -->
         <activity
-            android:name=".ui.main.StartActivity"
+            android:name="com.twofasapp.ui.main.StartActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:noHistory="false"
@@ -139,7 +138,7 @@
         </activity>
 
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name="com.twofasapp.ui.main.MainActivity"
             android:label="Add service by scanning QR Code"
             android:launchMode="singleTask" />
 
diff --git a/app/src/main/java/com/twofasapp/App.kt b/app/src/main/java/com/twofasapp/App.kt
index 7a4b8705..9fb20c12 100644
--- a/app/src/main/java/com/twofasapp/App.kt
+++ b/app/src/main/java/com/twofasapp/App.kt
@@ -4,6 +4,7 @@ import android.app.Application
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
+import at.anexia.BuildConfig
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.twofasapp.base.AuthTracker
 import com.twofasapp.data.services.domain.CloudSyncTrigger
@@ -62,7 +63,7 @@ class App : Application() {
 
         cloudSyncWorkDispatcher.tryDispatch(CloudSyncTrigger.AppStart)
 
-        // FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(sendCrashLogsPreference.get())
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(sendCrashLogsPreference.get())
 
         try {
             SQLiteDatabase.loadLibs(this)
diff --git a/app/src/main/java/com/twofasapp/environment/AppBuildImpl.kt b/app/src/main/java/com/twofasapp/environment/AppBuildImpl.kt
index 6e5e8378..7e054a76 100644
--- a/app/src/main/java/com/twofasapp/environment/AppBuildImpl.kt
+++ b/app/src/main/java/com/twofasapp/environment/AppBuildImpl.kt
@@ -1,6 +1,6 @@
 package com.twofasapp.environment
 
-import com.twofasapp.BuildConfig
+import at.anexia.BuildConfig
 import com.twofasapp.common.environment.AppBuild
 import com.twofasapp.common.environment.BuildVariant
 import com.twofasapp.common.environment.BuildVariant.Debug
diff --git a/build.gradle.kts b/build.gradle.kts
index e593c280..a0afb3a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,6 +2,8 @@ buildscript {
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
         classpath("org.jetbrains.kotlin:kotlin-serialization:${libs.versions.kotlin.get()}")
+        classpath("com.google.gms:google-services:4.4.0")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
     }
 }
 
diff --git a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt
index e99c7414..edf52dcf 100644
--- a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt
+++ b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt
@@ -12,7 +12,7 @@ internal fun Project.applyBuildTypes(
                 isMinifyEnabled = false
                 isDebuggable = true
                 signingConfig = signingConfigs.getByName("debug")
-                applicationIdSuffix = ".debug"
+                // applicationIdSuffix = ".debug"
             }
             /*
             create("releaseLocal") {