diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java
index 89661f77d0..1a76ef1636 100644
--- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java
+++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java
@@ -112,7 +112,7 @@ public API getApi() {
                 tenantDomain == null ? APIConstants.SUPER_TENANT_DOMAIN_NAME : tenantDomain);
         api.setOrganizationId(requestContext.getMatchedAPI().getOrganizationId());
         api.setEnvironmentId(requestContext.getMatchedAPI().getEnvironmentId());
-        api.setApiContext(requestContext.getRequestPath());
+        api.setApiContext(requestContext.getMatchedAPI().getBasePath());
         return api;
     }
 
diff --git a/pom.xml b/pom.xml
index 31bc2b44fd..ca674380bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,7 +635,7 @@
         <andes.client.version>3.3.12</andes.client.version>
         <azure.messaging.eventhubs.version>5.6.0</azure.messaging.eventhubs.version>
         <woodstox-core.version>6.4.0</woodstox-core.version>
-        <carbon.apimgt.version>9.0.369.9</carbon.apimgt.version>
+        <carbon.apimgt.version>9.0.369.11</carbon.apimgt.version>
         <build.helper.plugin.version>3.2.0</build.helper.plugin.version>
         <commons.version>3.12.0</commons.version>
         <commons.io.version>2.7</commons.io.version>
@@ -678,7 +678,7 @@
         <apictl.version>4.0.0</apictl.version>
         <apim.version>4.0.0</apim.version>
         <grpc.healthProbe.version>0.4.17</grpc.healthProbe.version>
-        <analytics.publisher.client.version>1.2.13</analytics.publisher.client.version>
+        <analytics.publisher.client.version>1.2.15</analytics.publisher.client.version>
         <awaitility.version>4.2.0</awaitility.version>
         <apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
         <jackson.databind.version>2.14.1</jackson.databind.version>