diff --git a/awx/main/models/ad_hoc_commands.py b/awx/main/models/ad_hoc_commands.py
index 77500e9a7b..d6e173d181 100644
--- a/awx/main/models/ad_hoc_commands.py
+++ b/awx/main/models/ad_hoc_commands.py
@@ -14,9 +14,11 @@ from django.core.exceptions import ValidationError
 
 # AWX
 from awx.api.versioning import reverse
-from awx.main.models.base import * # noqa
+from awx.main.models.base import (
+    prevent_search, AD_HOC_JOB_TYPE_CHOICES, VERBOSITY_CHOICES, VarsDictProperty
+)
 from awx.main.models.events import AdHocCommandEvent
-from awx.main.models.unified_jobs import * # noqa
+from awx.main.models.unified_jobs import UnifiedJob
 from awx.main.models.notifications import JobNotificationMixin, NotificationTemplate
 
 logger = logging.getLogger('awx.main.models.ad_hoc_commands')
diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py
index ffcc087530..0df7c32d92 100644
--- a/awx/main/models/credential/__init__.py
+++ b/awx/main/models/credential/__init__.py
@@ -25,7 +25,7 @@ from awx.main.fields import (ImplicitRoleField, CredentialInputField,
 from awx.main.utils import decrypt_field
 from awx.main.utils.safe_yaml import safe_dump
 from awx.main.validators import validate_ssh_private_key
-from awx.main.models.base import * # noqa
+from awx.main.models.base import CommonModelNameNotUnique, PasswordFieldsModel
 from awx.main.models.mixins import ResourceMixin
 from awx.main.models.rbac import (
     ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index d2ac9ca6af..b098d2e4a9 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -33,9 +33,15 @@ from awx.main.fields import (
     SmartFilterField,
 )
 from awx.main.managers import HostManager
-from awx.main.models.base import * # noqa
+from awx.main.models.base import (
+    BaseModel,
+    CommonModelNameNotUnique,
+    VarsDictProperty,
+    CLOUD_INVENTORY_SOURCES,
+    prevent_search
+)
 from awx.main.models.events import InventoryUpdateEvent
-from awx.main.models.unified_jobs import * # noqa
+from awx.main.models.unified_jobs import UnifiedJob, UnifiedJobTemplate
 from awx.main.models.mixins import (
     ResourceMixin,
     TaskManagerInventoryUpdateMixin,
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index f47058cd3d..471eaafc91 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -25,9 +25,16 @@ from rest_framework.exceptions import ParseError
 
 # AWX
 from awx.api.versioning import reverse
-from awx.main.models.base import * # noqa
+from awx.main.models.base import (
+    BaseModel, CreatedModifiedModel,
+    prevent_search,
+    JOB_TYPE_CHOICES, VERBOSITY_CHOICES,
+    VarsDictProperty
+)
 from awx.main.models.events import JobEvent, SystemJobEvent
-from awx.main.models.unified_jobs import * # noqa
+from awx.main.models.unified_jobs import (
+    UnifiedJobTemplate, UnifiedJob
+)
 from awx.main.models.notifications import (
     NotificationTemplate,
     JobNotificationMixin,
diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py
index 02c31b5870..39cea4917b 100644
--- a/awx/main/models/notifications.py
+++ b/awx/main/models/notifications.py
@@ -11,7 +11,7 @@ from django.utils.encoding import smart_str, force_text
 
 # AWX
 from awx.api.versioning import reverse
-from awx.main.models.base import * # noqa
+from awx.main.models.base import CommonModelNameNotUnique, CreatedModifiedModel
 from awx.main.utils import encrypt_field, decrypt_field, set_environ
 from awx.main.notifications.email_backend import CustomEmailBackend
 from awx.main.notifications.slack_backend import SlackBackend
diff --git a/awx/main/models/organization.py b/awx/main/models/organization.py
index d1373442b2..8379cfa0cd 100644
--- a/awx/main/models/organization.py
+++ b/awx/main/models/organization.py
@@ -15,7 +15,10 @@ from django.utils.timezone import now as tz_now
 # AWX
 from awx.api.versioning import reverse
 from awx.main.fields import AutoOneToOneField, ImplicitRoleField
-from awx.main.models.base import * # noqa
+from awx.main.models.base import (
+    BaseModel, CommonModel, CommonModelNameNotUnique, CreatedModifiedModel,
+    NotificationFieldsModel
+)
 from awx.main.models.rbac import (
     ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
     ROLE_SINGLETON_SYSTEM_AUDITOR,
diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py
index 0e46bacaf3..1759375b51 100644
--- a/awx/main/models/projects.py
+++ b/awx/main/models/projects.py
@@ -18,7 +18,7 @@ from django.utils.timezone import now, make_aware, get_default_timezone
 
 # AWX
 from awx.api.versioning import reverse
-from awx.main.models.base import * # noqa
+from awx.main.models.base import PROJECT_UPDATE_JOB_TYPE_CHOICES, PERM_INVENTORY_DEPLOY
 from awx.main.models.events import ProjectUpdateEvent
 from awx.main.models.notifications import (
     NotificationTemplate,
@@ -28,6 +28,7 @@ from awx.main.models.unified_jobs import (
     UnifiedJob,
     UnifiedJobTemplate,
 )
+from awx.main.models.jobs import Job
 from awx.main.models.mixins import (
     ResourceMixin,
     TaskManagerProjectUpdateMixin,
diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py
index ca3ee97ce8..c5125d9c08 100644
--- a/awx/main/models/rbac.py
+++ b/awx/main/models/rbac.py
@@ -16,7 +16,6 @@ from django.utils.translation import ugettext_lazy as _
 # AWX
 from awx.api.versioning import reverse
 from django.contrib.auth.models import User # noqa
-from awx.main.models.base import * # noqa
 
 __all__ = [
     'Role',
diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py
index 62ec12c206..4de3c7ea71 100644
--- a/awx/main/models/schedules.py
+++ b/awx/main/models/schedules.py
@@ -18,7 +18,7 @@ from django.utils.translation import ugettext_lazy as _
 
 # AWX
 from awx.api.versioning import reverse
-from awx.main.models.base import * # noqa
+from awx.main.models.base import CommonModel
 from awx.main.models.jobs import LaunchTimeConfig
 from awx.main.utils import ignore_inventory_computed_fields
 from awx.main.consumers import emit_channel_notification
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 1c7b8b2832..f6b414aca8 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -46,7 +46,15 @@ from crum import impersonate
 from awx import __version__ as awx_application_version
 from awx.main.constants import CLOUD_PROVIDERS, PRIVILEGE_ESCALATION_METHODS, STANDARD_INVENTORY_UPDATE_ENV
 from awx.main.access import access_registry
-from awx.main.models import * # noqa
+from awx.main.models import (
+    Schedule, TowerScheduleState, Instance, InstanceGroup,
+    UnifiedJob, Notification,
+    Inventory, SmartInventoryMembership,
+    Job, AdHocCommand, ProjectUpdate, InventoryUpdate, SystemJob,
+    Project,
+    JobEvent, ProjectUpdateEvent, InventoryUpdateEvent, AdHocCommandEvent, SystemJobEvent,
+    build_safe_env
+)
 from awx.main.constants import ACTIVE_STATES
 from awx.main.exceptions import AwxTaskError
 from awx.main.queue import CallbackQueueDispatcher