diff --git a/src/databricks/azext_databricks/azext_metadata.json b/src/databricks/azext_databricks/azext_metadata.json
index fc707c41f3b..a3f3e84f5b7 100644
--- a/src/databricks/azext_databricks/azext_metadata.json
+++ b/src/databricks/azext_databricks/azext_metadata.json
@@ -1,4 +1,4 @@
 {
-    "azext.isPreview": true,
-    "azext.minCliCoreVersion": "2.0.67"
-}
\ No newline at end of file
+    "azext.isExprimental": true,
+    "azext.minCliCoreVersion": "2.3.1"
+}
diff --git a/src/databricks/azext_databricks/commands.py b/src/databricks/azext_databricks/commands.py
index 7ed2e03c4a1..d740fd26e79 100644
--- a/src/databricks/azext_databricks/commands.py
+++ b/src/databricks/azext_databricks/commands.py
@@ -17,7 +17,7 @@ def load_command_table(self, _):
     databricks_workspaces = CliCommandType(
         operations_tmpl='azext_databricks.vendored_sdks.databricks.operations._workspaces_operations#WorkspacesOperations.{}',
         client_factory=cf_workspaces)
-    with self.command_group('databricks workspace', databricks_workspaces, client_factory=cf_workspaces, is_preview=True) as g:
+    with self.command_group('databricks workspace', databricks_workspaces, client_factory=cf_workspaces, is_experimental=True) as g:
         g.custom_command('create', 'create_databricks_workspace', validator=validate_workspace_values, supports_no_wait=True)
         g.custom_command('update', 'update_databricks_workspace', supports_no_wait=True)
         g.custom_command('delete', 'delete_databricks_workspace', supports_no_wait=True, confirmation=True)
diff --git a/src/databricks/setup.cfg b/src/databricks/setup.cfg
index 5eab412034f..e69de29bb2d 100644
--- a/src/databricks/setup.cfg
+++ b/src/databricks/setup.cfg
@@ -1,2 +0,0 @@
-[bdist_wheel]
-universal=1
diff --git a/src/databricks/setup.py b/src/databricks/setup.py
index 17986921ef3..38edcf579ae 100644
--- a/src/databricks/setup.py
+++ b/src/databricks/setup.py
@@ -26,7 +26,6 @@
     'Intended Audience :: System Administrators',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',