diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json
index 1be4c1dbac9e..2dc932fdf7c8 100644
--- a/common/config/rush/common-versions.json
+++ b/common/config/rush/common-versions.json
@@ -41,11 +41,11 @@
    * This design avoids unnecessary churn in this file.
    */
   "allowedAlternativeVersions": {
-    // "^12.4.1" is required for eventhubs-checkpointstore-blob to use the latest GA version
+    // "^12.5.0" is required for eventhubs-checkpointstore-blob to use the latest GA version
     // when there is a new beta version which is being maintained in the repo.
-    // Remove "^12.4.1" when the storage-blob releases a stable version.
+    // Remove "^12.5.0" when the storage-blob releases a stable version.
     // Add a new entry in case a new version is being tested through the perf tests (Example: "12.2.0").
-    "@azure/storage-blob": ["^12.4.1"],
+    "@azure/storage-blob": ["^12.5.0"],
     "@azure/ms-rest-js": ["^2.0.0"],
     /**
      * For example, allow some projects to use an older TypeScript compiler
diff --git a/sdk/eventhub/eventhubs-checkpointstore-blob/package.json b/sdk/eventhub/eventhubs-checkpointstore-blob/package.json
index 0264b9a55c6d..e024f8211025 100644
--- a/sdk/eventhub/eventhubs-checkpointstore-blob/package.json
+++ b/sdk/eventhub/eventhubs-checkpointstore-blob/package.json
@@ -63,7 +63,7 @@
     "@azure/abort-controller": "^1.0.0",
     "@azure/event-hubs": "^5.5.0",
     "@azure/logger": "^1.0.0",
-    "@azure/storage-blob": "^12.4.1",
+    "@azure/storage-blob": "^12.5.0",
     "events": "^3.0.0",
     "tslib": "^2.0.0"
   },
diff --git a/sdk/quantum/quantum-jobs/package.json b/sdk/quantum/quantum-jobs/package.json
index a0b6cbb8154e..e7724bb92ae2 100644
--- a/sdk/quantum/quantum-jobs/package.json
+++ b/sdk/quantum/quantum-jobs/package.json
@@ -70,7 +70,7 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@azure/storage-blob": "^12.5.0",
+    "@azure/storage-blob": "^12.6.0-beta.1",
     "@azure/dev-tool": "^1.0.0",
     "@azure/eslint-plugin-azure-sdk": "^3.0.0",
     "@azure/identity": "^1.1.0",
diff --git a/sdk/storage/perf-tests/storage-blob/package.json b/sdk/storage/perf-tests/storage-blob/package.json
index 4d1634d35218..6ea2c069df91 100644
--- a/sdk/storage/perf-tests/storage-blob/package.json
+++ b/sdk/storage/perf-tests/storage-blob/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@azure/core-http": "^1.2.0",
     "@azure/core-rest-pipeline": "^1.0.0",
-    "@azure/storage-blob": "^12.5.0",
+    "@azure/storage-blob": "^12.6.0-beta.1",
     "@azure/test-utils-perfstress": "^1.0.0",
     "dotenv": "^8.2.0",
     "uuid": "^8.3.0"
diff --git a/sdk/storage/perf-tests/storage-file-datalake/package.json b/sdk/storage/perf-tests/storage-file-datalake/package.json
index b7f24ee9343b..3002d729d2f2 100644
--- a/sdk/storage/perf-tests/storage-file-datalake/package.json
+++ b/sdk/storage/perf-tests/storage-file-datalake/package.json
@@ -7,7 +7,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@azure/storage-file-datalake": "^12.4.0",
+    "@azure/storage-file-datalake": "^12.5.0-beta.1",
     "@azure/test-utils-perfstress": "^1.0.0",
     "dotenv": "^8.2.0",
     "uuid": "^8.3.0"
diff --git a/sdk/storage/storage-blob-changefeed/package.json b/sdk/storage/storage-blob-changefeed/package.json
index bfefce7b1730..ad8e282946d9 100644
--- a/sdk/storage/storage-blob-changefeed/package.json
+++ b/sdk/storage/storage-blob-changefeed/package.json
@@ -94,7 +94,7 @@
     ]
   },
   "dependencies": {
-    "@azure/storage-blob": "^12.4.1",
+    "@azure/storage-blob": "^12.6.0-beta.1",
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-http": "^1.2.0",
     "@azure/core-lro": "^1.0.2",
diff --git a/sdk/storage/storage-blob/CHANGELOG.md b/sdk/storage/storage-blob/CHANGELOG.md
index 2efdf6ef028a..a58cbc0bea8c 100644
--- a/sdk/storage/storage-blob/CHANGELOG.md
+++ b/sdk/storage/storage-blob/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
-## 12.5.1 (Unreleased)
+## 12.6.0-beta.1 (2021-05-14)
 
+- Updated Azure Storage Service API version to 2020-08-04.
 - Deprecated `destinationContainerName` in `ServiceUndeleteContainerOptions` for `BlobServiceClient.undeleteContainer()`.
 
 ## 12.5.0 (2021-03-10)
diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index bfb5157e381e..f907668c9064 100644
--- a/sdk/storage/storage-blob/package.json
+++ b/sdk/storage/storage-blob/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azure/storage-blob",
   "sdk-type": "client",
-  "version": "12.5.1",
+  "version": "12.6.0-beta.1",
   "description": "Microsoft Azure Storage SDK for JavaScript - Blob",
   "main": "./dist/index.js",
   "module": "./dist-esm/storage-blob/src/index.js",
@@ -33,7 +33,7 @@
   },
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
-    "build:autorest": "autorest ./swagger/README.md --typescript --package-version=12.5.1",
+    "build:autorest": "autorest ./swagger/README.md --typescript --package-version=12.6.0-beta.1",
     "build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
     "build:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1",
     "build:nodebrowser": "rollup -c 2>&1",
diff --git a/sdk/storage/storage-blob/src/generated/src/models/parameters.ts b/sdk/storage/storage-blob/src/generated/src/models/parameters.ts
index f00364ab1c73..4c11f79f5488 100644
--- a/sdk/storage/storage-blob/src/generated/src/models/parameters.ts
+++ b/sdk/storage/storage-blob/src/generated/src/models/parameters.ts
@@ -103,7 +103,7 @@ export const timeoutInSeconds: OperationQueryParameter = {
 export const version: OperationParameter = {
   parameterPath: "version",
   mapper: {
-    defaultValue: "2020-06-12",
+    defaultValue: "2020-08-04",
     isConstant: true,
     serializedName: "x-ms-version",
     type: {
diff --git a/sdk/storage/storage-blob/src/generated/src/storageClientContext.ts b/sdk/storage/storage-blob/src/generated/src/storageClientContext.ts
index d3b8e54fbe09..eadc7a75d318 100644
--- a/sdk/storage/storage-blob/src/generated/src/storageClientContext.ts
+++ b/sdk/storage/storage-blob/src/generated/src/storageClientContext.ts
@@ -10,7 +10,7 @@ import * as coreHttp from "@azure/core-http";
 import { StorageClientOptionalParams } from "./models";
 
 const packageName = "azure-storage-blob";
-const packageVersion = "12.5.1";
+const packageVersion = "12.6.0-beta.1";
 
 export class StorageClientContext extends coreHttp.ServiceClient {
   url: string;
@@ -47,6 +47,6 @@ export class StorageClientContext extends coreHttp.ServiceClient {
     this.url = url;
 
     // Assigning values to Constant parameters
-    this.version = options.version || "2020-06-12";
+    this.version = options.version || "2020-08-04";
   }
 }
diff --git a/sdk/storage/storage-blob/src/utils/constants.ts b/sdk/storage/storage-blob/src/utils/constants.ts
index e6e1f7541f2f..c2303db51346 100644
--- a/sdk/storage/storage-blob/src/utils/constants.ts
+++ b/sdk/storage/storage-blob/src/utils/constants.ts
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "12.5.1";
-export const SERVICE_VERSION: string = "2020-06-12";
+export const SDK_VERSION: string = "12.6.0-beta.1";
+export const SERVICE_VERSION: string = "2020-08-04";
 
 export const BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES: number = 256 * 1024 * 1024; // 256MB
 export const BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES: number = 4000 * 1024 * 1024; // 4000MB
diff --git a/sdk/storage/storage-blob/swagger/README.md b/sdk/storage/storage-blob/swagger/README.md
index 007621e87c2c..987b6279d289 100644
--- a/sdk/storage/storage-blob/swagger/README.md
+++ b/sdk/storage/storage-blob/swagger/README.md
@@ -1258,4 +1258,13 @@ directive:
       delete $.properties["AllowPermanentDelete"];
 ```
 
+### Update service version from "2020-06-12" to "2020-08-04"
+
+```yaml
+directive:
+  - from: swagger-document
+    where: $.parameters.ApiVersionParameter
+    transform: $.enum = [ "2020-08-04" ];
+```
+
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fstorage%2Fstorage-blob%2Fswagger%2FREADME.png)
diff --git a/sdk/storage/storage-file-datalake/CHANGELOG.md b/sdk/storage/storage-file-datalake/CHANGELOG.md
index d17c6a19fd1c..12ecbc865926 100644
--- a/sdk/storage/storage-file-datalake/CHANGELOG.md
+++ b/sdk/storage/storage-file-datalake/CHANGELOG.md
@@ -1,7 +1,9 @@
 # Release History
 
-## 12.4.1 (Unreleased)
+## 12.5.0-beta.1 (2021-05-14)
 
+- Updated Azure Storage Service API version to 2020-08-04.
+- Added support for Path Soft Delete. You can list the deleted paths via `DataLakeFileSystemClient.listDeletedPaths()`, and restore a deleted path via `DataLakeFileSystemClient.undeletePath()`.
 - Deprecated `destinationFileSystemName` in `ServiceUndeleteFileSystemOptions` for `DataLakeServiceClient.undeleteFileSystem()`.
 
 ## 12.4.0 (2021-03-10)
diff --git a/sdk/storage/storage-file-datalake/package.json b/sdk/storage/storage-file-datalake/package.json
index edcd0b464732..dcc9e70ad108 100644
--- a/sdk/storage/storage-file-datalake/package.json
+++ b/sdk/storage/storage-file-datalake/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure/storage-file-datalake",
-  "version": "12.4.1",
+  "version": "12.5.0-beta.1",
   "description": "Microsoft Azure Storage SDK for JavaScript - DataLake",
   "sdk-type": "client",
   "main": "./dist/index.js",
@@ -103,7 +103,7 @@
     "@azure/core-paging": "^1.1.1",
     "@azure/core-tracing": "1.0.0-preview.11",
     "@azure/logger": "^1.0.0",
-    "@azure/storage-blob": "^12.5.0",
+    "@azure/storage-blob": "^12.6.0-beta.1",
     "events": "^3.0.0",
     "tslib": "^2.0.0"
   },
diff --git a/sdk/storage/storage-file-datalake/src/generated/src/models/parameters.ts b/sdk/storage/storage-file-datalake/src/generated/src/models/parameters.ts
index 9c5143ecd184..eae6bf15a72d 100644
--- a/sdk/storage/storage-file-datalake/src/generated/src/models/parameters.ts
+++ b/sdk/storage/storage-file-datalake/src/generated/src/models/parameters.ts
@@ -114,7 +114,7 @@ export const timeout: OperationQueryParameter = {
 export const version: OperationParameter = {
   parameterPath: "version",
   mapper: {
-    defaultValue: "2020-06-12",
+    defaultValue: "2020-08-04",
     isConstant: true,
     serializedName: "x-ms-version",
     type: {
diff --git a/sdk/storage/storage-file-datalake/src/generated/src/storageClientContext.ts b/sdk/storage/storage-file-datalake/src/generated/src/storageClientContext.ts
index 9876770800bf..4360a5939bc2 100644
--- a/sdk/storage/storage-file-datalake/src/generated/src/storageClientContext.ts
+++ b/sdk/storage/storage-file-datalake/src/generated/src/storageClientContext.ts
@@ -48,7 +48,7 @@ export class StorageClientContext extends coreHttp.ServiceClient {
     this.url = url;
 
     // Assigning values to Constant parameters
-    this.version = options.version || "2020-06-12";
+    this.version = options.version || "2020-08-04";
     this.resource = options.resource || "filesystem";
   }
 }
diff --git a/sdk/storage/storage-file-datalake/src/utils/constants.ts b/sdk/storage/storage-file-datalake/src/utils/constants.ts
index 8c7c5e5fe7d3..ea406316b05a 100644
--- a/sdk/storage/storage-file-datalake/src/utils/constants.ts
+++ b/sdk/storage/storage-file-datalake/src/utils/constants.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "12.4.1";
+export const SDK_VERSION: string = "12.5.0-beta.1";
 export const SERVICE_VERSION: string = "2020-06-12";
 
 export const KB: number = 1024;
diff --git a/sdk/storage/storage-file-datalake/swagger/README.md b/sdk/storage/storage-file-datalake/swagger/README.md
index e414ed94780b..bc40be0682b9 100644
--- a/sdk/storage/storage-file-datalake/swagger/README.md
+++ b/sdk/storage/storage-file-datalake/swagger/README.md
@@ -261,3 +261,12 @@ directive:
     transform: >
       delete $["x-ms-pageable"];
 ```
+
+### Update service version from "2020-06-12" to "2020-08-04"
+
+```yaml
+directive:
+  - from: swagger-document
+    where: $.parameters.ApiVersionParameter
+    transform: $.enum = [ "2020-08-04" ];
+```