diff --git a/.env.example b/.env.example
index 2523f64..588d9c1 100644
--- a/.env.example
+++ b/.env.example
@@ -5,4 +5,4 @@ SENTRY_PROJECT=swimbuddy
 SENTRY_AUTH_TOKEN=your-auth-token
 
 # Firebase App Distribution (WearOS)
-FIREBASE_WEAR_APP_ID=1:xxxxx:android:xxxxx
+FIREBASE_WEAR_APP_ID=1:404955511024:android:3fac1d3a237f1791b96a35
diff --git a/.gitignore b/.gitignore
index 158de0b..b236eb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,9 @@ expo-env.d.ts
 *.key
 *.mobileprovision
 
+# Firebase
+google-services.json
+
 # Metro
 .metro-health-check*
 
@@ -44,3 +47,5 @@ sentry.properties
 # generated native folders
 /ios
 /android
+
+/google-services.json
\ No newline at end of file
diff --git a/app.json b/app.json
index 7807872..a76bad4 100644
--- a/app.json
+++ b/app.json
@@ -43,9 +43,9 @@
       ["expo-localization", {
         "supportedLocales": ["en", "nl", "de", "fr", "it", "es", "pl", "pt", "dk"]
       }],
-      "./modules/wear-connectivity",
       "@sentry/react-native/expo",
-      "expo-updates"
+      "expo-updates",
+      "expo-system-ui"
     ],
     "extra": {
       "eas": {
diff --git a/eas.json b/eas.json
index f3603d0..c1a0c9c 100644
--- a/eas.json
+++ b/eas.json
@@ -9,7 +9,7 @@
 			"distribution": "internal"
 		},
 		"preview": {
-			"distribution": "store",
+			"distribution": "internal",
 			"autoIncrement": true
 		},
 		"production": {
@@ -17,14 +17,12 @@
 		}
 	},
 	"submit": {
-		"production": {}
-	},
-	"update": {
 		"preview": {
-			"channel": "preview"
+			"android": {
+				"serviceAccountKeyPath": "./google-services.json",
+				"track": "internal"
+			}
 		},
-		"production": {
-			"channel": "production"
-		}
+		"production": {}
 	}
 }
diff --git a/metro.config.js b/metro.config.js
index 5389f51..d93583d 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -1,6 +1,6 @@
 const { getDefaultConfig } = require("expo/metro-config");
 const { withNativewind } = require("nativewind/metro");
-const { withSentry } = require("@sentry/react-native/metro");
+const { withSentryConfig } = require("@sentry/react-native/metro");
 
 /** @type {import('expo/metro-config').MetroConfig} */
 const config = getDefaultConfig(__dirname);
@@ -15,7 +15,7 @@ config.transformer.getTransformOptions = async () => ({
   },
 });
 
-module.exports = withSentry(withNativewind(config, {
+module.exports = withSentryConfig(withNativewind(config, {
   // Ensure .sql files are not processed as CSS
   inlineRem: false,
 }));
diff --git a/package.json b/package.json
index 1bbb754..04e2f85 100644
--- a/package.json
+++ b/package.json
@@ -33,12 +33,10 @@
     "@types/react": "~19.2.2",
     "babel-plugin-inline-import": "^3.0.0",
     "drizzle-kit": "^0.31.10",
-    "patch-package": "^8.0.1",
     "tailwindcss": "^4",
     "typescript": "~6.0.3"
   },
   "scripts": {
-    "postinstall": "patch-package",
     "start": "expo start",
     "android": "expo run:android",
     "ios": "expo run:ios",
diff --git a/scripts/build-wearos.sh b/scripts/build-wearos.sh
index e8ac9d3..3157277 100755
--- a/scripts/build-wearos.sh
+++ b/scripts/build-wearos.sh
@@ -5,7 +5,11 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
 
 # Load .env file
-if [ -f "$PROJECT_ROOT/.env" ]; then
+if [ -f "$PROJECT_ROOT/.env.local" ]; then
+  set -a
+  source "$PROJECT_ROOT/.env.local"
+  set +a
+elif [ -f "$PROJECT_ROOT/.env" ]; then
   set -a
   source "$PROJECT_ROOT/.env"
   set +a
diff --git a/targets/wearos/app/build.gradle.kts b/targets/wearos/app/build.gradle.kts
index 9e819ff..fc322b0 100644
--- a/targets/wearos/app/build.gradle.kts
+++ b/targets/wearos/app/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "nl.guidoit.swimbuddy"
+        applicationId = "nl.guidoit.swimbuddy.wear"
         minSdk = 30
         targetSdk = 35
         versionCode = 1
diff --git a/tsconfig.json b/tsconfig.json
index f599124..c4d0c39 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "expo/tsconfig.base",
   "compilerOptions": {
     "strict": true,
+    "ignoreDeprecations": "6.0",
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"],