diff --git a/NOTICE b/NOTICE
index 6064cbe039f82592622767366b9e346c07ec7c06..65f9aab8bdc31feedb3e6bff487c2426680fcc86 100644
--- a/NOTICE
+++ b/NOTICE
@@ -392,7 +392,6 @@ The following software have components provided under the terms of this license:
 - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
 - AWS Serverless Java container support - Core (from https://aws.amazon.com/lambda)
 - Adapter: RxJava (from )
-- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/)
 - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
 - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
 - Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/)
@@ -423,7 +422,6 @@ The following software have components provided under the terms of this license:
 - AssertJ fluent assertions (from )
 - Asynchronous Http Client (from )
 - Asynchronous Http Client Netty Utils (from )
-- Azure Cosmos DB Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
 - Bean Validation API (from http://beanvalidation.org)
 - Byte Buddy (without dependencies) (from )
 - Byte Buddy Java agent (from )
@@ -550,10 +548,10 @@ The following software have components provided under the terms of this license:
 - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
 - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://mockito.org)
-- Mockito (from http://mockito.org)
 - Mockito (from http://www.mockito.org)
 - Mockito (from http://www.mockito.org)
+- Mockito (from http://mockito.org)
+- Mockito (from http://mockito.org)
 - Netty Reactive Streams Implementation (from )
 - Netty/Buffer (from http://netty.io/)
 - Netty/Buffer (from http://netty.io/)
@@ -680,8 +678,8 @@ The following software have components provided under the terms of this license:
 - java-cloudant (from https://cloudant.com)
 - java-cloudant (from https://cloudant.com)
 - javatuples (from http://www.javatuples.org)
-- javax.inject (from )
 - javax.inject (from http://code.google.com/p/atinject/)
+- javax.inject (from )
 - javax.ws.rs-api (from http://jax-rs-spec.java.net)
 - jersey-repackaged-guava (from )
 - jose4j (from https://bitbucket.org/b_c/jose4j/)
@@ -995,7 +993,6 @@ The following software have components provided under the terms of this license:
 - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
 - Animal Sniffer Annotations (from )
 - Azure AD Spring Security Integration Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
-- Azure Cosmos DB Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
 - Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Azure Metrics Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
@@ -1027,8 +1024,8 @@ The following software have components provided under the terms of this license:
 - Microsoft Azure client library for Identity (from https://github.com/Azure/azure-sdk-for-java)
 - Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java)
 - Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://www.mockito.org)
 - Mockito (from http://mockito.org)
+- Mockito (from http://www.mockito.org)
 - Mockito (from http://mockito.org)
 - Mockito (from http://www.mockito.org)
 - Netty/Codec/HTTP (from )
@@ -1111,6 +1108,7 @@ The following software have components provided under the terms of this license:
 - Project Lombok (from https://projectlombok.org)
 - Spring Web (from https://github.com/spring-projects/spring-framework)
 - Spring Web (from https://github.com/spring-projects/spring-framework)
+- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
 - reactive-streams (from http://www.reactive-streams.org/)
 
 ========================================================================
diff --git a/provider/storage-azure/pom.xml b/provider/storage-azure/pom.xml
index fc74d443a08900e05d07fca9a20f0330b6dc63b7..57b7cffe204a04a0eb930067e842498dcfa81cb8 100644
--- a/provider/storage-azure/pom.xml
+++ b/provider/storage-azure/pom.xml
@@ -29,7 +29,7 @@
     <description>Storage service on Azure</description>
     <packaging>jar</packaging>
     <properties>
-        <azure.version>2.1.10</azure.version>
+        <azure.version>2.2.0</azure.version>
         <azure.appservice.resourcegroup></azure.appservice.resourcegroup>
         <azure.appservice.plan></azure.appservice.plan>
         <azure.appservice.appname></azure.appservice.appname>
@@ -50,6 +50,12 @@
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-active-directory-spring-boot-starter</artifactId>
             <version>${azure.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.microsoft.azure</groupId>
+                    <artifactId>azure-spring-boot</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -75,7 +81,12 @@
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-cosmosdb-spring-boot-starter</artifactId>
+            <artifactId>spring-data-cosmosdb</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-spring-boot</artifactId>
             <version>2.3.3</version>
         </dependency>
         <dependency>
diff --git a/provider/storage-azure/src/main/resources/application.properties b/provider/storage-azure/src/main/resources/application.properties
index 86231e37e626d2d9cbb19131818c9b4a0706f804..20e2191b2bd03450748ef15da4ff544941f4936d 100644
--- a/provider/storage-azure/src/main/resources/application.properties
+++ b/provider/storage-azure/src/main/resources/application.properties
@@ -15,6 +15,9 @@
 LOG_PREFIX=storage
 server.servlet.contextPath=/api/storage/v2/
 
+# Application name
+spring.application.name=storage
+
 AUTHORIZE_API=${entitlements_service_endpoint}
 AUTHORIZE_API_KEY=${entitlements_service_api_key}
 LEGALTAG_API=${legal_service_endpoint}
@@ -47,6 +50,7 @@ azure.application-insights.instrumentation-key=${appinsights_key}
 #logging configuration
 logging.transaction.enabled=true
 logging.slf4jlogger.enabled=true
+logging.mdccontext.enabled=true
 
 # Azure KeyVault configuration
 azure.keyvault.url=${KEYVAULT_URI}
@@ -57,4 +61,4 @@ azure.cosmosdb.recordmetadata.collection=StorageRecord
 azure.cosmosdb.tenantinfo.collection=TenantInfo
 
 #TenantFactory Configuration
-tenantFactoryImpl.required=true
+tenantFactoryImpl.required=true
\ No newline at end of file