diff --git a/defaults/main.yml b/defaults/main.yml
index 1bd793f2..a40f36bc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -240,10 +240,9 @@ nova_scheduler_driver_task_period: 60
 nova_scheduler_host_subset_size: 10
 nova_scheduler_max_attempts: 5
 nova_scheduler_default_filters: "RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateCoreFilter,AggregateDiskFilter"
-nova_scheduler_driver: nova.scheduler.filter_scheduler.FilterScheduler
+nova_scheduler_driver: filter_scheduler
 nova_scheduler_available_filters: nova.scheduler.filters.all_filters
-nova_scheduler_host_manager: nova.scheduler.host_manager.HostManager
-nova_scheduler_manager: nova.scheduler.manager.SchedulerManager
+nova_scheduler_host_manager: host_manager
 nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers
 nova_scheduler_program_name: nova-scheduler
 
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index cdadb1e0..9d6c862c 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -50,7 +50,6 @@ scheduler_default_filters = {{ nova_scheduler_default_filters }}
 scheduler_driver_task_period = {{ nova_scheduler_driver_task_period }}
 scheduler_host_manager = {{ nova_scheduler_host_manager }}
 scheduler_host_subset_size = {{ nova_scheduler_host_subset_size }}
-scheduler_manager = {{ nova_scheduler_manager }}
 scheduler_max_attempts = {{ nova_scheduler_max_attempts }}
 scheduler_weight_classes = {{ nova_scheduler_weight_classes }}