diff --git a/conf/distro/include/qcom-base.inc b/conf/distro/include/qcom-base.inc
index 03419c28..03294e2a 100644
--- a/conf/distro/include/qcom-base.inc
+++ b/conf/distro/include/qcom-base.inc
@@ -43,6 +43,7 @@ IMAGE_FSTYPES:remove = "tar.gz"
 INITRAMFS_IMAGE = "initramfs-rootfs-image"
 
 INHERIT += "buildhistory"
+INHERIT += "distrooverrides"
 INHERIT += "image-buildinfo"
 INHERIT += "recipe_sanity"
 
diff --git a/conf/distro/qcom-distro-extended-debug.conf b/conf/distro/qcom-distro-extended-debug.conf
new file mode 100644
index 00000000..fb1034e5
--- /dev/null
+++ b/conf/distro/qcom-distro-extended-debug.conf
@@ -0,0 +1,7 @@
+require conf/distro/qcom-distro.conf
+
+DISTRO_FEATURES:append = " extended-debug"
+
+DISTRO_FEATURES_OVERRIDES += "extended-debug"
+
+DISTRO_NAME:append = " (extended-debug-options-enabled)"
diff --git a/conf/distro/qcom-distro-optimized-perf.conf b/conf/distro/qcom-distro-optimized-perf.conf
new file mode 100644
index 00000000..9886b312
--- /dev/null
+++ b/conf/distro/qcom-distro-optimized-perf.conf
@@ -0,0 +1,7 @@
+require conf/distro/qcom-distro.conf
+
+DISTRO_FEATURES:append = " optimized-perf"
+
+DISTRO_FEATURES_OVERRIDES += "optimized-perf"
+
+DISTRO_NAME:append = " (performance-optimizations-enabled)"