diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index eec840d..da3d25f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: aarch64-linux-android,armv7-linux-androideabi
+          targets: aarch64-linux-android,armv7-linux-androideabi,i686-linux-android,x86_64-linux-android
 
       - name: Install cargo-ndk
         run: cargo install cargo-ndk
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index b8c6a6e..cc5b4e3 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -33,6 +33,9 @@ jobs:
 
       - name: Generate
         run: |
+          # Disabling NEON fixes linker error, see
+          # https://github.com/unomed-dev/react-native-matrix-sdk/issues/12
+          export CARGO_FEATURE_NO_NEON=1
           yarn ubrn:clean
           yarn ubrn:checkout
           yarn ubrn:ios
diff --git a/ubrn.yaml b/ubrn.yaml
index fef8b26..3027dd0 100644
--- a/ubrn.yaml
+++ b/ubrn.yaml
@@ -10,6 +10,8 @@ android:
   targets:
     - arm64-v8a
     - armeabi-v7a
+    - x86
+    - x86_64
 ios:
   cargoExtras: []
   directory: ios