diff --git a/tools/azure-sdk-tools/packaging_tools/__init__.py b/tools/azure-sdk-tools/packaging_tools/__init__.py
index 67e29e69bb70..1b6afe958dc6 100644
--- a/tools/azure-sdk-tools/packaging_tools/__init__.py
+++ b/tools/azure-sdk-tools/packaging_tools/__init__.py
@@ -29,7 +29,10 @@ def build_config(config: Dict[str, Any]) -> Dict[str, str]:
     result["is_arm"] = result.pop("is_arm", True)
 
     # Do I need msrestazure for this package?
-    result["need_msrestazure"] = result.pop("need_msrestazure", True)
+    result["need_msrestazure"] = result.pop("need_msrestazure", False)
+
+    # Do I need azure-mgmt-core for this package?
+    result["need_azuremgmtcore"] = result.pop("need_azuremgmtcore", True)
 
     # Pre-compute some Jinja variable that are complicated to do inside the templates
     package_parts = result["package_nspkg"][: -len("-nspkg")].split("-")
diff --git a/tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt b/tools/azure-sdk-tools/packaging_tools/templates/LICENSE
similarity index 89%
rename from tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt
rename to tools/azure-sdk-tools/packaging_tools/templates/LICENSE
index 2d3163745319..b2f52a2bad4e 100644
--- a/tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt
+++ b/tools/azure-sdk-tools/packaging_tools/templates/LICENSE
@@ -1,6 +1,6 @@
-The MIT License (MIT)
+Copyright (c) Microsoft Corporation.
 
-Copyright (c) 2021 Microsoft
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -12,7 +12,7 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
diff --git a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in
index b67a47a42802..bb1390b9df1e 100644
--- a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in
+++ b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in
@@ -1,6 +1,7 @@
+include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 {%- for init_name in init_names %}
 include {{ init_name }}
 {%- endfor %}
-include LICENSE.txt
+include LICENSE
diff --git a/tools/azure-sdk-tools/packaging_tools/templates/setup.py b/tools/azure-sdk-tools/packaging_tools/templates/setup.py
index 40f72f8b053b..b7ec98cb4e9d 100644
--- a/tools/azure-sdk-tools/packaging_tools/templates/setup.py
+++ b/tools/azure-sdk-tools/packaging_tools/templates/setup.py
@@ -70,6 +70,7 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,