diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
index 26cda64e1427..6ecdb0642780 100644
--- a/eng/.docsettings.yml
+++ b/eng/.docsettings.yml
@@ -83,6 +83,7 @@ known_content_issues:
   - ['sdk/storage/azure-storage-blob/swagger/README.md', '#4554']
   - ['sdk/storage/azure-storage-file-datalake/swagger/README.md', '#4554']
   - ['sdk/storage/azure-storage-file-share/swagger/README.md', '#4554']
+  - ['sdk/storage/azure-storage/README.md', '#4554']
   - ['sdk/storage/azure-storage-nspkg/README.rst', '#4554']
   - ['sdk/storage/azure-storage-queue/swagger/README.md', '#4554']
   - ['sdk/storage/README.md', '#4554']
diff --git a/scripts/devops_tasks/common_tasks.py b/scripts/devops_tasks/common_tasks.py
index b0215df2b287..f8a8473b5cdf 100644
--- a/scripts/devops_tasks/common_tasks.py
+++ b/scripts/devops_tasks/common_tasks.py
@@ -40,6 +40,7 @@
     "azure-mgmt-scheduler",
     "azure",
     "azure-mgmt",
+    "azure-storage",
 ]
 MANAGEMENT_PACKAGE_IDENTIFIERS = [
     "mgmt",
diff --git a/sdk/storage/azure-storage/CHANGELOG.md b/sdk/storage/azure-storage/CHANGELOG.md
new file mode 100644
index 000000000000..2603505be4a5
--- /dev/null
+++ b/sdk/storage/azure-storage/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Disclaimer
+
+Starting with v0.37.0, this package cannot be installed anymore, please install individual packages.
diff --git a/sdk/storage/azure-storage/README.md b/sdk/storage/azure-storage/README.md
new file mode 100644
index 000000000000..65511ecb91df
--- /dev/null
+++ b/sdk/storage/azure-storage/README.md
@@ -0,0 +1,17 @@
+# Microsoft Azure Storage SDK for Python
+
+This package was the Microsoft Azure Storage bundle.
+
+Starting with v0.37.0, this package is deprecated. Please install the service specific packages prefixed by `azure-storage` needed for your application.
+
+The complete list of available packages can be found at:
+https://aka.ms/azsdk/python/all
+
+Here's a non-exhaustive list of common packages:
+
+- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client
+- [azure-storage-file-share](https://pypi.org/project/azure-storage-file-share) : Storage file share client
+- [azure-storage-file-datalake](https://pypi.org/project/azure-storage-file-datalake) : ADLS Gen2 client
+- [azure-storage-queue](https://pypi.org/project/azure-storage-queue): Queue storage client
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-storage%2FREADME.png)
diff --git a/sdk/storage/azure-storage/sdk_packaging.toml b/sdk/storage/azure-storage/sdk_packaging.toml
new file mode 100644
index 000000000000..901bc8ccbfa6
--- /dev/null
+++ b/sdk/storage/azure-storage/sdk_packaging.toml
@@ -0,0 +1,2 @@
+[packaging]
+auto_update = false
diff --git a/sdk/storage/azure-storage/setup.py b/sdk/storage/azure-storage/setup.py
new file mode 100644
index 000000000000..09a1ed367bfc
--- /dev/null
+++ b/sdk/storage/azure-storage/setup.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#--------------------------------------------------------------------------
+
+from setuptools import setup
+import sys
+
+
+message = """
+
+Starting with v0.37.0, the 'azure-storage' meta-package is deprecated and cannot be installed anymore.
+Please install the service specific packages prefixed by `azure` needed for your application.
+
+The complete list of available packages can be found at:
+https://aka.ms/azsdk/python/all
+
+Here's a non-exhaustive list of common packages:
+
+- [azure-storage-blob](https://pypi.org/project/azure-storage-blob) : Blob storage client
+- [azure-storage-file-share](https://pypi.org/project/azure-storage-file-share) : Storage file share client
+- [azure-storage-file-datalake](https://pypi.org/project/azure-storage-file-datalake) : ADLS Gen2 client
+- [azure-storage-queue](https://pypi.org/project/azure-storage-queue): Queue storage client
+"""
+
+if "sdist" in sys.argv:
+    setup(
+        name='azure-storage',
+        version='0.37.0',
+        description='Microsoft Azure Storage SDK for Python',
+        long_description=open('README.md', 'r').read(),
+        long_description_content_type='text/markdown',
+        license='MIT License',
+        author='Microsoft Corporation',
+        author_email='azpysdkhelp@microsoft.com',
+        url='https://github.com/Azure/azure-sdk-for-python',
+        classifiers=[
+            'Development Status :: 7 - Inactive',
+            'Programming Language :: Python',
+            'Programming Language :: Python :: 2',
+            'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.5',
+            'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
+            'License :: OSI Approved :: MIT License',
+        ],
+        zip_safe=False,
+    )
+else:
+    raise RuntimeError(message)
diff --git a/setup.py b/setup.py
index 50e0cea8793b..efff3db4dc06 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
 nspkg_packages.sort(key = lambda x: len([c for c in x if c == '-']))
 
 # Meta-packages to ignore
-meta_package = ['azure-keyvault', 'azure-mgmt', 'azure']
+meta_package = ['azure-keyvault', 'azure-mgmt', 'azure', 'azure-storage']
 
 # content packages are packages that are not meta nor nspkg
 content_package = sorted([p for p in packages.keys() if p not in meta_package+nspkg_packages])