diff --git a/CleanSpec.mk b/CleanSpec.mk
index a918136..5411348 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -71,9 +71,9 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr)
 
-# Remove default android.hardware.health@2.0-service
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.health@2.0-service)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.health@2.0-service.rc)
+# Remove default android.hardware.health@2.0-service.yukawa
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.health@2.0-service.yukawa)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.health@2.0-service.yukawa.rc)
 
 # Remove healthd
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/healthd)
diff --git a/health/android.hardware.health@2.0-service.yukawa.rc b/health/android.hardware.health@2.0-service.yukawa.rc
index 93a7863..e168745 100644
--- a/health/android.hardware.health@2.0-service.yukawa.rc
+++ b/health/android.hardware.health@2.0-service.yukawa.rc
@@ -2,4 +2,5 @@
     class hal
     user system
     group system
+    capabilities WAKE_ALARM
     file /dev/kmsg w
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 5ef6375..202aee4 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -6,6 +6,7 @@
 
 # files in /vendor
 /(vendor|system/vendor)/lib(64)?/hw/gralloc\.yukawa\.so u:object_r:same_process_hal_file:s0
+/vendor/bin/hw/android\.hardware\.health@2\.0-service\.yukawa u:object_r:hal_health_default_exec:s0
 
 # /data
 /dev/block/platform/soc/ffe07000\.mmc/by-name/userdata u:object_r:userdata_block_device:s0