diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff12975..70697c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [2.4.0](https://github.com/rdkcentral/advanced-security/compare/2.3.0...2.4.0)
+
+- XF10-696 : Correct MAC address format on agent side [`#65`](https://github.com/rdkcentral/advanced-security/pull/65)
+- Merge tag '2.3.0' into develop [`d331dad`](https://github.com/rdkcentral/advanced-security/commit/d331dadcbb34b10327c490055c8e5cf6bdd862b0)
+
 #### [2.3.0](https://github.com/rdkcentral/advanced-security/compare/2.2.1...2.3.0)
 
+> 22 April 2026
+
 - RDKB-62410, RDKB-62659 : Revert Network Intelligence (NI) support, WDA fix and NI CPU and memory monitoring [`#60`](https://github.com/rdkcentral/advanced-security/pull/60)
+- Add changelog for release 2.3.0 [`bb98b47`](https://github.com/rdkcentral/advanced-security/commit/bb98b47c0341a1a3e94ec4050d683dd72c5acfae)
 - Merge tag '2.2.1' into develop [`8117660`](https://github.com/rdkcentral/advanced-security/commit/81176604c5e971ca77a1ea70d57a9e3dda0a7a1e)
 
 #### [2.2.1](https://github.com/rdkcentral/advanced-security/compare/2.2.0...2.2.1)
diff --git a/source/AdvSecurityDml/cosa_adv_security_internal.c b/source/AdvSecurityDml/cosa_adv_security_internal.c
index f722552..e10ddc1 100644
--- a/source/AdvSecurityDml/cosa_adv_security_internal.c
+++ b/source/AdvSecurityDml/cosa_adv_security_internal.c
@@ -1161,9 +1161,10 @@ CosaSecurityInitialize
 #elif defined(PON_GATEWAY)
     // For PON gateway, always use HAL API
     char deviceMACStr[32] = {0};
-    if (platform_hal_GetBaseMacAddress(deviceMACStr) == 0)
+    rc = platform_hal_GetBaseMacAddress(deviceMACStr);
+    if ( rc == 0 && deviceMACStr[0] != '\0' )
     {
-        AnscMacToLower(deviceMac, deviceMACStr, sizeof(deviceMac));
+        strcpy_s(deviceMac, sizeof(deviceMac), deviceMACStr);
         CcspTraceInfo(("CcspAdvSecurity: deviceMac [%s]\n", deviceMac));
     }
     else