diff --git a/sdk/storagepool/azure-resourcemanager-storagepool/CHANGELOG.md b/sdk/storagepool/azure-resourcemanager-storagepool/CHANGELOG.md
index 0e809f384505..d6cf3dcad82f 100644
--- a/sdk/storagepool/azure-resourcemanager-storagepool/CHANGELOG.md
+++ b/sdk/storagepool/azure-resourcemanager-storagepool/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.1 (2021-12-08)
+
+- Azure Resource Manager StoragePool client library for Java. This package contains Microsoft Azure SDK for StoragePool Management SDK.  Package tag package-2021-08-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Features Added
 
diff --git a/sdk/storagepool/azure-resourcemanager-storagepool/README.md b/sdk/storagepool/azure-resourcemanager-storagepool/README.md
index ad38a4014f39..afafc9f7b3d3 100644
--- a/sdk/storagepool/azure-resourcemanager-storagepool/README.md
+++ b/sdk/storagepool/azure-resourcemanager-storagepool/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-storagepool</artifactId>
-    <version>1.0.0-beta.1</version>
+    <version>1.0.0-beta.2</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/StoragePoolManager.java b/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/StoragePoolManager.java
index 688d1c5bcc7d..2b118709c10e 100644
--- a/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/StoragePoolManager.java
+++ b/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/StoragePoolManager.java
@@ -8,6 +8,7 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.policy.AddDatePolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
@@ -37,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /** Entry point to StoragePoolManager. */
 public final class StoragePoolManager {
@@ -209,11 +211,24 @@ public StoragePoolManager authenticate(TokenCredential credential, AzureProfile
             List<HttpPipelinePolicy> policies = new ArrayList<>();
             policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
             policies.add(new RequestIdPolicy());
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
             policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
-            policies.addAll(this.policies);
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));
             HttpPipeline httpPipeline =
diff --git a/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/DiskPoolsClientImpl.java b/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/DiskPoolsClientImpl.java
index 2db590d3ff09..e85e444ebdf7 100644
--- a/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/DiskPoolsClientImpl.java
+++ b/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/DiskPoolsClientImpl.java
@@ -687,7 +687,11 @@ private PollerFlux<PollResult<DiskPoolInner>, DiskPoolInner> beginCreateOrUpdate
         return this
             .client
             .<DiskPoolInner, DiskPoolInner>getLroResult(
-                mono, this.client.getHttpPipeline(), DiskPoolInner.class, DiskPoolInner.class, Context.NONE);
+                mono,
+                this.client.getHttpPipeline(),
+                DiskPoolInner.class,
+                DiskPoolInner.class,
+                this.client.getContext());
     }
 
     /**
@@ -960,7 +964,11 @@ private PollerFlux<PollResult<DiskPoolInner>, DiskPoolInner> beginUpdateAsync(
         return this
             .client
             .<DiskPoolInner, DiskPoolInner>getLroResult(
-                mono, this.client.getHttpPipeline(), DiskPoolInner.class, DiskPoolInner.class, Context.NONE);
+                mono,
+                this.client.getHttpPipeline(),
+                DiskPoolInner.class,
+                DiskPoolInner.class,
+                this.client.getContext());
     }
 
     /**
@@ -1206,7 +1214,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
         Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, diskPoolName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -1775,7 +1784,8 @@ private PollerFlux<PollResult<Void>, Void> beginStartAsync(String resourceGroupN
         Mono<Response<Flux<ByteBuffer>>> mono = startWithResponseAsync(resourceGroupName, diskPoolName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -2012,7 +2022,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeallocateAsync(String resourceG
         Mono<Response<Flux<ByteBuffer>>> mono = deallocateWithResponseAsync(resourceGroupName, diskPoolName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -2250,7 +2261,8 @@ private PollerFlux<PollResult<Void>, Void> beginUpgradeAsync(String resourceGrou
         Mono<Response<Flux<ByteBuffer>>> mono = upgradeWithResponseAsync(resourceGroupName, diskPoolName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
diff --git a/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/IscsiTargetsClientImpl.java b/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/IscsiTargetsClientImpl.java
index 761c81da39c7..6c77f35d2dab 100644
--- a/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/IscsiTargetsClientImpl.java
+++ b/sdk/storagepool/azure-resourcemanager-storagepool/src/main/java/com/azure/resourcemanager/storagepool/implementation/IscsiTargetsClientImpl.java
@@ -496,7 +496,11 @@ private PollerFlux<PollResult<IscsiTargetInner>, IscsiTargetInner> beginCreateOr
         return this
             .client
             .<IscsiTargetInner, IscsiTargetInner>getLroResult(
-                mono, this.client.getHttpPipeline(), IscsiTargetInner.class, IscsiTargetInner.class, Context.NONE);
+                mono,
+                this.client.getHttpPipeline(),
+                IscsiTargetInner.class,
+                IscsiTargetInner.class,
+                this.client.getContext());
     }
 
     /**
@@ -824,7 +828,11 @@ private PollerFlux<PollResult<IscsiTargetInner>, IscsiTargetInner> beginUpdateAs
         return this
             .client
             .<IscsiTargetInner, IscsiTargetInner>getLroResult(
-                mono, this.client.getHttpPipeline(), IscsiTargetInner.class, IscsiTargetInner.class, Context.NONE);
+                mono,
+                this.client.getHttpPipeline(),
+                IscsiTargetInner.class,
+                IscsiTargetInner.class,
+                this.client.getContext());
     }
 
     /**
@@ -1119,7 +1127,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
             deleteWithResponseAsync(resourceGroupName, diskPoolName, iscsiTargetName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**