diff --git a/app/models/manageiq/providers/automation_manager.rb b/app/models/manageiq/providers/automation_manager.rb
index 6a1ded0901e5..cd84a4adc9ea 100644
--- a/app/models/manageiq/providers/automation_manager.rb
+++ b/app/models/manageiq/providers/automation_manager.rb
@@ -11,12 +11,7 @@ class ManageIQ::Providers::AutomationManager < ManageIQ::Providers::BaseManager
 
   has_many :configured_systems,           :dependent => :destroy, :foreign_key => "manager_id"
   has_many :configuration_profiles,       :dependent => :destroy, :foreign_key => "manager_id"
-  has_many :configuration_scripts,
-           :dependent   => :destroy,
-           :foreign_key => "manager_id",
-           :class_name  => "::ConfigurationScript",
-           :inverse_of  => :manager
-
+  has_many :configuration_scripts,        :dependent => :destroy, :foreign_key => "manager_id"
   has_many :configuration_workflows,      :dependent => :destroy, :foreign_key => "manager_id", :inverse_of => :manager
   has_many :credentials,                  :class_name => "ManageIQ::Providers::AutomationManager::Authentication",
            :as => :resource, :dependent => :destroy
diff --git a/app/models/manageiq/providers/automation_manager/configuration_workflow.rb b/app/models/manageiq/providers/automation_manager/configuration_workflow.rb
deleted file mode 100644
index 0e5823e95796..000000000000
--- a/app/models/manageiq/providers/automation_manager/configuration_workflow.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class ManageIQ::Providers::AutomationManager::ConfigurationWorkflow < ::ConfigurationScript
-  belongs_to :manager, :class_name => "ManageIQ::Providers::AutomationManager", :inverse_of => :configuration_workflows
-end
diff --git a/app/models/manageiq/providers/embedded_automation_manager/configuration_workflow.rb b/app/models/manageiq/providers/embedded_automation_manager/configuration_workflow.rb
index e5a199ffeabf..b73583358dc4 100644
--- a/app/models/manageiq/providers/embedded_automation_manager/configuration_workflow.rb
+++ b/app/models/manageiq/providers/embedded_automation_manager/configuration_workflow.rb
@@ -1,2 +1,2 @@
-class ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationWorkflow < ManageIQ::Providers::AutomationManager::ConfigurationWorkflow
+class ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationWorkflow < ManageIQ::Providers::AutomationManager::ConfigurationScript
 end
diff --git a/app/models/manageiq/providers/external_automation_manager/configuration_workflow.rb b/app/models/manageiq/providers/external_automation_manager/configuration_workflow.rb
index 91106c539903..1aee93451939 100644
--- a/app/models/manageiq/providers/external_automation_manager/configuration_workflow.rb
+++ b/app/models/manageiq/providers/external_automation_manager/configuration_workflow.rb
@@ -1,2 +1,2 @@
-class ManageIQ::Providers::ExternalAutomationManager::ConfigurationWorkflow < ManageIQ::Providers::AutomationManager::ConfigurationWorkflow
+class ManageIQ::Providers::ExternalAutomationManager::ConfigurationWorkflow < ManageIQ::Providers::AutomationManager::ConfigurationScript
 end