diff --git a/eng/tox/install_depend_packages.py b/eng/tox/install_depend_packages.py
index a353642ae89d..3b89c846a22a 100644
--- a/eng/tox/install_depend_packages.py
+++ b/eng/tox/install_depend_packages.py
@@ -13,6 +13,7 @@
 import logging
 from packaging.specifiers import SpecifierSet
 from pkg_resources import Requirement, parse_version
+
 from pypi_tools.pypi import PyPIClient
 
 setup_parser_path = os.path.abspath(
@@ -30,9 +31,9 @@
 MINIMUM_VERSION_SUPPORTED_OVERRIDE = {
     'azure-common': '1.1.10',
     'msrest': '0.6.10',
-    'six': '1.9',
     'typing-extensions': '3.6.5',
     'opentelemetry-api': '1.3.0',
+    'opentelemetry-sdk': '1.3.0',
     'azure-core': '1.11.0',
     'requests': '2.19.0',
     'six': '1.12.0'
diff --git a/sdk/batch/azure-mgmt-batch/dev_requirements.txt b/sdk/batch/azure-mgmt-batch/dev_requirements.txt
index 82d788f6b0c2..a682651166d5 100644
--- a/sdk/batch/azure-mgmt-batch/dev_requirements.txt
+++ b/sdk/batch/azure-mgmt-batch/dev_requirements.txt
@@ -1,4 +1,4 @@
 -e ../../../tools/azure-sdk-tools
--e ../../keyvault/azure-mgmt-keyvault
--e ../../network/azure-mgmt-network
+azure-mgmt-keyvault<9.0.0
+azure-mgmt-network<19.0.0
 -e ../../../tools/azure-devtools
\ No newline at end of file
diff --git a/sdk/cognitiveservices/azure-cognitiveservices-language-spellcheck/dev_requirements.txt b/sdk/cognitiveservices/azure-cognitiveservices-language-spellcheck/dev_requirements.txt
index 1a1c8d8fc379..13ea84a091ed 100644
--- a/sdk/cognitiveservices/azure-cognitiveservices-language-spellcheck/dev_requirements.txt
+++ b/sdk/cognitiveservices/azure-cognitiveservices-language-spellcheck/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
--e ../../../tools/azure-devtools
\ No newline at end of file
+-e ../../../tools/azure-devtools
+azure-core
diff --git a/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/dev_requirements.txt b/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/dev_requirements.txt
index c734ea2c6e7d..b29b06148387 100644
--- a/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/dev_requirements.txt
+++ b/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/dev_requirements.txt
@@ -1,3 +1,4 @@
 -e ../../../tools/azure-sdk-tools
--e ../azure-mgmt-cognitiveservices
--e ../../../tools/azure-devtools
\ No newline at end of file
+azure-mgmt-cognitiveservices<12.0.0
+-e ../../../tools/azure-devtools
+azure-core
diff --git a/sdk/cognitiveservices/azure-cognitiveservices-search-entitysearch/dev_requirements.txt b/sdk/cognitiveservices/azure-cognitiveservices-search-entitysearch/dev_requirements.txt
index 1a1c8d8fc379..36b863ce4e32 100644
--- a/sdk/cognitiveservices/azure-cognitiveservices-search-entitysearch/dev_requirements.txt
+++ b/sdk/cognitiveservices/azure-cognitiveservices-search-entitysearch/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
--e ../../../tools/azure-devtools
\ No newline at end of file
+-e ../../../tools/azure-devtools
+azure-core
\ No newline at end of file
diff --git a/sdk/cognitiveservices/azure-cognitiveservices-search-videosearch/dev_requirements.txt b/sdk/cognitiveservices/azure-cognitiveservices-search-videosearch/dev_requirements.txt
index 1a1c8d8fc379..13ea84a091ed 100644
--- a/sdk/cognitiveservices/azure-cognitiveservices-search-videosearch/dev_requirements.txt
+++ b/sdk/cognitiveservices/azure-cognitiveservices-search-videosearch/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
--e ../../../tools/azure-devtools
\ No newline at end of file
+-e ../../../tools/azure-devtools
+azure-core
diff --git a/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt b/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt
index 1a1c8d8fc379..36b863ce4e32 100644
--- a/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt
+++ b/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
--e ../../../tools/azure-devtools
\ No newline at end of file
+-e ../../../tools/azure-devtools
+azure-core
\ No newline at end of file
diff --git a/sdk/deviceupdate/azure-iot-deviceupdate/dev_requirements.txt b/sdk/deviceupdate/azure-iot-deviceupdate/dev_requirements.txt
index 900f8ee865b4..70527000f195 100644
--- a/sdk/deviceupdate/azure-iot-deviceupdate/dev_requirements.txt
+++ b/sdk/deviceupdate/azure-iot-deviceupdate/dev_requirements.txt
@@ -2,4 +2,4 @@
 -e ../../../tools/azure-devtools
 ../../core/azure-core
 -e ../../identity/azure-identity
-../../storage/azure-storage-blob
+azure-storage-blob<=12.7.0
\ No newline at end of file
diff --git a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
index 4beb0cb7f2e9..2ad25d664031 100644
--- a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
+++ b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 4.3.1 (Unreleased)
 
+- Bumped `msrest` dependency to `0.6.21` to align with mgmt package.
+
 ### Features Added
 
 ### Breaking Changes
diff --git a/sdk/eventgrid/azure-eventgrid/setup.py b/sdk/eventgrid/azure-eventgrid/setup.py
index 92b6164108e5..dfa06fd7ad11 100644
--- a/sdk/eventgrid/azure-eventgrid/setup.py
+++ b/sdk/eventgrid/azure-eventgrid/setup.py
@@ -81,7 +81,7 @@
         'azure',
     ]),
     install_requires=[
-        'msrest>=0.6.19',
+        'msrest>=0.6.21',
         'azure-core<2.0.0,>=1.12.0',
     ],
     extras_require={
diff --git a/sdk/nspkg/ci.yml b/sdk/nspkg/ci.yml
index 246864397238..6b64ffa1c6b1 100644
--- a/sdk/nspkg/ci.yml
+++ b/sdk/nspkg/ci.yml
@@ -28,6 +28,7 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: nspkg
+    TestTimeoutInMinutes: 90
     BuildDocs: False
     Artifacts:
     - name: azure-agrifood-nspkg
diff --git a/sdk/servermanager/azure-mgmt-servermanager/dev_requirements.txt b/sdk/servermanager/azure-mgmt-servermanager/dev_requirements.txt
index 1a1c8d8fc379..13ea84a091ed 100644
--- a/sdk/servermanager/azure-mgmt-servermanager/dev_requirements.txt
+++ b/sdk/servermanager/azure-mgmt-servermanager/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
--e ../../../tools/azure-devtools
\ No newline at end of file
+-e ../../../tools/azure-devtools
+azure-core
diff --git a/shared_requirements.txt b/shared_requirements.txt
index 3fad0b2afaf2..09f519aed48b 100644
--- a/shared_requirements.txt
+++ b/shared_requirements.txt
@@ -191,7 +191,7 @@ opentelemetry-sdk<2.0.0,>=1.0.0
 #override azure-synapse-managedprivateendpoints azure-core>=1.6.0,<2.0.0
 #override azure-data-tables msrest>=0.6.10
 #override azure-ai-anomalydetector azure-core>=1.6.0,<2.0.0
-#override azure-eventgrid msrest>=0.6.19
+#override azure-eventgrid msrest>=0.6.21
 #override azure-eventgrid azure-core<2.0.0,>=1.12.0
 #override azure-monitor-query msrest>=0.6.19
 #override azure-monitor-query azure-core<2.0.0,>=1.12.0