diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index feac0bc80d9f..5375635c7c70 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -657,7 +657,11 @@ enum hdd_dot11_mode {
 #define CFG_SCAN_AGING_PARAM_NAME          "gScanAgingTime"
 #define CFG_SCAN_AGING_PARAM_MIN           (0)
 #define CFG_SCAN_AGING_PARAM_MAX           (200)
+#ifdef QCA_WIFI_NAPIER_EMULATION
+#define CFG_SCAN_AGING_PARAM_DEFAULT       (90)
+#else
 #define CFG_SCAN_AGING_PARAM_DEFAULT       (30)
+#endif
 
 #ifdef FEATURE_WLAN_SCAN_PNO
 /*
diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h
index 4f52c9913589..50d421ac16be 100644
--- a/core/mac/inc/qwlan_version.h
+++ b/core/mac/inc/qwlan_version.h
@@ -41,9 +41,9 @@
 #define QWLAN_VERSION_MAJOR            5
 #define QWLAN_VERSION_MINOR            2
 #define QWLAN_VERSION_PATCH            0
-#define QWLAN_VERSION_EXTRA            "X"
+#define QWLAN_VERSION_EXTRA            "Z"
 #define QWLAN_VERSION_BUILD            33
 
-#define QWLAN_VERSIONSTR               "5.2.0.33X"
+#define QWLAN_VERSIONSTR               "5.2.0.33Z"
 
 #endif /* QWLAN_VERSION_H */