diff --git a/app.json b/app.json
index 28afc02..e8746ef 100644
--- a/app.json
+++ b/app.json
@@ -1,95 +1,120 @@
 {
-  "expo": {
-    "name": "SwimBuddy",
-    "slug": "swimbuddy",
-    "version": "1.0.0",
-    "orientation": "portrait",
-    "icon": "./assets/icon.png",
-    "userInterfaceStyle": "light",
-    "runtimeVersion": "1.0.0",
-    "updates": {
-      "url": "https://u.expo.dev/7b88af8c-86a3-4c08-b186-09a90e2bdfcc",
-      "fallbackToCacheTimeout": 0,
-      "checkAutomatically": "ON_LOAD"
-    },
-    "ios": {
-      "supportsTablet": true,
-      "bundleIdentifier": "nl.guido-it.swimbuddy",
-      "entitlements": {
-        "com.apple.security.application-groups": [
-          "group.nl.guido-it.swimbuddy"
-        ],
-        "com.apple.developer.healthkit": true
-      },
-      "appleTeamId": "7TABQZ5458"
-    },
-    "android": {
-      "adaptiveIcon": {
-        "backgroundColor": "#E6F4FE",
-        "foregroundImage": "./assets/android-icon-foreground.png",
-        "backgroundImage": "./assets/android-icon-background.png",
-        "monochromeImage": "./assets/android-icon-monochrome.png"
-      },
-      "predictiveBackGestureEnabled": false,
-      "package": "nl.guidoit.swimbuddy"
-    },
-    "web": {
-      "favicon": "./assets/favicon.png",
-      "bundler": "metro"
-    },
-    "plugins": [
-      "expo-sqlite",
-      "@bacons/apple-targets",
-      [
-        "expo-localization",
-        {
-          "supportedLocales": [
-            "en",
-            "nl",
-            "de",
-            "fr",
-            "it",
-            "es",
-            "pl",
-            "pt",
-            "dk"
-          ]
-        }
-      ],
-      "@sentry/react-native/expo",
-      "expo-updates",
-      "expo-system-ui",
-      [
-        "expo-splash-screen",
-        {
-          "image": "./assets/splash-icon.png",
-          "resizeMode": "contain",
-          "backgroundColor": "#5BC0F8"
-        }
-      ]
-    ],
-    "extra": {
-      "eas": {
-        "build": {
-          "experimental": {
-            "ios": {
-              "appExtensions": [
-                {
-                  "bundleIdentifier": "nl.guido-it.swimbuddy.watch",
-                  "targetName": "SwimBuddy",
-                  "entitlements": {
-                    "com.apple.security.application-groups": [
-                      "group.nl.guido-it.swimbuddy"
-                    ]
-                  }
-                }
-              ]
-            }
-          }
-        },
-        "projectId": "7b88af8c-86a3-4c08-b186-09a90e2bdfcc"
-      }
-    },
-    "owner": "guido-it"
-  }
+	"expo": {
+		"name": "SwimBuddy",
+		"slug": "swimbuddy",
+		"version": "1.0.0",
+		"orientation": "portrait",
+		"icon": "./assets/icon.png",
+		"userInterfaceStyle": "light",
+		"runtimeVersion": "1.0.0",
+		"updates": {
+			"url": "https://u.expo.dev/7b88af8c-86a3-4c08-b186-09a90e2bdfcc",
+			"fallbackToCacheTimeout": 0,
+			"checkAutomatically": "ON_LOAD"
+		},
+		"ios": {
+			"supportsTablet": true,
+			"bundleIdentifier": "nl.guido-it.swimbuddy",
+			"entitlements": {
+				"com.apple.security.application-groups": [
+					"group.nl.guido-it.swimbuddy"
+				],
+				"com.apple.developer.healthkit": true
+			},
+			"appleTeamId": "7TABQZ5458",
+			"infoPlist": {
+				"CFBundleLocalizations": [
+					"en",
+					"nl",
+					"de",
+					"fr",
+					"it",
+					"es",
+					"pl",
+					"pt",
+					"dk",
+					"en",
+					"nl",
+					"de",
+					"fr",
+					"it",
+					"es",
+					"pl",
+					"pt",
+					"dk"
+				],
+				"ITSAppUsesNonExemptEncryption": false
+			}
+		},
+		"android": {
+			"adaptiveIcon": {
+				"backgroundColor": "#E6F4FE",
+				"foregroundImage": "./assets/android-icon-foreground.png",
+				"backgroundImage": "./assets/android-icon-background.png",
+				"monochromeImage": "./assets/android-icon-monochrome.png"
+			},
+			"predictiveBackGestureEnabled": false,
+			"package": "nl.guidoit.swimbuddy"
+		},
+		"web": {
+			"favicon": "./assets/favicon.png",
+			"bundler": "metro"
+		},
+		"plugins": [
+			"expo-sqlite",
+			"@bacons/apple-targets",
+			[
+				"expo-localization",
+				{
+					"supportedLocales": [
+						"en",
+						"nl",
+						"de",
+						"fr",
+						"it",
+						"es",
+						"pl",
+						"pt",
+						"dk"
+					]
+				}
+			],
+			"@sentry/react-native/expo",
+			"expo-updates",
+			"expo-system-ui",
+			[
+				"expo-splash-screen",
+				{
+					"image": "./assets/splash-icon.png",
+					"resizeMode": "contain",
+					"backgroundColor": "#5BC0F8"
+				}
+			]
+		],
+		"extra": {
+			"eas": {
+				"build": {
+					"experimental": {
+						"ios": {
+							"appExtensions": [
+								{
+									"bundleIdentifier": "nl.guido-it.swimbuddy.watch",
+									"targetName": "SwimBuddy",
+									"entitlements": {
+										"com.apple.security.application-groups": [
+											"group.nl.guido-it.swimbuddy"
+										],
+										"com.apple.developer.healthkit": true,
+										"com.apple.developer.healthkit.access": []
+									}
+								}
+							]
+						}
+					}
+				},
+				"projectId": "7b88af8c-86a3-4c08-b186-09a90e2bdfcc"
+			}
+		},
+		"owner": "guido-it"
+	}
 }
diff --git a/eas.json b/eas.json
index c1a0c9c..03c42d1 100644
--- a/eas.json
+++ b/eas.json
@@ -9,7 +9,7 @@
 			"distribution": "internal"
 		},
 		"preview": {
-			"distribution": "internal",
+			"distribution": "store",
 			"autoIncrement": true
 		},
 		"production": {