diff --git a/device.mk b/device.mk
index 6fe319e..bb0577a 100644
--- a/device.mk
+++ b/device.mk
@@ -101,6 +101,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.build.fingerprint=google/flame/flame:10/QQ2A.200501.001.A3/6353761:user/release-keys
 
+# Power
+PRODUCT_PACKAGES += \
+    android.hardware.power@1.3-service.pixel-libperfmgr
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/powerhint.json:system/etc/powerhint.json
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
diff --git a/power-libperfmgr/Android.bp b/power-libperfmgr/Android.bp
index 7874d10..81fed17 100644
--- a/power-libperfmgr/Android.bp
+++ b/power-libperfmgr/Android.bp
@@ -43,5 +43,4 @@ cc_binary {
         "android.hardware.power@1.3",
         "libperfmgr",
     ],
-    proprietary: true,
 }
diff --git a/power-libperfmgr/Power.cpp b/power-libperfmgr/Power.cpp
index e2b1d47..ad83a5e 100644
--- a/power-libperfmgr/Power.cpp
+++ b/power-libperfmgr/Power.cpp
@@ -52,7 +52,7 @@ constexpr char kPowerHalStateProp[] = "vendor.powerhal.state";
 constexpr char kPowerHalAudioProp[] = "vendor.powerhal.audio";
 constexpr char kPowerHalInitProp[] = "vendor.powerhal.init";
 constexpr char kPowerHalRenderingProp[] = "vendor.powerhal.rendering";
-constexpr char kPowerHalConfigPath[] = "/vendor/etc/powerhint.json";
+constexpr char kPowerHalConfigPath[] = "/system/etc/powerhint.json";
 
 static const std::map<enum CameraStreamingMode, std::string> kCamStreamingHint = {
         {CAMERA_STREAMING_OFF, "CAMERA_STREAMING_OFF"},
diff --git a/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc b/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc
index 6179f6e..205e077 100644
--- a/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc
+++ b/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc
@@ -1,4 +1,4 @@
-service vendor.power-hal-1-3 /vendor/bin/hw/android.hardware.power@1.3-service.pixel-libperfmgr
+service vendor.power-hal-1-3 /system/bin/hw/android.hardware.power@1.3-service.pixel-libperfmgr
     class hal
     user root
     group system