diff --git a/defaults/main.yml b/defaults/main.yml
index 6bd76d2..d1254a6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,31 +1,36 @@
 ---
-manageiq_workers_validate_parameters: True
-manageiq_default_memory_threshold: "400.megabytes"
-manageiq_default_thread_count: 1
-manageiq_ansible_memory_threshold: "0.megabytes"
-manageiq_event_monitor_memory_threshold: "2.gigabytes"
-manageiq_c_and_u_data_collector_memory_threshold: "400.megabytes"
+# Exposed in the UI
+manageiq_generic_worker_thread_count: 2
+manageiq_generic_worker_memory_threshold: "500.megabytes"
+manageiq_priority_worker_thread_count: 2
+manageiq_priority_worker_memory_threshold: "600.megabytes"
 manageiq_c_and_u_data_collector_thread_count: 2
-manageiq_c_and_u_data_processor_memory_threshold: "500.megabytes"
+manageiq_c_and_u_data_collector_memory_threshold: "400.megabytes"
 manageiq_c_and_u_data_processor_thread_count: 2
-manageiq_generic_worker_memory_threshold: "600.megabytes"
-manageiq_generic_worker_thread_count: 4
-manageiq_priority_worker_memory_threshold: "600.megabytes"
-manageiq_priority_worker_thread_count: 4
-manageiq_reporting_worker_memory_threshold: "500.megabytes"
-manageiq_reporting_worker_thread_count: 2
-manageiq_ui_worker_memory_threshold: "1.gigabytes"
-manageiq_ui_worker_thread_count: 4
+manageiq_c_and_u_data_processor_memory_threshold: "600.megabytes"
+manageiq_event_monitor_memory_threshold: "2.gigabytes"
+manageiq_refresh_worker: "2.gigabytes"
 manageiq_connection_broker_memory_threshold: "2.gigabytes"
-manageiq_web_service_worker_memory_threshold: "1.gigabytes"
+manageiq_vm_analysis_collector_thread_count: 2
+manageiq_vm_analysis_collector_memory_threshold: "2.gigabytes"
+manageiq_ui_worker_thread_count: 1
+manageiq_websocket_worker_thread_count: 1
+manageiq_reporting_worker_thread_count: 2
+manageiq_reporting_worker_memory_threshold: "500.megabytes"
 manageiq_web_service_worker_thread_count: 1
+manageiq_web_service_worker_memory_threshold: "1.gigabytes"
+
+# Not exposed in the UI
+manageiq_default_memory_threshold: "500.megabytes"
+manageiq_default_thread_count: 1
+manageiq_ansible_memory_threshold: "0.megabytes"
+manageiq_ui_worker_memory_threshold: "1.gigabytes"
 manageiq_websocket_worker_memory_threshold: "1.gigabytes"
-manageiq_websocket_worker_thread_count: 1
-manageiq_vm_analysis_collector_memory_threshold: "600.megabytes"
-manageiq_vm_analysis_collector_thread_count: 2
 manageiq_vmdb_storage_bridge_worker_memory_threshold: "2.gigabytes"
 manageiq_schedule_worker_memory_threshold: "500.megabytes"
 manageiq_netapp_refresh_worker_memory_threshold: "2.gigabytes"
-manageiq_refresh_worker: "2.gigabytes"
 manageiq_sims_refresh_worker_memory_threshold: "1.gigabytes"
 manageiq_storage_metrics_collector_worker_thread_count: 2
+
+# Other
+manageiq_workers_validate_parameters: True
diff --git a/tasks/validate.yml b/tasks/validate.yml
index 95b6a45..075961b 100644
--- a/tasks/validate.yml
+++ b/tasks/validate.yml
@@ -72,8 +72,8 @@
 - name: ManageIQ Workers | Validate variables | VM Analysis Collectors | Memory Threshold
   assert:
     that:
-      - "manageiq_vm_analysis_collector_memory_threshold in manageiq_valid_memory_threshold_0"
-    msg: "manageiq_vm_analysis_collector_memory_threshold ({{ manageiq_vm_analysis_collector_memory_threshold }}) must be in {{ manageiq_valid_memory_threshold_0 }}"
+      - "manageiq_vm_analysis_collector_memory_threshold in manageiq_valid_memory_threshold_2"
+    msg: "manageiq_vm_analysis_collector_memory_threshold ({{ manageiq_vm_analysis_collector_memory_threshold }}) must be in {{ manageiq_valid_memory_threshold_2 }}"
 
 - name: ManageIQ Workers | Validate variables | VM Analysis Collectors | Thread Count
   assert: