diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 2ec459a..525fe64 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -1,7 +1,7 @@
 name: ios
 
 env:
-  XCODE_VERSION: 'Xcode_16.3'
+  XCODE_VERSION: 'Xcode_16.4'
 
 on:
   pull_request:
@@ -17,4 +17,4 @@ jobs:
     - name: Switch to Xcode ${{ env.XCODE_VERSION }}
       run: sudo xcode-select --switch /Applications/${{ env.XCODE_VERSION }}.app
     - name: Build
-      run: xcodebuild -scheme SwisstopoMapSDK -destination 'platform=iOS Simulator,OS=18.0,name=iPhone 16 Pro'
+      run: xcodebuild -scheme SwisstopoMapSDK -destination 'platform=iOS Simulator,OS=18.6,name=iPhone 16 Pro'
diff --git a/android/build.gradle b/android/build.gradle
index a6420e7..65ab8c1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -62,11 +62,11 @@ apply plugin: 'com.vanniktech.maven.publish'
 android {
 	namespace "ch.admin.geo.openswissmaps"
 
-	compileSdkVersion 35
+	compileSdkVersion 36
 
 	defaultConfig {
 		minSdkVersion 26
-		targetSdkVersion 35
+		targetSdkVersion 36
 		versionCode Integer.parseInt(VERSION_CODE)
 		versionName VERSION_NAME
 
@@ -74,7 +74,7 @@ android {
 		consumerProguardFiles 'consumer-rules.pro'
 		externalNativeBuild {
 			cmake {
-				arguments "-DANDROID_STL=c++_shared"
+				arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
 				cppFlags "-std=c++17 -frtti -fexceptions -O2"
 			}
 		}
@@ -184,7 +184,7 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 	implementation "androidx.annotation:annotation:1.9.1"
-	implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.9.1"
+	implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.9.2"
 	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
 
 	api "io.openmobilemaps:mapscore:3.4.1"
@@ -192,8 +192,8 @@ dependencies {
 	implementation "ch.ubique.android:djinni-support-lib:1.1.1"
 
 	testImplementation 'junit:junit:4.13.2'
-	androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-	androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+	androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
 }
 
 clean.doLast {