diff --git a/galaxy.yml b/galaxy.yml
index 47ed9d8..a452b55 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,5 +1,3 @@
----
-
 # Copyright 2024 Cloudera, Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+---
+
 namespace:  cloudera
 name:       cloud
 version:    2.5.1
@@ -25,14 +25,11 @@ authors:
 
 description: >
   A set of modules and other artifacts for interacting with the services and endpoints
-  provided by the Cloudera Data Platform (CDP) for Public and Private Cloud.
+  provided by the Cloudera on cloud and on premises platforms.
 license_file: LICENSE
 tags:
 - cloudera
 - cdp
-- azure
-- aws
-- gcp
 - data_service
 - data_hub
 
@@ -52,3 +49,5 @@ build_ignore:
 - tests
 - pytest.ini
 - builder
+
+...
diff --git a/plugins/doc_fragments/cdp_auth_options.py b/plugins/doc_fragments/cdp_auth_options.py
index 4fb04dd..04c5e94 100644
--- a/plugins/doc_fragments/cdp_auth_options.py
+++ b/plugins/doc_fragments/cdp_auth_options.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
diff --git a/plugins/doc_fragments/cdp_sdk_options.py b/plugins/doc_fragments/cdp_sdk_options.py
index 7ff5343..180874e 100644
--- a/plugins/doc_fragments/cdp_sdk_options.py
+++ b/plugins/doc_fragments/cdp_sdk_options.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
diff --git a/plugins/lookup/datahub_definition.py b/plugins/lookup/datahub_definition.py
index 0396dc9..5d9e80f 100644
--- a/plugins/lookup/datahub_definition.py
+++ b/plugins/lookup/datahub_definition.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/datahub_instance.py b/plugins/lookup/datahub_instance.py
index 09901e3..e96848c 100644
--- a/plugins/lookup/datahub_instance.py
+++ b/plugins/lookup/datahub_instance.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/datahub_service.py b/plugins/lookup/datahub_service.py
index 97fa274..d000c53 100644
--- a/plugins/lookup/datahub_service.py
+++ b/plugins/lookup/datahub_service.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/datahub_template.py b/plugins/lookup/datahub_template.py
index a82c245..fd02fb7 100644
--- a/plugins/lookup/datahub_template.py
+++ b/plugins/lookup/datahub_template.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/datalake_instance.py b/plugins/lookup/datalake_instance.py
index 90e2b6f..c7a8ba5 100644
--- a/plugins/lookup/datalake_instance.py
+++ b/plugins/lookup/datalake_instance.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/datalake_runtime.py b/plugins/lookup/datalake_runtime.py
index bb658e5..8d4ce30 100644
--- a/plugins/lookup/datalake_runtime.py
+++ b/plugins/lookup/datalake_runtime.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/datalake_service.py b/plugins/lookup/datalake_service.py
index 1a84ddc..b5deb5b 100644
--- a/plugins/lookup/datalake_service.py
+++ b/plugins/lookup/datalake_service.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/env_freeipa_domain.py b/plugins/lookup/env_freeipa_domain.py
index f2cd954..89fbe9d 100644
--- a/plugins/lookup/env_freeipa_domain.py
+++ b/plugins/lookup/env_freeipa_domain.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/lookup/env_freeipa_hosts.py b/plugins/lookup/env_freeipa_hosts.py
index 2b255d4..e07fbdc 100644
--- a/plugins/lookup/env_freeipa_hosts.py
+++ b/plugins/lookup/env_freeipa_hosts.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/module_utils/cdp_common.py b/plugins/module_utils/cdp_common.py
index 088fbd2..a0bc562 100644
--- a/plugins/module_utils/cdp_common.py
+++ b/plugins/module_utils/cdp_common.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
diff --git a/plugins/module_utils/cdp_service.py b/plugins/module_utils/cdp_service.py
index f3d7c2e..3c0fb5a 100644
--- a/plugins/module_utils/cdp_service.py
+++ b/plugins/module_utils/cdp_service.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc.
diff --git a/plugins/modules/account_auth.py b/plugins/modules/account_auth.py
index d64db25..b3e2d4d 100644
--- a/plugins/modules/account_auth.py
+++ b/plugins/modules/account_auth.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = """
----
 module: account_auth
 short_description: Gather and set authentication details for a CDP Account
 description:
@@ -75,7 +65,6 @@
 """
 
 RETURN = """
----
 account:
     description: Returns the authentication settings for the CDP Account
     returned: always
@@ -105,6 +94,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class AccountAuthentication(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/account_auth_info.py b/plugins/modules/account_auth_info.py
index 5ddff3a..b07d297 100644
--- a/plugins/modules/account_auth_info.py
+++ b/plugins/modules/account_auth_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: account_auth_info
 short_description: Gather information about CDP Account authentication settings
 description:
@@ -58,7 +48,6 @@
 """
 
 RETURN = r"""
----
 account:
     description: Returns the authentication settings for the CDP Account
     returned: always
@@ -88,6 +77,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class AccountAuthenticationInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/account_cred_info.py b/plugins/modules/account_cred_info.py
index 22fc5da..ea7eb16 100644
--- a/plugins/modules/account_cred_info.py
+++ b/plugins/modules/account_cred_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = """
----
 module: account_cred_info
 short_description: Gather information about Account prerequisites for CDP Credentials
 description:
@@ -89,6 +79,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class AccountCredentialInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datahub_cluster.py b/plugins/modules/datahub_cluster.py
index 4a2c51f..6587bb6 100644
--- a/plugins/modules/datahub_cluster.py
+++ b/plugins/modules/datahub_cluster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,20 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
-
-import jmespath
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datahub_cluster
 short_description: Manage CDP Datahubs
 description:
@@ -288,7 +275,6 @@
 """
 
 RETURN = r"""
----
 datahub:
   description: The information about the Datahub
   type: dict
@@ -554,6 +540,12 @@
   elements: str
 """
 
+import json
+
+import jmespath
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatahubCluster(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datahub_cluster_info.py b/plugins/modules/datahub_cluster_info.py
index ab34f6f..61324fc 100644
--- a/plugins/modules/datahub_cluster_info.py
+++ b/plugins/modules/datahub_cluster_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datahub_cluster_info
 short_description: Gather information about CDP Datahubs
 description:
@@ -72,7 +62,6 @@
 """
 
 RETURN = r"""
----
 datahubs:
   description: The information about the named Datahub or Datahubs
   type: list
@@ -339,6 +328,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatahubClusterInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datahub_cluster_recipe.py b/plugins/modules/datahub_cluster_recipe.py
index 29c985a..e5b5ddb 100644
--- a/plugins/modules/datahub_cluster_recipe.py
+++ b/plugins/modules/datahub_cluster_recipe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,19 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
-
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datahub_cluster_recipe
 short_description: Manage CDP Datahub recipes on an instance group
 description:
@@ -91,7 +79,6 @@
 """
 
 RETURN = r"""
----
 instance_group:
   description: The recipe state for the CDP Datahub instance group.
   type: dict
@@ -126,6 +113,11 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
+
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatahubClusterRecipe(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datahub_cluster_repair.py b/plugins/modules/datahub_cluster_repair.py
index c277106..49ab4a9 100644
--- a/plugins/modules/datahub_cluster_repair.py
+++ b/plugins/modules/datahub_cluster_repair.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,21 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from time import time, sleep
-
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
-
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datahub_cluster_repair
 short_description: Repair CDP Datahub instances or instance groups
 description:
@@ -129,7 +115,6 @@
 """
 
 RETURN = r"""
----
 datahub:
   description: The information about the Datahub
   type: dict
@@ -395,6 +380,12 @@
   elements: str
 """
 
+from time import time, sleep
+
+from ansible.module_utils.basic import AnsibleModule
+
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatahubClusterRepair(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datahub_definition_info.py b/plugins/modules/datahub_definition_info.py
index cddc91b..88d8459 100644
--- a/plugins/modules/datahub_definition_info.py
+++ b/plugins/modules/datahub_definition_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datahub_definition_info
 short_description: Gather information about CDP Datahub Cluster Definitions
 description:
@@ -71,7 +61,6 @@
 """
 
 RETURN = r"""
----
 definitions:
   description: The information about the named Definition or Definitions
   type: list
@@ -128,6 +117,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatahubDefinitionInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datahub_template_info.py b/plugins/modules/datahub_template_info.py
index 840879d..c3a08ad 100644
--- a/plugins/modules/datahub_template_info.py
+++ b/plugins/modules/datahub_template_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datahub_template_info
 short_description: Gather information about CDP Datahub Cluster Templates
 description:
@@ -74,7 +64,6 @@
 """
 
 RETURN = r"""
----
 templates:
   description: The information about the named Template or Templates
   type: list
@@ -136,6 +125,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatahubTemplateInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datalake.py b/plugins/modules/datalake.py
index 253a5e4..65807e3 100644
--- a/plugins/modules/datalake.py
+++ b/plugins/modules/datalake.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datalake
 short_description: Manage CDP Datalakes
 description:
@@ -239,7 +229,6 @@
 """
 
 RETURN = r"""
----
 datalake:
   description: The information about the Datalake
   type: dict
@@ -444,6 +433,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class Datalake(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datalake_backup.py b/plugins/modules/datalake_backup.py
index 9c400ec..db89d5b 100644
--- a/plugins/modules/datalake_backup.py
+++ b/plugins/modules/datalake_backup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2024 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: cloudera.cloud.datalake_backup
 short_description: Create a backup of a datalake
 description:
@@ -451,6 +441,9 @@
             type: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatalakeBackup(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datalake_backup_info.py b/plugins/modules/datalake_backup_info.py
index b61c5fd..ad99dbe 100644
--- a/plugins/modules/datalake_backup_info.py
+++ b/plugins/modules/datalake_backup_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2024 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: cloudera.cloud.datalake_backup_info
 short_description: Gather information about a Datalake backup
 description:
@@ -117,6 +107,9 @@
       returned: always
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatalakeBackupInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datalake_info.py b/plugins/modules/datalake_info.py
index f6cd3d2..113e98d 100644
--- a/plugins/modules/datalake_info.py
+++ b/plugins/modules/datalake_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datalake_info
 short_description: Gather information about CDP Datalakes
 description:
@@ -72,7 +62,6 @@
 """
 
 RETURN = r"""
----
 datalakes:
   description: The information about the named Datalake or Datalakes
   type: list
@@ -265,6 +254,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatalakeInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/datalake_runtime_info.py b/plugins/modules/datalake_runtime_info.py
index 5d1249c..885d0f2 100644
--- a/plugins/modules/datalake_runtime_info.py
+++ b/plugins/modules/datalake_runtime_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: datalake_runtime_info
 short_description: Gather information about CDP Datalake Runtimes
 description:
@@ -60,7 +50,6 @@
 """
 
 RETURN = r"""
----
 versions:
   description: Details on available CDP Datalake Runtimes
   type: list
@@ -87,6 +76,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DatalakeRuntimeInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/de.py b/plugins/modules/de.py
index a917ffb..5bcb95a 100644
--- a/plugins/modules/de.py
+++ b/plugins/modules/de.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,16 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ..module_utils.cdp_common import CdpModule
-
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
 module: de
 short_description: Enable and Disable CDP Data Engineering Services
@@ -213,7 +203,6 @@
 """
 
 RETURN = r"""
----
 service:
   description: DE service description
   type: complex
@@ -338,6 +327,9 @@
       type: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DEService(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/de_info.py b/plugins/modules/de_info.py
index 5d205fd..ca63949 100644
--- a/plugins/modules/de_info.py
+++ b/plugins/modules/de_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: de_info
 short_description: Gather information about CDP DE Workspaces
 description:
@@ -201,6 +191,9 @@
       type: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DEInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/de_virtual_cluster.py b/plugins/modules/de_virtual_cluster.py
index 0a79a18..0ca66ec 100644
--- a/plugins/modules/de_virtual_cluster.py
+++ b/plugins/modules/de_virtual_cluster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,16 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ..module_utils.cdp_common import CdpModule
-
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
 module: de_virtual_cluster
 short_description: Create or delete CDP Data Engineering Virtual Clusters
@@ -131,7 +121,6 @@
 
 
 RETURN = r"""
----
 virtual_cluster:
   description: DE virtual cluster
   type: complex
@@ -250,6 +239,9 @@
       type: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DEVirtualCluster(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/de_virtual_cluster_info.py b/plugins/modules/de_virtual_cluster_info.py
index cd72a79..e504e8b 100644
--- a/plugins/modules/de_virtual_cluster_info.py
+++ b/plugins/modules/de_virtual_cluster_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: de_virtual_cluster_info
 short_description: Gather information about CDP DE virtual clusters
 description:
@@ -188,6 +178,9 @@
       type: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DEVirtualClusterInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_customflow.py b/plugins/modules/df_customflow.py
index 5809f08..9aea5bf 100644
--- a/plugins/modules/df_customflow.py
+++ b/plugins/modules/df_customflow.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_customflow
 short_description: Import or Delete CustomFlows into the DataFlow Catalog
 description:
@@ -86,7 +76,6 @@
 """
 
 RETURN = r"""
----
 customflow:
   description: The CustomFlow Definition
   type: dict
@@ -146,6 +135,9 @@
           type: int
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFCustomFlow(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_customflow_info.py b/plugins/modules/df_customflow_info.py
index 89aa54d..77ae99d 100644
--- a/plugins/modules/df_customflow_info.py
+++ b/plugins/modules/df_customflow_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_customflow_info
 short_description: Gather information about CDP DataFlow CustomFlow Definitions
 description:
@@ -66,7 +56,6 @@
 """
 
 RETURN = r"""
----
 flows:
   description: The listing of CustomFlow Definitions in the DataFlow Catalog in this CDP Tenant
   type: list
@@ -149,6 +138,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFCustomFlowInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_customflow_version.py b/plugins/modules/df_customflow_version.py
index bc9475c..9f19e3e 100644
--- a/plugins/modules/df_customflow_version.py
+++ b/plugins/modules/df_customflow_version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_customflow_version
 short_description: Import CustomFlow versions into the DataFlow Catalog
 description:
@@ -73,7 +63,6 @@
 """
 
 RETURN = r"""
----
 customflow_version:
   description: The CustomFlow Version Definition
   type: dict
@@ -105,6 +94,9 @@
       type: int
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFCustomFlowVersion(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_deployment.py b/plugins/modules/df_deployment.py
index b0c5ef0..55af589 100644
--- a/plugins/modules/df_deployment.py
+++ b/plugins/modules/df_deployment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
 # TODO: Update docs
 DOCUMENTATION = r"""
----
 module: df_deployment
 short_description: Enable or Disable CDP DataFlow Deployments
 description:
@@ -187,7 +178,6 @@
 """
 
 RETURN = r"""
----
 deployment:
   description: The information about the named DataFlow Deployment
   type: dict
@@ -334,6 +324,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFDeployment(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_deployment_info.py b/plugins/modules/df_deployment_info.py
index ffb95de..4a6f785 100644
--- a/plugins/modules/df_deployment_info.py
+++ b/plugins/modules/df_deployment_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_deployment_info
 short_description: Gather information about CDP DataFlow Deployments
 description:
@@ -67,7 +57,6 @@
 """
 
 RETURN = r"""
----
 deployments:
   description: The information about the named DataFlow Deployment or DataFlow Deployments
   type: list
@@ -211,6 +200,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFDeploymentInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_readyflow.py b/plugins/modules/df_readyflow.py
index 584e488..8cb7bbf 100644
--- a/plugins/modules/df_readyflow.py
+++ b/plugins/modules/df_readyflow.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_readyflow
 short_description: Import or Delete ReadyFlows from your CDP Tenant
 description:
@@ -70,7 +60,6 @@
 """
 
 RETURN = r"""
----
 readyflow:
   description: The ReadyFlow Definition
   type: dict
@@ -186,6 +175,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFReadyFlow(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_readyflow_info.py b/plugins/modules/df_readyflow_info.py
index dcdfb39..b7e9f28 100644
--- a/plugins/modules/df_readyflow_info.py
+++ b/plugins/modules/df_readyflow_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_readyflow_info
 short_description: Gather information about CDP DataFlow ReadyFlow Definitions
 description:
@@ -66,7 +56,6 @@
 """
 
 RETURN = r"""
----
 flows:
   description: The listing of ReadyFlow Definitions in the DataFlow Catalog in this CDP Tenant
   type: list
@@ -184,6 +173,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFReadyFlowInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_service.py b/plugins/modules/df_service.py
index 45b30dc..2d4f7c1 100644
--- a/plugins/modules/df_service.py
+++ b/plugins/modules/df_service.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,19 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
-import jmespath
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_service
 short_description: Enable or Disable CDP DataFlow Services
 description:
@@ -207,7 +195,6 @@
 """
 
 RETURN = r"""
----
 services:
   description: The information about the named DataFlow Service or DataFlow Services
   type: list
@@ -294,6 +281,12 @@
   elements: str
 """
 
+import json
+import jmespath
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFService(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/df_service_info.py b/plugins/modules/df_service_info.py
index 2f214dc..0b53413 100644
--- a/plugins/modules/df_service_info.py
+++ b/plugins/modules/df_service_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: df_service_info
 short_description: Gather information about CDP DataFlow Services
 description:
@@ -83,7 +73,6 @@
 """
 
 RETURN = r"""
----
 services:
   description: The information about the named DataFlow Service or DataFlow Services
   type: list
@@ -174,6 +163,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DFServiceInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_cluster.py b/plugins/modules/dw_cluster.py
index 4767f13..b3932d8 100644
--- a/plugins/modules/dw_cluster.py
+++ b/plugins/modules/dw_cluster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_cluster
 short_description: Create or Delete CDP Data Warehouse Clusters
 description:
@@ -240,7 +230,6 @@
 """
 
 RETURN = r"""
----
 cluster:
   description: Details for the Data Warehouse cluster
   type: dict
@@ -301,6 +290,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwCluster(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_cluster_info.py b/plugins/modules/dw_cluster_info.py
index d586f34..eefcd1e 100644
--- a/plugins/modules/dw_cluster_info.py
+++ b/plugins/modules/dw_cluster_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_cluster_info
 short_description: Gather information about CDP Data Warehouse Clusters
 description:
@@ -71,7 +61,6 @@
 """
 
 RETURN = r"""
----
 clusters:
   description: The information about the named Cluster or Clusters
   returned: always
@@ -134,6 +123,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwClusterInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_data_visualization.py b/plugins/modules/dw_data_visualization.py
index ccf5b3e..f69826a 100644
--- a/plugins/modules/dw_data_visualization.py
+++ b/plugins/modules/dw_data_visualization.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_data_visualization
 short_description: Create or Delete CDP Data Visualization Instance
 description:
@@ -142,7 +132,6 @@
 """
 
 RETURN = r"""
----
 cluster:
   description: Details for the Data Visualization Instance
   type: dict
@@ -182,6 +171,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwCluster(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_data_visualization_info.py b/plugins/modules/dw_data_visualization_info.py
index c5a2c23..553e675 100644
--- a/plugins/modules/dw_data_visualization_info.py
+++ b/plugins/modules/dw_data_visualization_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_data_visualization_info
 short_description: Gather information about CDP Data Visualization Instances
 description:
@@ -89,7 +79,6 @@
 """
 
 RETURN = r"""
----
 clusters:
   description: The information about the named Data Visualization Instance or Instances
   returned: always
@@ -131,6 +120,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwDataVisualizationInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_database_catalog.py b/plugins/modules/dw_database_catalog.py
index d970a7f..2d4f2fc 100644
--- a/plugins/modules/dw_database_catalog.py
+++ b/plugins/modules/dw_database_catalog.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_database_catalog
 short_description: Create, manage, and destroy CDP Data Warehouse Database Catalogs
 description:
@@ -109,7 +99,6 @@
 """
 
 RETURN = r"""
----
 database_catalog:
   description: Details about the Database Catalog.
   returned: always
@@ -138,6 +127,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwDatabaseCatalog(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_database_catalog_info.py b/plugins/modules/dw_database_catalog_info.py
index a59e1af..23c160c 100644
--- a/plugins/modules/dw_database_catalog_info.py
+++ b/plugins/modules/dw_database_catalog_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_database_catalog_info
 short_description: Gather information about CDP Data Warehouse Database Catalogs
 description:
@@ -75,7 +65,6 @@
 """
 
 RETURN = r"""
----
 database_catalogs:
   description: Details about the Database Catalogs.
   returned: always
@@ -105,6 +94,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwDatabaseCatalogInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_virtual_warehouse.py b/plugins/modules/dw_virtual_warehouse.py
index 9517dad..4325407 100644
--- a/plugins/modules/dw_virtual_warehouse.py
+++ b/plugins/modules/dw_virtual_warehouse.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_virtual_warehouse
 short_description: Create, manage, and destroy CDP Data Warehouse Virtual Warehouses
 description:
@@ -327,7 +317,6 @@
 """
 
 RETURN = r"""
----
 virtual_warehouse:
   description: The details about the CDP Data Warehouse Virtual Warehouse.
   type: dict
@@ -392,6 +381,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwVirtualWarehouse(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/dw_virtual_warehouse_info.py b/plugins/modules/dw_virtual_warehouse_info.py
index d3ee2b4..35ec374 100644
--- a/plugins/modules/dw_virtual_warehouse_info.py
+++ b/plugins/modules/dw_virtual_warehouse_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: dw_virtual_warehouse_info
 short_description: Gather information about CDP Data Warehouse Virtual Warehouses
 description:
@@ -109,7 +99,6 @@
 """
 
 RETURN = r"""
----
 virtual_warehouses:
   description: The details about the CDP Data Warehouse Virtual Warehouse(s).
   type: list
@@ -175,6 +164,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class DwVirtualWarehouseInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env.py b/plugins/modules/env.py
index 9ce0280..7bfe049 100644
--- a/plugins/modules/env.py
+++ b/plugins/modules/env.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,18 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env
 short_description: Manage CDP Environments
 description:
@@ -387,7 +376,6 @@
 """
 
 RETURN = r"""
----
 environment:
   description: The information about the Environment
   type: dict
@@ -684,6 +672,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class Environment(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_auth.py b/plugins/modules/env_auth.py
index ddd8a2a..3fe5102 100644
--- a/plugins/modules/env_auth.py
+++ b/plugins/modules/env_auth.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_auth
 short_description: Set authentication details for the current CDP user
 description:
@@ -94,6 +84,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentAuthentication(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_auth_info.py b/plugins/modules/env_auth_info.py
index 68c1318..5183e6e 100644
--- a/plugins/modules/env_auth_info.py
+++ b/plugins/modules/env_auth_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,15 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
 module: env_auth_info
 short_description: Gather information about CDP environment authentication details
@@ -156,6 +147,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentAuthentication(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_automated_user_sync_info.py b/plugins/modules/env_automated_user_sync_info.py
index 2b2ae19..aa40eef 100644
--- a/plugins/modules/env_automated_user_sync_info.py
+++ b/plugins/modules/env_automated_user_sync_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = """
----
 module: env_automated_user_sync_info
 short_description: Get the status of the automated CDP Users and Groups synchronization service
 description:
@@ -109,6 +99,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentAutomatedUserSyncInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_cred.py b/plugins/modules/env_cred.py
index 4c8593e..1663487 100644
--- a/plugins/modules/env_cred.py
+++ b/plugins/modules/env_cred.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,18 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from cdpy.common import CdpError
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_cred
 short_description: Create, update, and destroy CDP credentials
 description:
@@ -176,6 +165,10 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from cdpy.common import CdpError
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentCredential(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_cred_info.py b/plugins/modules/env_cred_info.py
index f2ebe3c..aa64e44 100644
--- a/plugins/modules/env_cred_info.py
+++ b/plugins/modules/env_cred_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_cred_info
 short_description: Gather information about CDP Credentials
 description:
@@ -98,6 +88,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentCredentialInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_idbroker.py b/plugins/modules/env_idbroker.py
index f14d949..a3adb0a 100644
--- a/plugins/modules/env_idbroker.py
+++ b/plugins/modules/env_idbroker.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,18 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_idbroker
 short_description: Update ID Broker for CDP Environments
 description:
@@ -279,6 +268,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentIdBroker(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_idbroker_info.py b/plugins/modules/env_idbroker_info.py
index 5e2ea86..f0a7df9 100644
--- a/plugins/modules/env_idbroker_info.py
+++ b/plugins/modules/env_idbroker_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_idbroker_info
 short_description: Gather information about CDP ID Broker
 description:
@@ -171,6 +161,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentIdBrokerInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_info.py b/plugins/modules/env_info.py
index 263af2c..5ae9ed3 100644
--- a/plugins/modules/env_info.py
+++ b/plugins/modules/env_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_info
 short_description: Gather information about CDP Environments
 description:
@@ -410,6 +400,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_proxy.py b/plugins/modules/env_proxy.py
index 9a71251..d811789 100644
--- a/plugins/modules/env_proxy.py
+++ b/plugins/modules/env_proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_proxy
 short_description: Create, update, or destroy CDP Environment Proxies
 description:
@@ -120,7 +110,6 @@
 """
 
 RETURN = r"""
----
 proxy:
   description: Details on the proxy
   type: dict
@@ -172,6 +161,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentProxy(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_proxy_info.py b/plugins/modules/env_proxy_info.py
index b4661ca..e71a235 100644
--- a/plugins/modules/env_proxy_info.py
+++ b/plugins/modules/env_proxy_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_proxy_info
 short_description: Gather information about CDP Environment Proxies
 description:
@@ -111,6 +101,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentProxyInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_telemetry.py b/plugins/modules/env_telemetry.py
index b25d0d3..06c74f1 100644
--- a/plugins/modules/env_telemetry.py
+++ b/plugins/modules/env_telemetry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_telemetry
 short_description: Set CDP environment telemetry
 description:
@@ -84,6 +74,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentTelemetry(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_user_sync.py b/plugins/modules/env_user_sync.py
index 77d9c35..53f47e3 100644
--- a/plugins/modules/env_user_sync.py
+++ b/plugins/modules/env_user_sync.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,18 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
-
 DOCUMENTATION = r"""
----
 module: env_user_sync
 short_description: Sync CDP Users and Groups to Environments
 description:
@@ -177,6 +166,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentUserSync(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/env_user_sync_info.py b/plugins/modules/env_user_sync_info.py
index c69b247..c267c47 100644
--- a/plugins/modules/env_user_sync_info.py
+++ b/plugins/modules/env_user_sync_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: env_user_sync_info
 short_description: Get the status of a CDP Users and Groups sync
 description:
@@ -139,6 +129,9 @@
     elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class EnvironmentUserSyncInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/freeipa_info.py b/plugins/modules/freeipa_info.py
index ef4ba8f..f08f36f 100644
--- a/plugins/modules/freeipa_info.py
+++ b/plugins/modules/freeipa_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: freeipa_info
 short_description: Gather information about FreeIPA
 description:
@@ -98,6 +88,9 @@
             sample: []
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class FreeIPAInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/iam_group.py b/plugins/modules/iam_group.py
index d970201..3a33c32 100644
--- a/plugins/modules/iam_group.py
+++ b/plugins/modules/iam_group.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: iam_group
 short_description: Create, update, or destroy CDP IAM Groups
 description:
@@ -218,6 +208,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class IAMGroup(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/iam_group_info.py b/plugins/modules/iam_group_info.py
index e54291e..455a22d 100644
--- a/plugins/modules/iam_group_info.py
+++ b/plugins/modules/iam_group_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: iam_group_info
 short_description: Gather information about CDP Public IAM groups
 description:
@@ -128,6 +118,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class IAMGroupInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/iam_resource_role_info.py b/plugins/modules/iam_resource_role_info.py
index 76ea009..98ac36c 100644
--- a/plugins/modules/iam_resource_role_info.py
+++ b/plugins/modules/iam_resource_role_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: iam_resource_role_info
 short_description: Gather information about CDP Public IAM resource roles
 description:
@@ -92,6 +82,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 PAGE_SIZE = 50
 
 
diff --git a/plugins/modules/iam_role_info.py b/plugins/modules/iam_role_info.py
index 1e0a714..ac76a07 100644
--- a/plugins/modules/iam_role_info.py
+++ b/plugins/modules/iam_role_info.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
 # Copyright 2024 Cloudera, Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: iam_role_info
 short_description: Gather information about CDP Public IAM roles
 description:
@@ -76,6 +69,9 @@
       elements: dict
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class IAMRoleInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/iam_user_info.py b/plugins/modules/iam_user_info.py
index 99c90cf..c72bd99 100644
--- a/plugins/modules/iam_user_info.py
+++ b/plugins/modules/iam_user_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2024 Cloudera, Inc. All Rights Reserved.
@@ -15,18 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-import re
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: iam_user_info
 short_description: Gather information about CDP Public IAM users
 description:
@@ -174,6 +163,11 @@
   elements: str
 """
 
+import re
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class IAMUserInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/ml.py b/plugins/modules/ml.py
index aeea047..2939b84 100644
--- a/plugins/modules/ml.py
+++ b/plugins/modules/ml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,18 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ..module_utils.cdp_common import CdpModule
-
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: ml
 short_description: Create or Destroy CDP Machine Learning Workspaces
 description:
@@ -382,7 +371,6 @@
 """
 
 RETURN = r"""
----
 workspace:
   description: The information about the ML Workspace
   type: dict
@@ -578,6 +566,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class MLWorkspace(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/ml_info.py b/plugins/modules/ml_info.py
index e6317ea..bfdacf0 100644
--- a/plugins/modules/ml_info.py
+++ b/plugins/modules/ml_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: ml_info
 short_description: Gather information about CDP ML Workspaces
 description:
@@ -81,7 +71,6 @@
 """
 
 RETURN = r"""
----
 workspaces:
   description: The information about the named Workspace or Workspaces
   type: list
@@ -279,6 +268,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class MLInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/ml_workspace_access.py b/plugins/modules/ml_workspace_access.py
index 08909df..e836dc9 100644
--- a/plugins/modules/ml_workspace_access.py
+++ b/plugins/modules/ml_workspace_access.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,18 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ..module_utils.cdp_common import CdpModule
-
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: ml_workspace_access
 short_description: Grant and revoke user access to CDP Machine Learning Workspaces
 description:
@@ -91,7 +80,6 @@
 """
 
 RETURN = r"""
----
 workspace:
   description: The information about the user's access to the ML Workspace
   type: dict
@@ -112,6 +100,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class MLWorkspaceAccess(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/opdb.py b/plugins/modules/opdb.py
index 7d641bf..6107f64 100644
--- a/plugins/modules/opdb.py
+++ b/plugins/modules/opdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: opdb
 short_description: Create or destroy CDP OpDB Databases
 description:
@@ -106,7 +96,6 @@
 """
 
 RETURN = r"""
----
 database:
   description: The information about the Created Database
   type: dict
@@ -168,6 +157,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class OpdbDatabase(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/opdb_info.py b/plugins/modules/opdb_info.py
index 6998339..9d43b87 100644
--- a/plugins/modules/opdb_info.py
+++ b/plugins/modules/opdb_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: opdb_info
 short_description: Gather information about CDP OpDB Databases
 description:
@@ -70,7 +60,6 @@
 """
 
 RETURN = r"""
----
 databases:
   description: The information about the named Database or Databases
   type: list
@@ -136,6 +125,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class OpdbDatabaseInfo(CdpModule):
     def __init__(self, module):
diff --git a/plugins/modules/recipe.py b/plugins/modules/recipe.py
index 66fa193..92be9d0 100644
--- a/plugins/modules/recipe.py
+++ b/plugins/modules/recipe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,19 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-from cdpy.common import Squelch
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: recipe
 short_description: Manage a CDP recipe
 description:
@@ -103,7 +91,6 @@
 """
 
 RETURN = r"""
----
 recipe:
   description: The information about the recipe.
   type: dict
@@ -146,6 +133,11 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
+from cdpy.common import Squelch
+
 TYPES = [
     "POST_CLOUDERA_MANAGER_START",
     "PRE_TERMINATION",
diff --git a/plugins/modules/recipe_info.py b/plugins/modules/recipe_info.py
index e92d2bc..f982712 100644
--- a/plugins/modules/recipe_info.py
+++ b/plugins/modules/recipe_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright 2023 Cloudera, Inc. All Rights Reserved.
@@ -15,17 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "community",
-}
-
 DOCUMENTATION = r"""
----
 module: recipe_info
 short_description: Gather information about CDP recipes
 description:
@@ -76,7 +66,6 @@
 """
 
 RETURN = r"""
----
 recipes:
   description: The information about the named recipe or recipes
   type: list
@@ -120,6 +109,9 @@
   elements: str
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.cloudera.cloud.plugins.module_utils.cdp_common import CdpModule
+
 
 class RecipeInfo(CdpModule):
     def __init__(self, module):
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..6f63d4e
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,57 @@
+[project]
+name = "cloud"
+dynamic = ["version"]
+description = "cloudera.cloud Ansible collection"
+readme = "README.md"
+requires-python = ">=3.8"
+license = "Apache-2.0"
+keywords = []
+authors = [
+  { name = "Webster Mudge", email = "wmudge@cloudera.com" },
+]
+classifiers = []
+dependencies = []
+
+[tool.hatch.version]
+path = "galaxy.yml"
+pattern = "version:\\s+(?P<version>[\\d\\.]+)"
+
+[tool.hatch.envs.default]
+python = "3.12"
+skip-install = true
+dependencies = [
+  "pre-commit",
+  "coverage[toml]",
+  "pytest",
+  "pytest-mock",
+  # "pytest-cov",
+  "molecule",
+  "molecule-plugins",
+  "molecule-plugins[ec2]",
+  "tox-ansible",
+  "ansible-core<2.17", # For RHEL 8 support
+  "cdpy @ git+https://github.com/cloudera-labs/cdpy@main#egg=cdpy",
+]
+
+[tool.hatch.envs.lint]
+python = "3.12"
+skip-install = true
+extra-dependencies = [
+  "ansible-lint",
+]
+
+[tool.hatch.envs.lint.scripts]
+run = "pre-commit run -a"
+
+[tool.pytest.ini_options]
+testpaths = [
+  "tests",
+]
+filterwarnings = [
+  "ignore:AnsibleCollectionFinder has already been configured",
+  "ignore:'crypt' is deprecated and slated for removal in Python 3.13:DeprecationWarning",
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 02b6368..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023 Cloudera, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[pytest]
-filterwarnings =
-    ignore::DeprecationWarning