diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 2f6c9e7..9d64a36 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -20,12 +20,16 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_ravenclaw.mk \
     $(LOCAL_DIR)/factory_ravenclaw.mk \
     $(LOCAL_DIR)/aosp_cheetah.mk \
+    $(LOCAL_DIR)/aosp_cheetah_hwasan.mk \
     $(LOCAL_DIR)/factory_cheetah.mk \
     $(LOCAL_DIR)/aosp_panther.mk \
+    $(LOCAL_DIR)/aosp_panther_hwasan.mk \
     $(LOCAL_DIR)/factory_panther.mk
 
 COMMON_LUNCH_CHOICES := \
     aosp_cloudripper-userdebug \
     aosp_ravenclaw-userdebug \
     aosp_cheetah-userdebug \
-    aosp_panther-userdebug
+    aosp_cheetah_hwasan-userdebug \
+    aosp_panther-userdebug \
+    aosp_panther_hwasan-userdebug
diff --git a/aosp_cheetah_hwasan.mk b/aosp_cheetah_hwasan.mk
new file mode 100644
index 0000000..de21d40
--- /dev/null
+++ b/aosp_cheetah_hwasan.mk
@@ -0,0 +1,23 @@
+#
+# Copyright 2023 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/pantah/aosp_cheetah.mk)
+PRODUCT_NAME := aosp_cheetah_hwasan
+
+# Add "hwaddress" as a global sanitizer if it's missing.
+ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
+endif
diff --git a/aosp_panther_hwasan.mk b/aosp_panther_hwasan.mk
new file mode 100644
index 0000000..8021639
--- /dev/null
+++ b/aosp_panther_hwasan.mk
@@ -0,0 +1,23 @@
+#
+# Copyright 2023 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/pantah/aosp_panther.mk)
+PRODUCT_NAME := aosp_panther_hwasan
+
+# Add "hwaddress" as a global sanitizer if it's missing.
+ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
+endif