diff --git a/Android.mk b/Android.mk
index 6b30fb27c..dc628334f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -288,6 +288,7 @@ ifdef HAS_SYSTEM_EXT_SEPOLICY_DIR
 LOCAL_REQUIRED_MODULES += \
     system_ext_file_contexts \
     system_ext_file_contexts_test \
+    system_ext_keystore2_key_contexts \
     system_ext_hwservice_contexts \
     system_ext_hwservice_contexts_test \
     system_ext_property_contexts \
@@ -336,6 +337,7 @@ ifdef HAS_PRODUCT_SEPOLICY_DIR
 LOCAL_REQUIRED_MODULES += \
     product_file_contexts \
     product_file_contexts_test \
+    product_keystore2_key_contexts \
     product_hwservice_contexts \
     product_hwservice_contexts_test \
     product_property_contexts \
@@ -384,6 +386,7 @@ LOCAL_REQUIRED_MODULES += \
 LOCAL_REQUIRED_MODULES += \
     vendor_file_contexts \
     vendor_file_contexts_test \
+    vendor_keystore2_key_contexts \
     vendor_mac_permissions.xml \
     vendor_property_contexts \
     vendor_property_contexts_test \
diff --git a/contexts/Android.bp b/contexts/Android.bp
index 464c77215..ca3cf5727 100644
--- a/contexts/Android.bp
+++ b/contexts/Android.bp
@@ -315,7 +315,7 @@ keystore2_key_contexts {
 }
 
 keystore2_key_contexts {
-    name: "system_keystore2_key_contexts",
+    name: "system_ext_keystore2_key_contexts",
     defaults: ["contexts_flags_defaults"],
     srcs: [":keystore2_key_contexts_files{.system_ext_private}"],
     system_ext_specific: true,