diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
index fdeccb2aca9..6575585b76e 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
@@ -101,11 +101,14 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                 if (apiList.getList() != null && apiList.getList().size() > 0) {
                     for (APIInfo apiInfo : apiList.getList()) {
                         Subscription subscription = new Subscription();
-                        subscription.setApiIdentifier(apiInfo.getId());
+                        //fix for APIMANAGER-5566 admin-AT-tenant1.com-Tenant1API1-1.0.0
+                        String id = apiInfo.getProvider().replace("@", "-AT-")
+                                + "-" + apiInfo.getName()+ "-" + apiInfo.getVersion();
+                        subscription.setApiIdentifier(id);
                         subscription.setApplicationId(application.getApplicationId());
                         subscription.tier(ApiApplicationConstants.DEFAULT_TIER);
                         SubscriptionList subscriptionList = storeClient.getSubscriptions().subscriptionsGet
-                                (apiInfo.getId(), application.getApplicationId(), "", 0, 100, CONTENT_TYPE, null);
+                                (id, application.getApplicationId(), "", 0, 100, CONTENT_TYPE, null);
                         boolean subscriptionExist = false;
                         if (subscriptionList.getList() != null && subscriptionList.getList().size() > 0) {
                             for (Subscription subs : subscriptionList.getList()) {
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
index 5d73fdd0538..392a6e364c5 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
@@ -67,7 +67,9 @@
 							org.wso2.carbon.utils,
 							com.fasterxml.jackson.annotation,
 							io.swagger.annotations,
-							org.wso2.carbon.core.util
+							org.wso2.carbon.core.util,
+							javax.xml,
+							org.wso2.carbon.base
 						</Import-Package>
 						<Embed-Dependency>
 							jsr311-api,