diff --git a/overlay-rpi4/chromeos-base/chromeos-bsp-rpi4/files/kernel-config/cmdline.txt b/overlay-rpi4/chromeos-base/chromeos-bsp-rpi4/files/kernel-config/cmdline.txt
index 7c1bb1d..fda0c6a 100644
--- a/overlay-rpi4/chromeos-base/chromeos-bsp-rpi4/files/kernel-config/cmdline.txt
+++ b/overlay-rpi4/chromeos-base/chromeos-bsp-rpi4/files/kernel-config/cmdline.txt
@@ -1 +1 @@
-coherent_pool=6M smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 console=serial0,115200 earlyprintk=serial0,115200 log_level=7 root=/dev/mmcblk0p3 rootfstype=ext2 rootwait ro cros_debug cros_secure
+coherent_pool=6M smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 console=serial0,115200 earlyprintk=serial0,115200 log_level=7 root=/dev/mmcblk0p3 rootfstype=ext2 rootwait ro cros_debug cros_secure cpufreq.default_governor=performance
diff --git a/overlay-rpi4/make.conf b/overlay-rpi4/make.conf
index 3a442e5..b211030 100644
--- a/overlay-rpi4/make.conf
+++ b/overlay-rpi4/make.conf
@@ -8,7 +8,7 @@ BOARD_RUSTFLAGS="-C target-cpu=cortex-a72 -C target-feature=+v8a,+crc,+neon,+fp1
 USE="${USE} direncryption chromeless_tests ac_only -ml_service ime"
 USE="${USE} transparent_hugepage"
 
-USE="${USE} kvm_host os_install_service"
+USE="${USE} kvm_host -os_install_service"
 USE="${USE} libcamera"
 USE="${USE} crosvm-wl-dmabuf crosvm-gpu crosvm-video-encoder crosvm-video-decoder crosvm-video-libvda v4l virtio_gpu"
 USE="${USE} -tpm tpm2_simulator tpm2 vtpm_proxy tpm2_simulator_manufacturer disable_explicit_dma_fences"