diff --git a/aosp_redfin.mk b/aosp_redfin.mk
index d633bae..6844c9f 100644
--- a/aosp_redfin.mk
+++ b/aosp_redfin.mk
@@ -49,11 +49,13 @@ $(call inherit-product-if-exists, vendor/google_devices/redfin/prebuilts/device-
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
 
-# Keep the VNDK APEX in /system partition for REL branches as these branches are
-# expected to have stable API/ABI surfaces.
+# Keep the VNDK APEX in /system partition for REL branches and Vendor Freeze targets
+# as these are expected to have stable API/ABI surfaces.
 ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
   PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
 endif
+endif
 
 # Don't build super.img.
 PRODUCT_BUILD_SUPER_PARTITION := false