diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/azure_credential.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/azure_credential.rb
index 5888e95b173..bf90bbb606e 100644
--- a/app/models/manageiq/providers/embedded_ansible/automation_manager/azure_credential.rb
+++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/azure_credential.rb
@@ -1,4 +1,4 @@
 # This corresponds to Ansible Tower's Azure Resource Manager (azure_rm) type credential.  We are not modeling the deprecated Azure classic
-class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::AzureCredential <
-  ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
+class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::AzureCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
+  include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::AzureCredential
 end
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/google_credential.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/google_credential.rb
index 6bdfa51b389..e0ea8258ece 100644
--- a/app/models/manageiq/providers/embedded_ansible/automation_manager/google_credential.rb
+++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/google_credential.rb
@@ -1,2 +1,3 @@
 class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::GoogleCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
+  include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::GoogleCredential
 end
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/network_credential.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/network_credential.rb
index 68bd424dab1..eaf3a86d6a6 100644
--- a/app/models/manageiq/providers/embedded_ansible/automation_manager/network_credential.rb
+++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/network_credential.rb
@@ -1,3 +1,3 @@
-class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::NetworkCredential <
-  ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Credential
+class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::NetworkCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Credential
+  include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::NetworkCredential
 end
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/openstack_credential.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/openstack_credential.rb
index 0c01ae4f812..1cd57212429 100644
--- a/app/models/manageiq/providers/embedded_ansible/automation_manager/openstack_credential.rb
+++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/openstack_credential.rb
@@ -1,2 +1,3 @@
 class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::OpenstackCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
+  include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::OpenstackCredential
 end
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/rackspace_credential.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/rackspace_credential.rb
index 48cb46f6849..b3856184589 100644
--- a/app/models/manageiq/providers/embedded_ansible/automation_manager/rackspace_credential.rb
+++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/rackspace_credential.rb
@@ -1,2 +1,3 @@
 class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::RackspaceCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
+  include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::RackspaceCredential
 end
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/satellite6_credential.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/satellite6_credential.rb
index 7a97c0ec7c9..01c0b597a2f 100644
--- a/app/models/manageiq/providers/embedded_ansible/automation_manager/satellite6_credential.rb
+++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/satellite6_credential.rb
@@ -1,2 +1,3 @@
 class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Satellite6Credential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
+  include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::Satellite6Credential
 end
diff --git a/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_v2.yml b/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_v2.yml
index 9b75de802fa..fcf91bf9cd3 100644
--- a/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_v2.yml
+++ b/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_v2.yml
@@ -9529,7 +9529,7 @@ http_interactions:
         "", "last_name": ""}}, "created": "2015-12-17T16:55:29.495Z", "modified":
         "2015-12-17T21:27:48.511Z", "name": "Openstack", "description": "RHOS in NC",
         "user": 2, "team": null, "kind": "openstack", "cloud": true, "host": "http://10.8.96.4:5000/v2.0",
-        "username": "admin", "password": "$encrypted$", "security_token": "", "project":
+        "username": "admin", "password": "$encrypted$", "security_token": "", "domain": "d.com", "project":
         "admin", "ssh_key_data": "", "ssh_key_unlock": "", "become_method": "", "become_username":
         "", "become_password": "", "vault_password": ""}, {"id": 3, "type": "credential",
         "url": "/api/v1/credentials/3/", "related": {"created_by": "/api/v1/users/1/",