diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index cf37fcaa..2ed2a60f 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -18,12 +18,12 @@ rust_library {
     srcs: ["src/lib.rs"],
 
     rustlibs: [
-        "android.hardware.security.keymint-rust",
-        "android.hardware.security.secureclock-rust",
+        "android.hardware.security.keymint-V1-rust",
+        "android.hardware.security.secureclock-V1-rust",
         "android.security.apc-rust",
         "android.security.authorization-rust",
         "android.security.compat-rust",
-        "android.system.keystore2-rust",
+        "android.system.keystore2-V1-rust",
         "libanyhow",
         "libbinder_rs",
         "libkeystore2_apc_compat-rust",
@@ -47,12 +47,12 @@ rust_test {
     test_suites: ["general-tests"],
     auto_gen_config: true,
     rustlibs: [
-        "android.hardware.security.keymint-rust",
-        "android.hardware.security.secureclock-rust",
+        "android.hardware.security.keymint-V1-rust",
+        "android.hardware.security.secureclock-V1-rust",
         "android.security.apc-rust",
         "android.security.authorization-rust",
         "android.security.compat-rust",
-        "android.system.keystore2-rust",
+        "android.system.keystore2-V1-rust",
         "libandroid_logger",
         "libanyhow",
         "libbinder_rs",
diff --git a/keystore2/src/km_compat/Android.bp b/keystore2/src/km_compat/Android.bp
index a5da5a64..126aeffe 100644
--- a/keystore2/src/km_compat/Android.bp
+++ b/keystore2/src/km_compat/Android.bp
@@ -18,7 +18,7 @@ rust_library {
     srcs: ["lib.rs"],
 
     rustlibs: [
-        "android.hardware.security.keymint-rust",
+        "android.hardware.security.keymint-V1-rust",
         "android.security.compat-rust",
     ],
     shared_libs: [
@@ -33,7 +33,7 @@ rust_test {
     test_suites: ["general-tests"],
     auto_gen_config: true,
     rustlibs: [
-        "android.hardware.security.keymint-rust",
+        "android.hardware.security.keymint-V1-rust",
         "android.security.compat-rust",
     ],
     shared_libs: [