diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json
index af5da8de91da..fb862c8dcd11 100644
--- a/sdk/storage/platform-matrix-all-versions.json
+++ b/sdk/storage/platform-matrix-all-versions.json
@@ -3,11 +3,11 @@
     "Agent": {
       "ubuntu-20.04": {
           "OSVmImage": "env:LINUXVMIMAGE",
-          "Pool": "azsdk-pool-mms-ubuntu-2004-storage"
+          "Pool": "env:LINUXPOOL"
       },
       "windows-2022": {
           "OSVmImage": "env:WINDOWSVMIMAGE",
-          "Pool": "azsdk-pool-mms-win-2022-storage"
+          "Pool": "env:WINDOWSPOOL"
       }
     },
     "TestTargetFramework": [
diff --git a/sdk/storage/tests.datamovement.yml b/sdk/storage/tests.datamovement.yml
index e0c740023ae1..39b96de38a13 100644
--- a/sdk/storage/tests.datamovement.yml
+++ b/sdk/storage/tests.datamovement.yml
@@ -10,9 +10,9 @@ extends:
     Location: canadacentral
     CloudConfig:
       Public:
-      PrivatePreview:
-        SubscriptionConfiguration: $(sub-config-storage-test-resources)
-    SupportedClouds: Public, PrivatePreview
+      # PrivatePreview:
+      #  SubscriptionConfiguration: $(sub-config-storage-test-resources)
+    SupportedClouds: Public #, PrivatePreview
     MatrixReplace:
       # Use dedicated storage pool in canadacentral with higher memory capacity
       - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage
diff --git a/sdk/storage/tests.functions.yml b/sdk/storage/tests.functions.yml
index 60951d713fea..32642689538a 100644
--- a/sdk/storage/tests.functions.yml
+++ b/sdk/storage/tests.functions.yml
@@ -10,9 +10,9 @@ extends:
     Location: canadacentral
     CloudConfig:
       Public:
-      PrivatePreview:
-        SubscriptionConfiguration: $(sub-config-storage-test-resources)
-    SupportedClouds: Public, PrivatePreview
+      # PrivatePreview:
+      #   SubscriptionConfiguration: $(sub-config-storage-test-resources)
+    SupportedClouds: Public #, PrivatePreview
     MatrixReplace:
       # Use dedicated storage pool in canadacentral with higher memory capacity
       - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage
diff --git a/sdk/storage/tests.mgmt.yml b/sdk/storage/tests.mgmt.yml
index 601c0dc1da31..25f6033a7b54 100644
--- a/sdk/storage/tests.mgmt.yml
+++ b/sdk/storage/tests.mgmt.yml
@@ -10,9 +10,9 @@ extends:
     Location: canadacentral
     CloudConfig:
       Public:
-      PrivatePreview:
-        SubscriptionConfiguration: $(sub-config-storage-test-resources)
-    SupportedClouds: Public, PrivatePreview
+      # PrivatePreview:
+      #  SubscriptionConfiguration: $(sub-config-storage-test-resources)
+    SupportedClouds: Public #, PrivatePreview
     MatrixReplace:
       # Use dedicated storage pool in canadacentral with higher memory capacity
       - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage
diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml
index 5cad20c73b9b..a3c1d49de447 100644
--- a/sdk/storage/tests.yml
+++ b/sdk/storage/tests.yml
@@ -7,12 +7,12 @@ extends:
     ServiceDirectory: storage
     BuildInParallel: true
     TimeoutInMinutes: 180
-    Location: canadacentral
+    Location: westus2
     CloudConfig:
       Public:
-      PrivatePreview:
-        SubscriptionConfiguration: $(sub-config-storage-test-resources)
-    SupportedClouds: Public, PrivatePreview
+      #PrivatePreview:
+      #  SubscriptionConfiguration: $(sub-config-storage-test-resources)
+    SupportedClouds: Public #, PrivatePreview
     MatrixReplace:
       # Use dedicated storage pool in canadacentral with higher memory capacity
       - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage