diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp
index b1679ae..fbb6140 100644
--- a/security/keymint/aidl/default/Android.bp
+++ b/security/keymint/aidl/default/Android.bp
@@ -7,27 +7,6 @@
     default_applicable_licenses: ["hardware_interfaces_license"],
 }
 
-vintf_fragment {
-    name: "android.hardware.security.keymint-service.xml",
-    src: "android.hardware.security.keymint-service.xml",
-    vendor: true,
-    no_full_install: true,
-}
-
-vintf_fragment {
-    name: "android.hardware.security.sharedsecret-service.xml",
-    src: "android.hardware.security.sharedsecret-service.xml",
-    vendor: true,
-    no_full_install: true,
-}
-
-vintf_fragment {
-    name: "android.hardware.security.secureclock-service.xml",
-    src: "android.hardware.security.secureclock-service.xml",
-    vendor: true,
-    no_full_install: true,
-}
-
 // The following target has an insecure implementation of KeyMint where the
 // trusted application (TA) code runs in-process alongside the HAL service
 // code.
@@ -39,6 +18,11 @@
     name: "android.hardware.security.keymint-service",
     relative_install_path: "hw",
     init_rc: ["android.hardware.security.keymint-service.rc"],
+    vintf_fragments: [
+        "android.hardware.security.keymint-service.xml",
+        "android.hardware.security.sharedsecret-service.xml",
+        "android.hardware.security.secureclock-service.xml",
+    ],
     vendor: true,
     cflags: [
         "-Wall",
@@ -67,11 +51,6 @@
     required: [
         "android.hardware.hardware_keystore.xml",
     ],
-    vintf_fragment_modules: [
-        "android.hardware.security.keymint-service.xml",
-        "android.hardware.security.sharedsecret-service.xml",
-        "android.hardware.security.secureclock-service.xml",
-    ],
 }
 
 // The following target has an insecure implementation of KeyMint where the
@@ -86,6 +65,11 @@
     relative_install_path: "hw",
     vendor: true,
     init_rc: ["android.hardware.security.keymint-service.nonsecure.rc"],
+    vintf_fragments: [
+        "android.hardware.security.keymint-service.xml",
+        "android.hardware.security.sharedsecret-service.xml",
+        "android.hardware.security.secureclock-service.xml",
+    ],
     defaults: [
         "keymint_use_latest_hal_aidl_rust",
     ],
@@ -103,11 +87,6 @@
     required: [
         "android.hardware.hardware_keystore.xml",
     ],
-    vintf_fragment_modules: [
-        "android.hardware.security.keymint-service.xml",
-        "android.hardware.security.sharedsecret-service.xml",
-        "android.hardware.security.secureclock-service.xml",
-    ],
 }
 
 prebuilt_etc {