diff --git a/sdk/storage/storage-blob/CHANGELOG.md b/sdk/storage/storage-blob/CHANGELOG.md
index 93a4c9d4cd62..7665554f6bd3 100644
--- a/sdk/storage/storage-blob/CHANGELOG.md
+++ b/sdk/storage/storage-blob/CHANGELOG.md
@@ -1,14 +1,10 @@
 # Release History
 
-## 12.18.0-beta.2 (Unreleased)
+## 12.18.0 (2024-05-11)
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Includes all features released in 12.18.0-beta.1.
 
 ## 12.18.0-beta.1 (2024-04-18)
 
diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index 17c5f9f7854d..d3e74eb79780 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.18.0-beta.2",
+  "version": "12.18.0",
   "description": "Microsoft Azure Storage SDK for JavaScript - Blob",
   "main": "./dist/index.js",
   "module": "./dist-esm/storage-blob/src/index.js",
diff --git a/sdk/storage/storage-blob/src/generated/src/storageClientContext.ts b/sdk/storage/storage-blob/src/generated/src/storageClientContext.ts
index 901a91395985..a4303cab5d7d 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.18.0-beta.2";
+const packageVersion = "12.18.0";
 
 export class StorageClientContext extends coreHttp.ServiceClient {
   url: string;
diff --git a/sdk/storage/storage-blob/src/utils/constants.ts b/sdk/storage/storage-blob/src/utils/constants.ts
index c13445eb66e0..4fc5df5e5020 100644
--- a/sdk/storage/storage-blob/src/utils/constants.ts
+++ b/sdk/storage/storage-blob/src/utils/constants.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "12.18.0-beta.2";
+export const SDK_VERSION: string = "12.18.0";
 export const SERVICE_VERSION: string = "2024-05-04";
 
 export const BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES: number = 256 * 1024 * 1024; // 256MB
diff --git a/sdk/storage/storage-blob/swagger/README.md b/sdk/storage/storage-blob/swagger/README.md
index 0702c4ad663d..c94e15ec0881 100644
--- a/sdk/storage/storage-blob/swagger/README.md
+++ b/sdk/storage/storage-blob/swagger/README.md
@@ -20,7 +20,7 @@ disable-async-iterators: true
 add-credentials: false
 use-extension:
   "@autorest/typescript": "6.0.0-dev.20210218.1"
-package-version: 12.18.0-beta.2
+package-version: 12.18.0
 ```
 
 ## Customizations for Track 2 Generator
diff --git a/sdk/storage/storage-blob/test/blobclient.spec.ts b/sdk/storage/storage-blob/test/blobclient.spec.ts
index 813d9d2e1f72..40844a0024fb 100644
--- a/sdk/storage/storage-blob/test/blobclient.spec.ts
+++ b/sdk/storage/storage-blob/test/blobclient.spec.ts
@@ -761,6 +761,8 @@ describe("BlobClient", () => {
     sanitizedQuery2.set("sig", undefined);
     sanitizedExpectedUrl.setQuery(sanitizedQuery.toString());
 
+    console.log(sanitizedActualUrl.toString());    
+    console.log(sanitizedExpectedUrl.toString());
     assert.strictEqual(
       sanitizedActualUrl.toString(),
       sanitizedExpectedUrl.toString(),
diff --git a/sdk/storage/storage-blob/tests.yml b/sdk/storage/storage-blob/tests.yml
index 296394432f09..6b787eb75c3d 100644
--- a/sdk/storage/storage-blob/tests.yml
+++ b/sdk/storage/storage-blob/tests.yml
@@ -1,7 +1,7 @@
 trigger: none
 
-stages:
-  - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
+extends:
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       PackageName: "@azure/storage-blob"
       ServiceDirectory: storage
diff --git a/sdk/storage/storage-file-datalake/CHANGELOG.md b/sdk/storage/storage-file-datalake/CHANGELOG.md
index dfab1ae6040c..212e9be29905 100644
--- a/sdk/storage/storage-file-datalake/CHANGELOG.md
+++ b/sdk/storage/storage-file-datalake/CHANGELOG.md
@@ -1,14 +1,10 @@
 # Release History
 
-## 12.17.0-beta.2 (Unreleased)
+## 12.17.0 (2024-05-11)
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Includes all features released in 12.17.0.
 
 ## 12.17.0-beta.1 (2024-04-18)
 
diff --git a/sdk/storage/storage-file-datalake/package.json b/sdk/storage/storage-file-datalake/package.json
index 73e573cbc94f..44ab8ea27bd3 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.17.0-beta.2",
+  "version": "12.17.0",
   "description": "Microsoft Azure Storage SDK for JavaScript - DataLake",
   "sdk-type": "client",
   "main": "./dist/index.js",
@@ -122,7 +122,7 @@
     "@azure/core-paging": "^1.1.1",
     "@azure/core-tracing": "1.0.0-preview.13",
     "@azure/logger": "^1.0.0",
-    "@azure/storage-blob": "^12.18.0-beta.1",
+    "@azure/storage-blob": "^12.18.0",
     "events": "^3.0.0",
     "tslib": "^2.2.0"
   },
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 04fceaab225a..d7e83cbc8e53 100644
--- a/sdk/storage/storage-file-datalake/src/generated/src/storageClientContext.ts
+++ b/sdk/storage/storage-file-datalake/src/generated/src/storageClientContext.ts
@@ -10,7 +10,7 @@ import * as coreHttp from "@azure/core-http";
 import { StorageClientOptionalParams } from "./models";
 
 const packageName = "azure-storage-datalake";
-const packageVersion = "12.17.0-beta.2";
+const packageVersion = "12.17.0";
 
 export class StorageClientContext extends coreHttp.ServiceClient {
   url: string;
diff --git a/sdk/storage/storage-file-datalake/src/utils/constants.ts b/sdk/storage/storage-file-datalake/src/utils/constants.ts
index 4a5e84a100b8..f257022b92ce 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.17.0-beta.2";
+export const SDK_VERSION: string = "12.17.0";
 export const SERVICE_VERSION: string = "2024-05-04";
 
 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 22845008ee04..c582fb98eef2 100644
--- a/sdk/storage/storage-file-datalake/swagger/README.md
+++ b/sdk/storage/storage-file-datalake/swagger/README.md
@@ -20,7 +20,7 @@ disable-async-iterators: true
 add-credentials: false
 use-extension:
   "@autorest/typescript": "6.0.0-dev.20210223.1"
-package-version: 12.17.0-beta.2
+package-version: 12.17.0
 ```
 
 ## Customizations for Track 2 Generator
diff --git a/sdk/storage/storage-file-datalake/tests.yml b/sdk/storage/storage-file-datalake/tests.yml
index 8c3caf64e197..c364eaac6d4b 100644
--- a/sdk/storage/storage-file-datalake/tests.yml
+++ b/sdk/storage/storage-file-datalake/tests.yml
@@ -1,7 +1,7 @@
 trigger: none
 
-stages:
-  - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
+extends:
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       PackageName: "@azure/storage-file-datalake"
       ServiceDirectory: storage
diff --git a/sdk/storage/storage-file-share/CHANGELOG.md b/sdk/storage/storage-file-share/CHANGELOG.md
index d869535b3cba..137503a53c6a 100644
--- a/sdk/storage/storage-file-share/CHANGELOG.md
+++ b/sdk/storage/storage-file-share/CHANGELOG.md
@@ -1,14 +1,10 @@
 # Release History
 
-## 12.18.1-beta.2 (Unreleased)
+## 12.18.1 (2024-05-11)
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Includes all features released in 12.18.1-beta.1.
 
 ## 12.18.1-beta.1 (2024-04-18)
 
diff --git a/sdk/storage/storage-file-share/package.json b/sdk/storage/storage-file-share/package.json
index 15c0f12692a3..5d2988921aa0 100644
--- a/sdk/storage/storage-file-share/package.json
+++ b/sdk/storage/storage-file-share/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azure/storage-file-share",
   "sdk-type": "client",
-  "version": "12.18.1-beta.2",
+  "version": "12.18.1",
   "description": "Microsoft Azure Storage SDK for JavaScript - File",
   "main": "./dist/index.js",
   "module": "./dist-esm/src/index.js",
diff --git a/sdk/storage/storage-file-share/src/generated/src/storageClientContext.ts b/sdk/storage/storage-file-share/src/generated/src/storageClientContext.ts
index 9f3b4970fb16..43db35acbf09 100644
--- a/sdk/storage/storage-file-share/src/generated/src/storageClientContext.ts
+++ b/sdk/storage/storage-file-share/src/generated/src/storageClientContext.ts
@@ -10,7 +10,7 @@ import * as coreHttp from "@azure/core-http";
 import { StorageClientOptionalParams } from "./models";
 
 const packageName = "azure-storage-file-share";
-const packageVersion = "12.18.1-beta.2";
+const packageVersion = "12.18.1";
 
 export class StorageClientContext extends coreHttp.ServiceClient {
   url: string;
diff --git a/sdk/storage/storage-file-share/src/utils/constants.ts b/sdk/storage/storage-file-share/src/utils/constants.ts
index 382922e0b77a..953779813d63 100644
--- a/sdk/storage/storage-file-share/src/utils/constants.ts
+++ b/sdk/storage/storage-file-share/src/utils/constants.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "12.18.1-beta.2";
+export const SDK_VERSION: string = "12.18.1";
 export const SERVICE_VERSION: string = "2024-05-04";
 
 export const FILE_MAX_SIZE_BYTES: number = 4 * 1024 * 1024 * 1024 * 1024; // 4TB
diff --git a/sdk/storage/storage-file-share/swagger/README.md b/sdk/storage/storage-file-share/swagger/README.md
index 4696a62a2e26..9ebda998c658 100644
--- a/sdk/storage/storage-file-share/swagger/README.md
+++ b/sdk/storage/storage-file-share/swagger/README.md
@@ -20,7 +20,7 @@ disable-async-iterators: true
 add-credentials: false
 use-extension:
   "@autorest/typescript": "6.0.0-dev.20210218.1"
-package-version: 12.18.1-beta.2
+package-version: 12.18.1
 ```
 
 ## Customizations for Track 2 Generator
diff --git a/sdk/storage/storage-file-share/tests.yml b/sdk/storage/storage-file-share/tests.yml
index b779b995d798..e47b9e031cd6 100644
--- a/sdk/storage/storage-file-share/tests.yml
+++ b/sdk/storage/storage-file-share/tests.yml
@@ -1,7 +1,7 @@
 trigger: none
 
-stages:
-  - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
+extends:
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       PackageName: "@azure/storage-file-share"
       ServiceDirectory: storage
diff --git a/sdk/storage/storage-queue/CHANGELOG.md b/sdk/storage/storage-queue/CHANGELOG.md
index 02502a6d340d..f45534cea379 100644
--- a/sdk/storage/storage-queue/CHANGELOG.md
+++ b/sdk/storage/storage-queue/CHANGELOG.md
@@ -1,14 +1,10 @@
 # Release History
 
-## 12.16.1 (Unreleased)
+## 12.17.0 (2024-05-11)
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Added support for service version 2024-05-04.
 
 ## 12.16.0 (2023-11-09)
 
diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json
index a24fc51d614d..0699285698d2 100644
--- a/sdk/storage/storage-queue/package.json
+++ b/sdk/storage/storage-queue/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azure/storage-queue",
   "sdk-type": "client",
-  "version": "12.16.1",
+  "version": "12.17.0",
   "description": "Microsoft Azure Storage SDK for JavaScript - Queue",
   "main": "./dist/index.js",
   "module": "./dist-esm/src/index.js",
diff --git a/sdk/storage/storage-queue/src/generated/src/models/parameters.ts b/sdk/storage/storage-queue/src/generated/src/models/parameters.ts
index 588a4f6d66a1..c118a3736ffb 100644
--- a/sdk/storage/storage-queue/src/generated/src/models/parameters.ts
+++ b/sdk/storage/storage-queue/src/generated/src/models/parameters.ts
@@ -100,7 +100,7 @@ export const timeoutInSeconds: OperationQueryParameter = {
 export const version: OperationParameter = {
   parameterPath: "version",
   mapper: {
-    defaultValue: "2023-11-03",
+    defaultValue: "2024-05-04",
     isConstant: true,
     serializedName: "x-ms-version",
     type: {
diff --git a/sdk/storage/storage-queue/src/generated/src/storageClientContext.ts b/sdk/storage/storage-queue/src/generated/src/storageClientContext.ts
index db3e887e2cfe..9c857cc75da0 100644
--- a/sdk/storage/storage-queue/src/generated/src/storageClientContext.ts
+++ b/sdk/storage/storage-queue/src/generated/src/storageClientContext.ts
@@ -10,7 +10,7 @@ import * as coreHttp from "@azure/core-http";
 import { StorageClientOptionalParams } from "./models";
 
 const packageName = "azure-storage-queue";
-const packageVersion = "12.16.1";
+const packageVersion = "12.17.0";
 
 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 || "2023-11-03";
+    this.version = options.version || "2024-05-04";
   }
 }
diff --git a/sdk/storage/storage-queue/src/utils/constants.ts b/sdk/storage/storage-queue/src/utils/constants.ts
index 6a4849570d10..166628815273 100644
--- a/sdk/storage/storage-queue/src/utils/constants.ts
+++ b/sdk/storage/storage-queue/src/utils/constants.ts
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "12.16.1";
-export const SERVICE_VERSION: string = "2023-11-03";
+export const SDK_VERSION: string = "12.17.0";
+export const SERVICE_VERSION: string = "2024-05-04";
 
 /**
  * The OAuth scope to use with Azure Storage.
diff --git a/sdk/storage/storage-queue/swagger/README.md b/sdk/storage/storage-queue/swagger/README.md
index 3fe5a7a4b051..a5a2a23fc96e 100644
--- a/sdk/storage/storage-queue/swagger/README.md
+++ b/sdk/storage/storage-queue/swagger/README.md
@@ -20,7 +20,7 @@ disable-async-iterators: true
 add-credentials: false
 use-extension:
   "@autorest/typescript": "6.0.0-dev.20210218.1"
-package-version: 12.16.1
+package-version: 12.17.0
 ```
 
 ## Customizations for Track 2 Generator
@@ -226,13 +226,13 @@ directive:
       $["x-ms-client-name"] = "queueAnalyticsLogging"
 ```
 
-### Update service version from "2018-03-28" to "2023-11-03"
+### Update service version from "2018-03-28" to "2024-05-04"
 
 ```yaml
 directive:
   - from: swagger-document
     where: $.parameters.ApiVersionParameter
-    transform: $.enum = [ "2023-11-03" ];
+    transform: $.enum = [ "2024-05-04" ];
 ```
 
 ### Rename AccessPolicy start -> startsOn
diff --git a/sdk/storage/storage-queue/tests.yml b/sdk/storage/storage-queue/tests.yml
index f73e3f940e10..051dfd4500b2 100644
--- a/sdk/storage/storage-queue/tests.yml
+++ b/sdk/storage/storage-queue/tests.yml
@@ -1,7 +1,7 @@
 trigger: none
 
-stages:
-  - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
+extends:
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       PackageName: "@azure/storage-queue"
       ServiceDirectory: storage