diff --git a/app-common/src/main/AndroidManifest.xml b/app-common/src/main/AndroidManifest.xml
index 6fee1ef2..bd8af2b8 100644
--- a/app-common/src/main/AndroidManifest.xml
+++ b/app-common/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="eu.darken.capod">
+<manifest package="eu.darken.capod.common">
 
 </manifest>
\ No newline at end of file
diff --git a/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt b/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt
index 35d2a414..729a45fc 100644
--- a/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt
+++ b/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt
@@ -1,7 +1,5 @@
 package eu.darken.capod.common
 
-import eu.darken.capod.BuildConfig
-
 
 // Can't be const because that prevents them from being mocked in tests
 @Suppress("MayBeConstant")
diff --git a/app-common/src/main/java/eu/darken/capod/common/bluetooth/ScannerMode.kt b/app-common/src/main/java/eu/darken/capod/common/bluetooth/ScannerMode.kt
index 494755f7..18fc8a26 100644
--- a/app-common/src/main/java/eu/darken/capod/common/bluetooth/ScannerMode.kt
+++ b/app-common/src/main/java/eu/darken/capod/common/bluetooth/ScannerMode.kt
@@ -3,7 +3,7 @@ package eu.darken.capod.common.bluetooth
 import androidx.annotation.StringRes
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 
 @JsonClass(generateAdapter = false)
 enum class ScannerMode(
diff --git a/app-common/src/main/java/eu/darken/capod/common/error/LocalizedError.kt b/app-common/src/main/java/eu/darken/capod/common/error/LocalizedError.kt
index 66dbb752..32cfe582 100644
--- a/app-common/src/main/java/eu/darken/capod/common/error/LocalizedError.kt
+++ b/app-common/src/main/java/eu/darken/capod/common/error/LocalizedError.kt
@@ -1,7 +1,7 @@
 package eu.darken.capod.common.error
 
 import android.content.Context
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 
 interface HasLocalizedError {
     fun getLocalizedError(context: Context): LocalizedError
diff --git a/app-common/src/main/java/eu/darken/capod/common/permissions/Permission.kt b/app-common/src/main/java/eu/darken/capod/common/permissions/Permission.kt
index 12acdbdf..2a02630a 100644
--- a/app-common/src/main/java/eu/darken/capod/common/permissions/Permission.kt
+++ b/app-common/src/main/java/eu/darken/capod/common/permissions/Permission.kt
@@ -6,8 +6,8 @@ import android.os.Build
 import android.os.PowerManager
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
-import eu.darken.capod.R
 import eu.darken.capod.common.BuildConfigWrap
+import eu.darken.capod.common.R
 import eu.darken.capod.common.withinApiLevel
 
 enum class Permission(
diff --git a/app-common/src/main/java/eu/darken/capod/main/core/MonitorMode.kt b/app-common/src/main/java/eu/darken/capod/main/core/MonitorMode.kt
index 2ee4fc9c..01cf8d31 100644
--- a/app-common/src/main/java/eu/darken/capod/main/core/MonitorMode.kt
+++ b/app-common/src/main/java/eu/darken/capod/main/core/MonitorMode.kt
@@ -3,7 +3,7 @@ package eu.darken.capod.main.core
 import androidx.annotation.StringRes
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 
 @JsonClass(generateAdapter = false)
 enum class MonitorMode(
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt b/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
index 75306b76..0f48d3f6 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.annotation.DrawableRes
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import java.time.Instant
 import java.util.*
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt b/app-common/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt
index 7d077203..1819a7d0 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt
@@ -3,7 +3,7 @@ package eu.darken.capod.pods.core
 import android.content.Context
 import android.icu.text.RelativeDateTimeFormatter
 import androidx.annotation.DrawableRes
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 import java.time.Duration
 import java.time.Instant
 import kotlin.math.roundToInt
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt b/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt
index b4ee6750..754f3c84 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt
@@ -2,7 +2,7 @@ package eu.darken.capod.pods.core.apple
 
 import android.content.Context
 import androidx.annotation.StringRes
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.isBitSet
 import eu.darken.capod.common.lowerNibble
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt b/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt
index 62c1de4f..d82048b2 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt
@@ -1,7 +1,7 @@
 package eu.darken.capod.pods.core.apple.misc
 
 import android.content.Context
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt b/app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
index ec64a41f..b3d5bc64 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
@@ -1,7 +1,7 @@
 package eu.darken.capod.pods.core.unknown
 
 import android.content.Context
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
diff --git a/app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt b/app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt
index 80ebd4c7..914e60be 100644
--- a/app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt
+++ b/app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt
@@ -3,7 +3,7 @@ package eu.darken.capod.reaction.core.autoconnect
 import androidx.annotation.StringRes
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import eu.darken.capod.R
+import eu.darken.capod.common.R
 
 @JsonClass(generateAdapter = false)
 enum class AutoConnectCondition(
diff --git a/app-wear/build.gradle.kts b/app-wear/build.gradle.kts
index b12c84af..c7f5f500 100644
--- a/app-wear/build.gradle.kts
+++ b/app-wear/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 apply(plugin = "dagger.hilt.android.plugin")
 apply(plugin = "androidx.navigation.safeargs.kotlin")
-apply(plugin = "com.bugsnag.android.gradle")
+//apply(plugin = "com.bugsnag.android.gradle")
 
 android {
     compileSdk = ProjectConfig.compileSdk
diff --git a/app-wear/src/main/AndroidManifest.xml b/app-wear/src/main/AndroidManifest.xml
index 1f66df9b..141ce457 100644
--- a/app-wear/src/main/AndroidManifest.xml
+++ b/app-wear/src/main/AndroidManifest.xml
@@ -59,6 +59,10 @@
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
+
+        <meta-data
+            android:name="com.bugsnag.android.API_KEY"
+            android:value="${bugsnagApiKey}" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/buildSrc/src/main/java/ProjectConfig.kt b/buildSrc/src/main/java/ProjectConfig.kt
index ebbdf550..30552722 100644
--- a/buildSrc/src/main/java/ProjectConfig.kt
+++ b/buildSrc/src/main/java/ProjectConfig.kt
@@ -118,5 +118,8 @@ fun getBugSnagApiKey(
         propertiesPath?.takeIf { it.canRead() }?.let { load(FileInputStream(it)) }
     }
 
-    return System.getenv("BUGSNAG_API_KEY") ?: bugsnagProps.getProperty("bugsnag.apikey")
+    val key = System.getenv("BUGSNAG_API_KEY") ?: bugsnagProps.getProperty("bugsnag.apikey")
+
+    println("Using key = $key")
+    return key
 }
\ No newline at end of file