diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml
index 7d89be82612..4f71c572ee9 100644
--- a/db/fixtures/miq_product_features.yml
+++ b/db/fixtures/miq_product_features.yml
@@ -5078,11 +5078,19 @@
   :identifier: ems_automation
   :children:
   - :name: View
-    :description: View Providers, Inventory Groups, Configured Systems
+    :description: View Providers
     :feature_type: view
     :identifier: ems_automation_view
+    :children:
+    - :name: List
+      :description: Display Lists of Providers
+      :identifier: ems_automation_manager_show_list
+    - :name: Show
+      :description: Display Individual Providers
+      :feature_type: view
+      :identifier: ems_automation_manager_show
   - :name: Operate
-    :description: Perform Operations on Providers and Configured Systems
+    :description: Perform Operations on Providers
     :feature_type: control
     :identifier: ems_automation_control
     :children:
@@ -5120,7 +5128,7 @@
       :feature_type: admin
       :identifier: ems_automation_add_provider
 - :name: Configured Systems
-  :description: Everything under Configured Systems accordion
+  :description: Everything under Configured Systems
   :feature_type: node
   :identifier: automation_manager_configured_system
   :children:
@@ -5147,7 +5155,7 @@
       :identifier: automation_manager_configured_system_tag
 
 - :name: Templates
-  :description: Everything under Templates accordion
+  :description: Everything under Templates
   :feature_type: node
   :identifier: configuration_script
   :children:
diff --git a/db/fixtures/miq_shortcuts.yml b/db/fixtures/miq_shortcuts.yml
index bcb144bf70e..614a2ab448b 100644
--- a/db/fixtures/miq_shortcuts.yml
+++ b/db/fixtures/miq_shortcuts.yml
@@ -474,10 +474,10 @@
   :url: /ansible_credential
   :rbac_feature_name: embedded_automation_manager_credentials
   :startup: true
-- :name: automation_manager
-  :description: Automation / Ansible Tower / Explorer
-  :url: /automation_manager/explorer
-  :rbac_feature_name: automation_manager
+- :name: ems_automation
+  :description: Automation / Ansible Tower / Providers
+  :url: /ems_automation/show_list
+  :rbac_feature_name: ems_automation
   :startup: true
 - :name: configuration_job
   :description: Automation / Ansible Tower / Jobs
diff --git a/db/fixtures/miq_user_roles.yml b/db/fixtures/miq_user_roles.yml
index dbd194d49e0..54aa1a9a2d6 100644
--- a/db/fixtures/miq_user_roles.yml
+++ b/db/fixtures/miq_user_roles.yml
@@ -11,7 +11,9 @@
   - about
   - add_global_filter
   - all_vm_rules
-  - automation_manager
+  - ems_automation
+  - automation_manager_configured_system
+  - configuration_script
   - embedded_automation_manager
   - availability_zone
   - host_aggregate
@@ -190,7 +192,7 @@
   :read_only: true
   :miq_product_feature_identifiers:
   - about
-  - automation_manager
+  - ems_automation
   - embedded_automation_manager
   - chargeback
   - chargeback_reports
@@ -290,7 +292,9 @@
   :miq_product_feature_identifiers:
   - about
   - all_vm_rules
-  - automation_manager
+  - ems_automation
+  - automation_manager_configured_system
+  - configuration_script
   - ems_configuration
   - configuration_profile
   - configured_system
@@ -363,7 +367,9 @@
   :miq_product_feature_identifiers:
   - about
   - all_vm_rules
-  - automation_manager
+  - ems_automation
+  - automation_manager_configured_system
+  - configuration_script
   - embedded_automation_manager
   - chargeback
   - chargeback_reports
@@ -888,7 +894,9 @@
   :miq_product_feature_identifiers:
   - about
   - all_vm_rules
-  - automation_manager
+  - ems_automation
+  - automation_manager_configured_system
+  - configuration_script
   - embedded_automation_manager
   - ems_physical_infra_console
   - catalog_items_view
@@ -950,7 +958,9 @@
   :miq_product_feature_identifiers:
   - about
   - all_vm_rules
-  - automation_manager
+  - ems_automation
+  - automation_manager_configured_system
+  - configuration_script
   - ems_configuration
   - configuration_profile
   - configured_system
@@ -1016,7 +1026,9 @@
   :read_only: true
   :miq_product_feature_identifiers:
   - about
-  - automation_manager
+  - ems_automation
+  - automation_manager_configured_system
+  - configuration_script
   - embedded_automation_manager
   - availability_zone
   - host_aggregate
@@ -1080,7 +1092,9 @@
   :read_only: true
   :miq_product_feature_identifiers:
   - about
-  - automation_manager
+  - ems_automation
+  - automation_manager_configured_system
+  - configuration_script
   - embedded_automation_manager
   - availability_zone
   - host_aggregate