diff --git a/awx/main/migrations/0032_v302_credential_permissions_update.py b/awx/main/migrations/0032_v302_credential_permissions_update.py
index a961be6dcf..2587588e6d 100644
--- a/awx/main/migrations/0032_v302_credential_permissions_update.py
+++ b/awx/main/migrations/0032_v302_credential_permissions_update.py
@@ -25,5 +25,6 @@ class Migration(migrations.Migration):
             name='use_role',
             field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'admin_role'], to='main.Role', null=b'True'),
         ),
+        migrations.RunPython(rbac.infer_credential_org_from_team),
         migrations.RunPython(rbac.rebuild_role_hierarchy),
     ]
diff --git a/awx/main/migrations/_rbac.py b/awx/main/migrations/_rbac.py
index b60ac65691..245adc58ef 100644
--- a/awx/main/migrations/_rbac.py
+++ b/awx/main/migrations/_rbac.py
@@ -489,4 +489,7 @@ def rebuild_role_hierarchy(apps, schema_editor):
         logger.info('Rebuild completed in %f seconds' % (stop - start))
         logger.info('Done.')
 
-
+def infer_credential_org_from_team(apps, schema_editor):
+    Credential = apps.get_model('main', "Credential")
+    for cred in Credential.objects.exclude(deprecated_team__isnull=True):
+        _update_credential_parents(cred.deprecated_team.organization, cred)