diff --git a/utils/omni_emulator/BoardConfig.mk b/utils/omni_emulator/BoardConfig.mk
index f362f09..0fdd5d0 100644
--- a/utils/omni_emulator/BoardConfig.mk
+++ b/utils/omni_emulator/BoardConfig.mk
@@ -13,6 +13,8 @@
 # limitations under the License.
 #
 
+DEVICE_PATH := vendor/omni/utils/omni_emulator
+
 # x86 emulator specific definitions
 TARGET_CPU_ABI := x86
 TARGET_ARCH := x86
@@ -21,7 +23,7 @@
 TARGET_PRELINK_MODULE := false
 
 include build/make/target/board/BoardConfigGsiCommon.mk
-include vendor/omni/utils/omni_emulator/BoardConfigEmuCommon.mk
+include $(DEVICE_PATH)/BoardConfigEmuCommon.mk
 
 # Resize to 4G to accomodate ASAN and CTS
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296
@@ -38,3 +40,5 @@
 WIFI_DRIVER_FW_PATH_PARAM   := "/dev/null"
 WIFI_DRIVER_FW_PATH_STA     := "/dev/null"
 WIFI_DRIVER_FW_PATH_AP      := "/dev/null"
+
+TARGET_SYSTEM_PROP := $(DEVICE_PATH)/system.prop
diff --git a/utils/omni_emulator/common.mk b/utils/omni_emulator/common.mk
index 67d3140..540e0be 100644
--- a/utils/omni_emulator/common.mk
+++ b/utils/omni_emulator/common.mk
@@ -64,9 +64,6 @@
     vendor/omni/prebuilt/sounds/omni_lock_phone.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/omni_lock_phone.ogg \
     vendor/omni/prebuilt/sounds/omni_unlock_phone.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/omni_unlock_phone.ogg
 
-OMNI_PRODUCT_PROPERTIES += \
-    ro.vendor.qti.servicetracker.disable=true
-
 # Additional packages
 -include vendor/omni/utils/omni_emulator/packages.mk
 
diff --git a/utils/omni_emulator/system.prop b/utils/omni_emulator/system.prop
new file mode 100644
index 0000000..81ad984
--- /dev/null
+++ b/utils/omni_emulator/system.prop
@@ -0,0 +1,2 @@
+# we are not caf
+sys.vendor.qti.servicetracker.disable=true