diff --git a/Asus/ZenFoneMaxShot/Android.mk b/Asus/ZenFoneMaxShot/Android.mk
index 3bd7252..cc3df98 100644
--- a/Asus/ZenFoneMaxShot/Android.mk
+++ b/Asus/ZenFoneMaxShot/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-asus-zenfonemaxshot
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Blackview/BV9500Plus/Android.mk b/Blackview/BV9500Plus/Android.mk
index 2969636..ba82443 100644
--- a/Blackview/BV9500Plus/Android.mk
+++ b/Blackview/BV9500Plus/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-blackview-bv9500plus
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Fairphone/FP3/Android.mk b/Fairphone/FP3/Android.mk
index e246821..7cc57cb 100644
--- a/Fairphone/FP3/Android.mk
+++ b/Fairphone/FP3/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-fairphone-fp3
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Moto/G8Plus/Android.mk b/Moto/G8Plus/Android.mk
index 07166a5..e355e49 100644
--- a/Moto/G8Plus/Android.mk
+++ b/Moto/G8Plus/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-moto-g8plus
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Moto/G8Power/Android.mk b/Moto/G8Power/Android.mk
index a3c0ff4..4795071 100644
--- a/Moto/G8Power/Android.mk
+++ b/Moto/G8Power/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-moto-g8power
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Moto/OneHyper/Android.mk b/Moto/OneHyper/Android.mk
index c75b684..19bc344 100644
--- a/Moto/OneHyper/Android.mk
+++ b/Moto/OneHyper/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-moto-onehyper
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Realme/6/Android.mk b/Realme/6/Android.mk
index 6ca2f4e..f700891 100644
--- a/Realme/6/Android.mk
+++ b/Realme/6/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-realme-6
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Realme/6i/Android.mk b/Realme/6i/Android.mk
index 1b58894..c4715d1 100644
--- a/Realme/6i/Android.mk
+++ b/Realme/6i/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-realme-6i
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Samsung/A80/Android.mk b/Samsung/A80/Android.mk
index 74854c6..fd73d7d 100644
--- a/Samsung/A80/Android.mk
+++ b/Samsung/A80/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-samsung-a80
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)