diff --git a/src/.bazelrc b/src/.bazelrc
index 3fa051489..42a3e846a 100644
--- a/src/.bazelrc
+++ b/src/.bazelrc
@@ -36,12 +36,18 @@ build:prod_windows --define TARGET=prod_windows --build_tag_filters=-nowin
 
 # Android / OSS Android (same configurations)
 build:android --define TARGET=oss_android --copt "-DOS_ANDROID"
-build:android --android_crosstool_top=@androidndk//:toolchain --fat_apk_cpu=armeabi-v7a,arm64-v8a,x86,x86_64
+build:android --android_crosstool_top=@androidndk//:toolchain
+# --fat_apk_cpu should be replaced with --android_platforms
+# https://github.com/bazelbuild/bazel/commit/05bea52ed3159aa5d15d967f5f56fc084a2b6c73
+build:android --fat_apk_cpu=armeabi-v7a,arm64-v8a,x86,x86_64 --incompatible_enable_android_toolchain_resolution=false
 build:android --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
 build:android --build_tag_filters=-noandroid
 test:android --test_tag_filters=-noandroid
 build:oss_android --define TARGET=oss_android --copt "-DOS_ANDROID"
-build:oss_android --android_crosstool_top=@androidndk//:toolchain --fat_apk_cpu=armeabi-v7a,arm64-v8a,x86,x86_64
+build:oss_android --android_crosstool_top=@androidndk//:toolchain
+# --fat_apk_cpu should be replaced with --android_platforms
+# https://github.com/bazelbuild/bazel/commit/05bea52ed3159aa5d15d967f5f56fc084a2b6c73
+build:oss_android --fat_apk_cpu=armeabi-v7a,arm64-v8a,x86,x86_64 --incompatible_enable_android_toolchain_resolution=false
 build:oss_android --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
 build:oss_android --build_tag_filters=-noandroid
 test:oss_android --test_tag_filters=-noandroid
diff --git a/src/WORKSPACE.bazel b/src/WORKSPACE.bazel
index f103b9f24..d7448832f 100644
--- a/src/WORKSPACE.bazel
+++ b/src/WORKSPACE.bazel
@@ -91,7 +91,7 @@ load(
 apple_support_dependencies()
 
 
-# Android NDK setup
+# Android NDK setup (2023-01-13)
 RULES_ANDROID_NDK_COMMIT= "44dcd014f4b126f8941c29ff1b25e1584bd3eb26"
 RULES_ANDROID_NDK_SHA = "79b1857e8e05e3007ad090a3269d2932e988b3ed176d7abd042719d45eb51500"
 http_archive(