diff --git a/modules/distribution/src/repository/conf/api-manager.xml b/modules/distribution/src/repository/conf/api-manager.xml
index 49aaae5f..6fc9c8b2 100755
--- a/modules/distribution/src/repository/conf/api-manager.xml
+++ b/modules/distribution/src/repository/conf/api-manager.xml
@@ -352,6 +352,10 @@
 		org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor in the identity.xml -->
         <EncryptPersistedTokens>false</EncryptPersistedTokens>
 
+        <ScopeWhitelist>
+            <Scope>device_scope</Scope>
+        </ScopeWhitelist>
+
     </APIKeyValidator>
 
     <!--
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
index d40aca98..eb27997d 100644
Binary files a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks and b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks differ
diff --git a/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks
index d40aca98..eb27997d 100644
Binary files a/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks and b/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks differ