diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/CHANGELOG.md b/sdk/resourcemanager/azure-resourcemanager-storage/CHANGELOG.md
index ee948c5248aa..e692aaf6364d 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/CHANGELOG.md
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/CHANGELOG.md
@@ -10,6 +10,10 @@
 
 ### Other Changes
 
+#### Dependency Updates
+
+- Updated code from `api-version` `2024-01-01`.
+
 ## 2.51.0 (2025-05-26)
 
 ### Other Changes
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/assets.json b/sdk/resourcemanager/azure-resourcemanager-storage/assets.json
index 826ca520021e..3ca512fd63e2 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/assets.json
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/resourcemanager/azure-resourcemanager-storage",
-  "Tag": "java/resourcemanager/azure-resourcemanager-storage_ceedd20777"
+  "Tag": "java/resourcemanager/azure-resourcemanager-storage_3df9762af1"
 }
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobContainersClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobContainersClientImpl.java
index 7b7c9304fbcb..77779bf6e8cc 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobContainersClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobContainersClientImpl.java
@@ -81,7 +81,7 @@ public final class BlobContainersClientImpl implements BlobContainersClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientBlobContainers")
     public interface BlobContainersService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobInventoryPoliciesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobInventoryPoliciesClientImpl.java
index 69db9f804cfd..5b38a9149c17 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobInventoryPoliciesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobInventoryPoliciesClientImpl.java
@@ -64,7 +64,7 @@ public final class BlobInventoryPoliciesClientImpl implements BlobInventoryPolic
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientBlobInventoryPolicies")
     public interface BlobInventoryPoliciesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies/{blobInventoryPolicyName}")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobServicesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobServicesClientImpl.java
index b3f590126871..6e6896218ec3 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobServicesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/BlobServicesClientImpl.java
@@ -62,7 +62,7 @@ public final class BlobServicesClientImpl implements BlobServicesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientBlobServices")
     public interface BlobServicesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/DeletedAccountsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/DeletedAccountsClientImpl.java
index 39786644ad7f..b4893ebe2df2 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/DeletedAccountsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/DeletedAccountsClientImpl.java
@@ -60,7 +60,7 @@ public final class DeletedAccountsClientImpl implements DeletedAccountsClient {
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientDeletedAccounts")
     public interface DeletedAccountsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/deletedAccounts")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/EncryptionScopesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/EncryptionScopesClientImpl.java
index 94f14b2c6c91..d21e65c4a9bc 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/EncryptionScopesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/EncryptionScopesClientImpl.java
@@ -64,7 +64,7 @@ public final class EncryptionScopesClientImpl implements EncryptionScopesClient
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientEncryptionScopes")
     public interface EncryptionScopesService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/encryptionScopes/{encryptionScopeName}")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileServicesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileServicesClientImpl.java
index 679617a88666..65df7a9f4bb5 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileServicesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileServicesClientImpl.java
@@ -64,7 +64,7 @@ public final class FileServicesClientImpl implements FileServicesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientFileServices")
     public interface FileServicesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileSharesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileSharesClientImpl.java
index 5ed2c8071ee5..6bde0f05df96 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileSharesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/FileSharesClientImpl.java
@@ -70,7 +70,7 @@ public final class FileSharesClientImpl implements FileSharesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientFileShares")
     public interface FileSharesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/LocalUsersOperationsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/LocalUsersOperationsClientImpl.java
index c0f1fcc07c23..eea22f393e53 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/LocalUsersOperationsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/LocalUsersOperationsClientImpl.java
@@ -67,7 +67,7 @@ public final class LocalUsersOperationsClientImpl implements LocalUsersOperation
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientLocalUsersOperations")
     public interface LocalUsersOperationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/localUsers")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ManagementPoliciesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ManagementPoliciesClientImpl.java
index 5cecd95e2a9c..a66c4de9eeb4 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ManagementPoliciesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ManagementPoliciesClientImpl.java
@@ -59,7 +59,7 @@ public final class ManagementPoliciesClientImpl implements ManagementPoliciesCli
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientManagementPolicies")
     public interface ManagementPoliciesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/NetworkSecurityPerimeterConfigurationsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/NetworkSecurityPerimeterConfigurationsClientImpl.java
index 323a9f9f725f..72b04dbdecf7 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/NetworkSecurityPerimeterConfigurationsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/NetworkSecurityPerimeterConfigurationsClientImpl.java
@@ -68,7 +68,7 @@ public final class NetworkSecurityPerimeterConfigurationsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientNetworkSecurityPerimeterConfigurations")
     public interface NetworkSecurityPerimeterConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/networkSecurityPerimeterConfigurations")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ObjectReplicationPoliciesOperationsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ObjectReplicationPoliciesOperationsClientImpl.java
index 325947195e2e..906a8df32a5c 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ObjectReplicationPoliciesOperationsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/ObjectReplicationPoliciesOperationsClientImpl.java
@@ -63,7 +63,7 @@ public final class ObjectReplicationPoliciesOperationsClientImpl implements Obje
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientObjectReplicationPoliciesOperations")
     public interface ObjectReplicationPoliciesOperationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/objectReplicationPolicies")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/OperationsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/OperationsClientImpl.java
index bd848f2f5e5d..4881ac3a47b6 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/OperationsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/OperationsClientImpl.java
@@ -59,7 +59,7 @@ public final class OperationsClientImpl implements OperationsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientOperations")
     public interface OperationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/providers/Microsoft.Storage/operations")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateEndpointConnectionsClientImpl.java
index 21762afffb5f..c74f4cf40603 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -63,7 +63,7 @@ public final class PrivateEndpointConnectionsClientImpl implements PrivateEndpoi
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientPrivateEndpointConnections")
     public interface PrivateEndpointConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/privateEndpointConnections")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateLinkResourcesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateLinkResourcesClientImpl.java
index eb9e8fe7a1cf..eb1142802449 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateLinkResourcesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/PrivateLinkResourcesClientImpl.java
@@ -55,7 +55,7 @@ public final class PrivateLinkResourcesClientImpl implements PrivateLinkResource
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientPrivateLinkResources")
     public interface PrivateLinkResourcesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/privateLinkResources")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueueServicesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueueServicesClientImpl.java
index 6a7a1dc29ca6..721c002d6fdc 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueueServicesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueueServicesClientImpl.java
@@ -58,7 +58,7 @@ public final class QueueServicesClientImpl implements QueueServicesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientQueueServices")
     public interface QueueServicesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueuesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueuesClientImpl.java
index c10fbe5d7b93..5fcb103bbb2c 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueuesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/QueuesClientImpl.java
@@ -64,7 +64,7 @@ public final class QueuesClientImpl implements QueuesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientQueues")
     public interface QueuesService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/default/queues/{queueName}")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/SkusClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/SkusClientImpl.java
index 41a18187d13e..6cc7a0888d82 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/SkusClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/SkusClientImpl.java
@@ -59,7 +59,7 @@ public final class SkusClientImpl implements SkusClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientSkus")
     public interface SkusService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/skus")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageAccountsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageAccountsClientImpl.java
index 6ce2ba49fc61..a0f3c32a6f68 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageAccountsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageAccountsClientImpl.java
@@ -91,7 +91,7 @@ public final class StorageAccountsClientImpl implements InnerSupportsGet<Storage
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientStorageAccounts")
     public interface StorageAccountsService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentInstancesReportsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentInstancesReportsClientImpl.java
index f05fbd59a944..5343aa4f7c02 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentInstancesReportsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentInstancesReportsClientImpl.java
@@ -62,7 +62,7 @@ public final class StorageTaskAssignmentInstancesReportsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientStorageTaskAssignmentInstancesReports")
     public interface StorageTaskAssignmentInstancesReportsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments/{storageTaskAssignmentName}/reports")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsClientImpl.java
index 4cc948814fce..bc2888e31346 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsClientImpl.java
@@ -70,7 +70,7 @@ public final class StorageTaskAssignmentsClientImpl implements StorageTaskAssign
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientStorageTaskAssignments")
     public interface StorageTaskAssignmentsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments/{storageTaskAssignmentName}")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsInstancesReportsClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsInstancesReportsClientImpl.java
index d19bf517e287..dc9c280d75fe 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsInstancesReportsClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/StorageTaskAssignmentsInstancesReportsClientImpl.java
@@ -62,7 +62,7 @@ public final class StorageTaskAssignmentsInstancesReportsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientStorageTaskAssignmentsInstancesReports")
     public interface StorageTaskAssignmentsInstancesReportsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/reports")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TableServicesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TableServicesClientImpl.java
index 5e4200d3ac12..6de5f9d82a3a 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TableServicesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TableServicesClientImpl.java
@@ -58,7 +58,7 @@ public final class TableServicesClientImpl implements TableServicesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientTableServices")
     public interface TableServicesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TablesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TablesClientImpl.java
index 8a87d9c6d50e..b567a3c9b0f6 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TablesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/TablesClientImpl.java
@@ -63,7 +63,7 @@ public final class TablesClientImpl implements TablesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientTables")
     public interface TablesService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/default/tables/{tableName}")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/UsagesClientImpl.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/UsagesClientImpl.java
index a64f75932d29..67dd193de88a 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/UsagesClientImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/implementation/UsagesClientImpl.java
@@ -59,7 +59,7 @@ public final class UsagesClientImpl implements UsagesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "StorageManagementCli")
+    @ServiceInterface(name = "StorageManagementClientUsages")
     public interface UsagesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/locations/{location}/usages")
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/models/TriggerParameters.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/models/TriggerParameters.java
index f703b76b67f5..9efb2f6ec72d 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/models/TriggerParameters.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/models/TriggerParameters.java
@@ -44,7 +44,7 @@ public final class TriggerParameters implements JsonSerializable<TriggerParamete
     private OffsetDateTime endBy;
 
     /*
-     * When to start task execution. This is an optional field when ExecutionTrigger.properties.type is 'RunOnce'; this
+     * When to start task execution. This is a required field when ExecutionTrigger.properties.type is 'RunOnce'; this
      * property should not be present when ExecutionTrigger.properties.type is 'OnSchedule'
      */
     private OffsetDateTime startOn;
@@ -152,7 +152,7 @@ public TriggerParameters withEndBy(OffsetDateTime endBy) {
     }
 
     /**
-     * Get the startOn property: When to start task execution. This is an optional field when
+     * Get the startOn property: When to start task execution. This is a required field when
      * ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
      * ExecutionTrigger.properties.type is 'OnSchedule'.
      * 
@@ -163,7 +163,7 @@ public OffsetDateTime startOn() {
     }
 
     /**
-     * Set the startOn property: When to start task execution. This is an optional field when
+     * Set the startOn property: When to start task execution. This is a required field when
      * ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
      * ExecutionTrigger.properties.type is 'OnSchedule'.
      * 
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/ImmutabilityPolicyTests.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/ImmutabilityPolicyTests.java
index 47dcde7253dd..00da75b3b949 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/ImmutabilityPolicyTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/ImmutabilityPolicyTests.java
@@ -37,6 +37,7 @@ public void canCRUDImmutabilityPolicy() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         BlobContainer container = storageManager.blobContainers()
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountNetworkRuleTests.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountNetworkRuleTests.java
index 52a99df4a1f9..f72465ce56a6 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountNetworkRuleTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountNetworkRuleTests.java
@@ -38,6 +38,7 @@ public void canConfigureNetworkRulesWithCreate() throws Exception {
             .define(saName1)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertNotNull(storageAccount1.networkSubnetsWithAccess());
@@ -61,6 +62,7 @@ public void canConfigureNetworkRulesWithCreate() throws Exception {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(resourceGroup)
             .withAccessFromIpAddress("23.20.0.0")
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertNotNull(storageAccount2.innerModel().networkRuleSet());
@@ -88,6 +90,7 @@ public void canConfigureNetworkRulesWithCreate() throws Exception {
             .withNewResourceGroup(rgName)
             .withAccessFromAllNetworks()
             .withAccessFromIpAddress("23.20.0.0")
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertNotNull(storageAccount3.innerModel().networkRuleSet());
@@ -115,6 +118,7 @@ public void canConfigureNetworkRulesWithCreate() throws Exception {
             .withExistingResourceGroup(resourceGroup)
             .withReadAccessToLogEntriesFromAnyNetwork()
             .withReadAccessToMetricsFromAnyNetwork()
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertNotNull(storageAccount4.innerModel().networkRuleSet());
@@ -145,6 +149,7 @@ public void canConfigureNetworkRulesWithUpdate() throws Exception {
             .define(saName1)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertNotNull(storageAccount1.networkSubnetsWithAccess());
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountOperationsTests.java
index 6b88eeeccec4..fb701f08e830 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountOperationsTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageAccountOperationsTests.java
@@ -60,6 +60,7 @@ public void canCRUDStorageAccount() throws Exception {
             .withHnsEnabled(true)
             .withAzureFilesAadIntegrationEnabled(false)
             .withInfrastructureEncryption()
+            .disableSharedKeyAccess()
             .createAsync();
         StorageAccount storageAccount = resourceStream.block();
         Assertions.assertEquals(rgName, storageAccount.resourceGroupName());
@@ -130,6 +131,7 @@ public void canEnableLargeFileSharesOnStorageAccount() throws Exception {
             .withNewResourceGroup(rgName)
             .withSku(StorageAccountSkuType.STANDARD_LRS)
             .withLargeFileShares(true)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertTrue(storageAccount.isLargeFileSharesEnabled());
@@ -144,21 +146,23 @@ public void storageAccountDefault() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertEquals(Kind.STORAGE_V2, storageAccountDefault.kind());
         Assertions.assertEquals(SkuName.STANDARD_RAGRS, storageAccountDefault.skuType().name());
         Assertions.assertTrue(storageAccountDefault.isHttpsTrafficOnly());
         Assertions.assertEquals(MinimumTlsVersion.TLS1_2, storageAccountDefault.minimumTlsVersion());
-        Assertions.assertTrue(storageAccountDefault.isBlobPublicAccessAllowed());
-        Assertions.assertTrue(storageAccountDefault.isSharedKeyAccessAllowed());
+        Assertions.assertFalse(storageAccountDefault.isBlobPublicAccessAllowed());
+        Assertions.assertFalse(storageAccountDefault.isSharedKeyAccessAllowed());
 
         // update to non-default
         StorageAccount storageAccount = storageAccountDefault.update()
             .withHttpAndHttpsTraffic()
             .withMinimumTlsVersion(MinimumTlsVersion.TLS1_1)
             .disableBlobPublicAccess()
-            .disableSharedKeyAccess()
+            // Azure policy enforces shared key access to be disabled
+            //            .disableSharedKeyAccess()
             .apply();
 
         Assertions.assertTrue(storageAccount.isHttpsTrafficOnly());
@@ -175,7 +179,6 @@ public void storageAccountDefault() {
             .withGeneralPurposeAccountKind()
             .withHttpAndHttpsTraffic()
             .withMinimumTlsVersion(MinimumTlsVersion.TLS1_1)
-            .disableBlobPublicAccess()
             .disableSharedKeyAccess()
             .create();
 
@@ -194,6 +197,7 @@ public void canAllowCrossTenantReplicationOnStorageAccount() {
             .withRegion(Region.US_EAST2)
             .withNewResourceGroup(rgName)
             .withSku(StorageAccountSkuType.STANDARD_LRS)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertFalse(storageAccount.isAllowCrossTenantReplication());
@@ -211,6 +215,7 @@ public void canDisallowCrossTenantReplicationOnStorageAccount() {
             .withNewResourceGroup(rgName)
             .withSku(StorageAccountSkuType.STANDARD_LRS)
             .allowCrossTenantReplication()
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertTrue(storageAccount.isAllowCrossTenantReplication());
@@ -227,6 +232,7 @@ public void canEnableDefaultToOAuthAuthenticationOnStorageAccount() {
             .withRegion(Region.US_EAST2)
             .withNewResourceGroup(rgName)
             .withSku(StorageAccountSkuType.STANDARD_LRS)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertFalse(storageAccount.isDefaultToOAuthAuthentication());
@@ -244,6 +250,7 @@ public void canDisableDefaultToOAuthAuthenticationOnStorageAccount() {
             .withNewResourceGroup(rgName)
             .withSku(StorageAccountSkuType.STANDARD_LRS)
             .enableDefaultToOAuthAuthentication()
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertTrue(storageAccount.isDefaultToOAuthAuthentication());
@@ -262,6 +269,7 @@ public void createStorageAccountWithSystemAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.SYSTEM_ASSIGNED, storageAccount.innerModel().identity().type());
         Assertions.assertNotNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -276,6 +284,7 @@ public void updateStorageAccountWithSystemAssigned() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertNull(storageAccount.innerModel().identity());
         Assertions.assertNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -297,6 +306,7 @@ public void updateStorageAccountWithoutSystemAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.SYSTEM_ASSIGNED, storageAccount.innerModel().identity().type());
         Assertions.assertNotNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -324,6 +334,7 @@ public void createStorageAccountWithNewUserAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withNewUserAssignedManagedServiceIdentity(identityCreatable)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertEquals(IdentityType.USER_ASSIGNED, storageAccount.innerModel().identity().type());
@@ -345,6 +356,7 @@ public void updateStorageAccountWithNewUserAssigned() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertNull(storageAccount.innerModel().identity());
@@ -374,6 +386,7 @@ public void createStorageAccountWithExistUserAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withExistingUserAssignedManagedServiceIdentity(defaultIdentity)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertEquals(IdentityType.USER_ASSIGNED, storageAccount.innerModel().identity().type());
@@ -395,6 +408,7 @@ public void updateStorageAccountWithExistUserAssigned() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertNull(storageAccount.innerModel().identity());
@@ -424,6 +438,7 @@ public void updateStorageAccountWithoutUserAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withExistingUserAssignedManagedServiceIdentity(defaultIdentity)
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.USER_ASSIGNED, storageAccount.innerModel().identity().type());
         Assertions.assertNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -451,6 +466,7 @@ public void updateIdentityFromSystemUserAssignedToSystemAssigned() {
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
             .withExistingUserAssignedManagedServiceIdentity(defaultIdentity)
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED,
             storageAccount.innerModel().identity().type());
@@ -479,6 +495,7 @@ public void updateIdentityFromSystemUserAssignedToUserAssigned() {
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
             .withExistingUserAssignedManagedServiceIdentity(defaultIdentity)
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED,
             storageAccount.innerModel().identity().type());
@@ -507,6 +524,7 @@ public void updateIdentityFromSystemUserAssignedToNone() {
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
             .withExistingUserAssignedManagedServiceIdentity(defaultIdentity)
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED,
             storageAccount.innerModel().identity().type());
@@ -537,6 +555,7 @@ public void updateIdentityFromSystemAssignedToUserAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.SYSTEM_ASSIGNED, storageAccount.innerModel().identity().type());
         Assertions.assertNotNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -566,6 +585,7 @@ public void updateIdentityFromUserAssignedToSystemAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withExistingUserAssignedManagedServiceIdentity(defaultIdentity)
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.USER_ASSIGNED, storageAccount.innerModel().identity().type());
         Assertions.assertNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -595,6 +615,7 @@ public void updateIdentityFromUserAssignedToSystemUserAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withExistingUserAssignedManagedServiceIdentity(defaultIdentity)
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.USER_ASSIGNED, storageAccount.innerModel().identity().type());
         Assertions.assertNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -622,6 +643,7 @@ public void updateIdentityFromSystemAssignedToSystemUserAssigned() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(IdentityType.SYSTEM_ASSIGNED, storageAccount.innerModel().identity().type());
         Assertions.assertNotNull(storageAccount.systemAssignedManagedServiceIdentityPrincipalId());
@@ -648,6 +670,7 @@ public void updateIdentityFromNoneToSystemUserAssigned() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         storageAccount.update()
@@ -670,6 +693,7 @@ public void canCreateStorageAccountWithDisabledPublicNetworkAccess() {
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
             .disablePublicNetworkAccess()
+            .disableSharedKeyAccess()
             .create();
         Assertions.assertEquals(PublicNetworkAccess.DISABLED, storageAccount.publicNetworkAccess());
     }
@@ -682,6 +706,7 @@ public void canUpdatePublicNetworkAccess() {
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(rgName)
             .withSystemAssignedManagedServiceIdentity()
+            .disableSharedKeyAccess()
             .create();
         storageAccount.update().disablePublicNetworkAccess().apply();
         Assertions.assertEquals(PublicNetworkAccess.DISABLED, storageAccount.publicNetworkAccess());
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobContainersTests.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobContainersTests.java
index 6dcb37b8b506..a55bbe0ba3d4 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobContainersTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobContainersTests.java
@@ -11,10 +11,7 @@
 import com.azure.resourcemanager.authorization.models.BuiltInRole;
 import com.azure.resourcemanager.authorization.models.RoleAssignment;
 import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
-import com.azure.resourcemanager.storage.models.BlobContainer;
-import com.azure.resourcemanager.storage.models.BlobContainers;
-import com.azure.resourcemanager.storage.models.PublicAccess;
-import com.azure.resourcemanager.storage.models.StorageAccount;
+import com.azure.resourcemanager.storage.models.*;
 import com.azure.storage.blob.BlobContainerClient;
 import com.azure.storage.blob.BlobServiceClient;
 import com.azure.storage.blob.BlobServiceClientBuilder;
@@ -54,18 +51,23 @@ public void canCreateBlobContainer() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .withSku(StorageAccountSkuType.STANDARD_LRS)
+            .disableSharedKeyAccess()
+            // It's not taking effect during storage account creation. Not sure if it's a bug.
+            //            .enableBlobPublicAccess()
             .create();
 
         BlobContainers blobContainers = this.storageManager.blobContainers();
         BlobContainer blobContainer = blobContainers.defineContainer("blob-test")
             .withExistingStorageAccount(rgName, saName)
-            .withPublicAccess(PublicAccess.CONTAINER)
+            .withPublicAccess(PublicAccess.NONE)
+            //            .withPublicAccess(PublicAccess.CONTAINER)
             .withMetadata("a", "b")
             .withMetadata("c", "d")
             .create();
 
         Assertions.assertEquals("blob-test", blobContainer.name());
-        Assertions.assertEquals(PublicAccess.CONTAINER, blobContainer.publicAccess());
+        Assertions.assertEquals(PublicAccess.NONE, blobContainer.publicAccess());
         Assertions.assertEquals(metadataTest, blobContainer.metadata());
     }
 
@@ -84,23 +86,28 @@ public void canUpdateBlobContainer() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
+            // It's not taking effect during storage account creation. Not sure if it's a bug.
+            //            .enableBlobPublicAccess()
             .create();
 
         BlobContainers blobContainers = this.storageManager.blobContainers();
         BlobContainer blobContainer = blobContainers.defineContainer("blob-test")
             .withExistingStorageAccount(rgName, saName)
-            .withPublicAccess(PublicAccess.CONTAINER)
+            .withPublicAccess(PublicAccess.NONE)
+            //            .withPublicAccess(PublicAccess.CONTAINER)
             .withMetadata(metadataInitial)
             .create();
 
         blobContainer.update()
-            .withPublicAccess(PublicAccess.BLOB)
+            //            .withPublicAccess(PublicAccess.BLOB)
+            .withPublicAccess(PublicAccess.NONE)
             .withMetadata("c", "d")
             .withMetadata("e", "f")
             .apply();
 
         Assertions.assertEquals("blob-test", blobContainer.name());
-        Assertions.assertEquals(PublicAccess.BLOB, blobContainer.publicAccess());
+        Assertions.assertEquals(PublicAccess.NONE, blobContainer.publicAccess());
         Assertions.assertEquals(metadataTest, blobContainer.metadata());
     }
 
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobServicesTests.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobServicesTests.java
index 7ff681a69e40..d3885ce0f699 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobServicesTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageBlobServicesTests.java
@@ -40,6 +40,7 @@ public void canCreateBlobServices() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         BlobServices blobServices = this.storageManager.blobServices();
@@ -65,6 +66,7 @@ public void canUpdateBlobServices() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         BlobServices blobServices = this.storageManager.blobServices();
@@ -97,6 +99,7 @@ public void canSpecifyLATTrackingPolicy() {
             .define(saName)
             .withRegion(Region.US_EAST)
             .withNewResourceGroup(rgName)
+            .disableSharedKeyAccess()
             .create();
 
         BlobServices blobServices = this.storageManager.blobServices();
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageManagementPoliciesTests.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageManagementPoliciesTests.java
index 2ea210ef1514..392163941e16 100644
--- a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageManagementPoliciesTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/StorageManagementPoliciesTests.java
@@ -48,6 +48,7 @@ public void canCreateManagementPolicies() {
             .withNewResourceGroup(rgName)
             .withBlobStorageAccountKind()
             .withAccessTier(AccessTier.COOL)
+            .disableSharedKeyAccess()
             .create();
 
         ManagementPolicies managementPolicies = this.storageManager.managementPolicies();
@@ -127,6 +128,7 @@ public void managementPolicyGetters() {
             .withNewResourceGroup(rgName)
             .withBlobStorageAccountKind()
             .withAccessTier(AccessTier.COOL)
+            .disableSharedKeyAccess()
             .create();
 
         ManagementPolicies managementPolicies = this.storageManager.managementPolicies();
@@ -180,6 +182,7 @@ public void canUpdateManagementPolicy() {
             .withNewResourceGroup(rgName)
             .withBlobStorageAccountKind()
             .withAccessTier(AccessTier.COOL)
+            .disableSharedKeyAccess()
             .create();
 
         ManagementPolicies managementPolicies = this.storageManager.managementPolicies();
@@ -236,6 +239,7 @@ public void testLcmBaseBlobActionsWithPremiumAccount() {
             .withNewResourceGroup(rgName)
             .withSku(StorageAccountSkuType.PREMIUM_LRS)
             .withBlockBlobStorageAccountKind()
+            .disableSharedKeyAccess()
             .create();
 
         Assertions.assertEquals(StorageAccountSkuType.PREMIUM_LRS.name(), storageAccount.skuType().name());