diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index 00df2de7a0..d4c50bc397 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -1024,6 +1024,7 @@ class InventorySourceOptions(BaseModel):
             # If a credential was provided, it's important that it matches
             # the actual inventory source being used (Amazon requires Amazon
             # credentials; Rackspace requires Rackspace credentials; etc...)
+            # TODO: AAP-53978 check that this matches new awx-plugin content for ESXI
             if source == 'vmware_esxi' and source.replace('vmware_esxi', 'vmware') != cred.kind:
                 return _('VMWARE inventory sources (such as %s) require credentials for the matching cloud service.') % source
             if source == 'ec2' and source.replace('ec2', 'aws') != cred.kind:
diff --git a/awx/main/tests/functional/api/test_inventory.py b/awx/main/tests/functional/api/test_inventory.py
index ed39d78f7d..dadc587198 100644
--- a/awx/main/tests/functional/api/test_inventory.py
+++ b/awx/main/tests/functional/api/test_inventory.py
@@ -521,6 +521,7 @@ class TestInventorySourceCredential:
         patch(url=inv_src.get_absolute_url(), data={'credential': aws_cred.pk}, expect=200, user=admin_user)
         assert list(inv_src.credentials.values_list('id', flat=True)) == [aws_cred.pk]
 
+    @pytest.skip(reason="Delay until AAP-53978 completed")
     def test_vmware_cred_create_esxi_source(self, inventory, admin_user, organization, post, get):
         """Test that a vmware esxi source can be added with a vmware credential"""
         from awx.main.models.credential import Credential, CredentialType
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 0ed9b96125..63a45c311c 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -602,6 +602,7 @@ VMWARE_VALIDATE_CERTS = False
 # -----------------
 # -- VMware ESXi --
 # -----------------
+# TODO: Verify matches with AAP-53978 solution in awx-plugins
 VMWARE_ESXI_EXCLUDE_EMPTY_GROUPS = True
 
 # ---------------------------
diff --git a/setup.cfg b/setup.cfg
index 1430906129..5bdd769859 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,14 +13,3 @@ include_package_data = True
 [options.entry_points]
 console_scripts =
     awx-manage = awx:manage
-awx.credential_plugins =
-    conjur = awx.main.credential_plugins.conjur:conjur_plugin
-    hashivault_kv = awx.main.credential_plugins.hashivault:hashivault_kv_plugin
-    hashivault_ssh = awx.main.credential_plugins.hashivault:hashivault_ssh_plugin
-    azure_kv = awx.main.credential_plugins.azure_kv:azure_keyvault_plugin
-    aim = awx.main.credential_plugins.aim:aim_plugin
-    centrify_vault_kv = awx.main.credential_plugins.centrify_vault:centrify_plugin
-    thycotic_dsv = awx.main.credential_plugins.dsv:dsv_plugin
-    thycotic_tss = awx.main.credential_plugins.tss:tss_plugin
-    aws_secretsmanager_credential = awx.main.credential_plugins.aws_secretsmanager:aws_secretmanager_plugin
-    github_app = awx.main.credential_plugins.github_app:github_app_lookup_plugin