diff --git a/OWNERS b/OWNERS
index 7eed0c3..5524a1f 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
 per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
 
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 9898ba7..2636f8d 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -264,3 +264,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.oem_id=00e0 \
     ro.quick_start.device_id=bluejay
+
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true