diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d0d62790..18d0a405 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -422,4 +422,10 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
 # Enable larger logbuf
 BOARD_KERNEL_CMDLINE += log_buf_len=1024K
 
+# Protected VM firmware
+BOARD_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img
+BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
+# TODO(ptosi): Delete this variable once AOSP starts using the other one
+BOARD_PVMFWIMG_PARTITION_SIZE = $(BOARD_PVMFWIMAGE_PARTITION_SIZE)
+
 -include vendor/google_devices/gs101/proprietary/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 18d8d236..57456d2d 100644
--- a/device.mk
+++ b/device.mk
@@ -1068,9 +1068,9 @@ PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.1-service
 
 # pKVM
+$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
+PRODUCT_BUILD_PVMFW_IMAGE := true
 ifeq ($(TARGET_PKVM_ENABLED),true)
-    $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
-    PRODUCT_BUILD_PVMFW_IMAGE := true
     PRODUCT_PACKAGES += pkvm_enabler
 endif