diff --git a/modules/distribution/resources/api_templates/velocity_template.xml b/modules/distribution/resources/api_templates/velocity_template.xml
index be533fe620..60a7cd4d6f 100644
--- a/modules/distribution/resources/api_templates/velocity_template.xml
+++ b/modules/distribution/resources/api_templates/velocity_template.xml
@@ -36,6 +36,17 @@
         #set( $endpointsecurity = $endpoint_security.get("${type}"))
         ## IF endpoint secured
         #if($endpointsecurity.enabled)
+        #if($endpointsecurity.type == "apikey" || $endpointsecurity.type == "APIKEY")
+<class name="org.wso2.carbon.apimgt.gateway.mediators.ApiKeyMediator">
+<property name="apiKeyIdentifier" value="$util.escapeXml($endpointsecurity.apiKeyIdentifier)" type="STRING"/>
+<property name="apiKeyIdentifierType" value="$util.escapeXml($endpointsecurity.apiKeyIdentifierType)" type="STRING"/>
+#if($isSecureVaultEnabled)
+<property name="apiKeyValue" expression="wso2:vault-lookup('$endpointsecurity.apiKeyValue')" type="STRING"/>
+#else
+<property name="apiKeyValue" value="$util.escapeXml($endpointsecurity.apiKeyValue)" type="STRING"/>
+#end
+</class>
+        #else
         #if($endpointsecurity.type == "basic" || $endpointsecurity.type == "BASIC")
         #if($isSecureVaultEnabled)
 <property xmlns="http://ws.apache.org/ns/synapse" name="password" expression="wso2:vault-lookup('$endpointsecurity.alias')"/>
@@ -100,6 +111,7 @@
         #end
         #end
         #end
+        #end
 <send>
 
 ## If endpoint is http
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json b/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json
index 3059d64246..1e3e5c4c6d 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json
@@ -12,6 +12,7 @@
         "type": "apikey",
         "apiKeyIdentifier": "Authorization",
         "apiKeyValue": "Bearer 123",
+        "apiKeyIdentifierType": "HEADER",
         "username": "",
         "password": "",
         "grantType": "",
@@ -25,6 +26,7 @@
         "type": "apikey",
         "apiKeyIdentifier": "Authorization",
         "apiKeyValue": "123",
+        "apiKeyIdentifierType": "HEADER",
         "username": "",
         "password": null,
         "grantType": "",
diff --git a/pom.xml b/pom.xml
index b5d1f2b33d..2934a3247a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1284,11 +1284,11 @@
         <carbon.analytics.common.version>5.3.13</carbon.analytics.common.version>
 
         <!-- APIM Portals Component Version -->
-        <carbon.apimgt.ui.version>9.1.130</carbon.apimgt.ui.version>
+        <carbon.apimgt.ui.version>9.1.133</carbon.apimgt.ui.version>
 
         <!-- APIM Component Version -->
 
-        <carbon.apimgt.version>9.30.39</carbon.apimgt.version>
+        <carbon.apimgt.version>9.30.42</carbon.apimgt.version>
 
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>