diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index dcd8cb8..fb1ae52 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -21,10 +21,12 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_husky.mk \
     $(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
     $(LOCAL_DIR)/aosp_husky_fullmte.mk \
+    $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
     $(LOCAL_DIR)/factory_husky.mk \
     $(LOCAL_DIR)/aosp_shiba.mk \
     $(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
     $(LOCAL_DIR)/aosp_shiba_fullmte.mk \
+    $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
     $(LOCAL_DIR)/factory_shiba.mk
 
 COMMON_LUNCH_CHOICES := \
diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk
new file mode 100644
index 0000000..81219c7
--- /dev/null
+++ b/aosp_husky_pgagnostic.mk
@@ -0,0 +1,22 @@
+#
+# 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/shusky/aosp_husky.mk)
+
+PRODUCT_NAME := aosp_husky_pgagnostic
+PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF
+
+PRODUCT_PAGE_SIZE_AGNOSTIC := true
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk
new file mode 100644
index 0000000..390d07c
--- /dev/null
+++ b/aosp_shiba_pgagnostic.mk
@@ -0,0 +1,22 @@
+#
+# 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/shusky/aosp_shiba.mk)
+
+PRODUCT_NAME := aosp_shiba_pgagnostic
+PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF
+
+PRODUCT_PAGE_SIZE_AGNOSTIC := true
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536