diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index 64f66006d..63e8f2b77 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -18,13 +18,13 @@
 #
 # [*scheduler_driver*]
 #   (optional) Default driver to use for the scheduler
-#   Defaults to 'nova.scheduler.filter_scheduler.FilterScheduler'
+#   Defaults to 'filter_scheduler'
 #
 class nova::scheduler(
   $enabled          = true,
   $manage_service   = true,
   $ensure_package   = 'present',
-  $scheduler_driver = 'nova.scheduler.filter_scheduler.FilterScheduler',
+  $scheduler_driver = 'filter_scheduler',
 ) {
 
   include ::nova::deps
diff --git a/manifests/scheduler/filter.pp b/manifests/scheduler/filter.pp
index 061ee4f7d..befa7d49f 100644
--- a/manifests/scheduler/filter.pp
+++ b/manifests/scheduler/filter.pp
@@ -6,7 +6,7 @@
 #
 # [*scheduler_host_manager*]
 #   (optional) The scheduler host manager class to use
-#   Defaults to 'nova.scheduler.host_manager.HostManager'
+#   Defaults to 'host_manager'
 #
 # [*scheduler_max_attempts*]
 #   (optional) Maximum number of attempts to schedule an instance
@@ -65,7 +65,7 @@
 #   Defaults to false
 #
 class nova::scheduler::filter (
-  $scheduler_host_manager              = 'nova.scheduler.host_manager.HostManager',
+  $scheduler_host_manager              = 'host_manager',
   $scheduler_max_attempts              = '3',
   $scheduler_host_subset_size          = '1',
   $cpu_allocation_ratio                = '16.0',
diff --git a/releasenotes/notes/scheduler_entrypoints-467a5083d8f65e3d.yaml b/releasenotes/notes/scheduler_entrypoints-467a5083d8f65e3d.yaml
new file mode 100644
index 000000000..a264f40fe
--- /dev/null
+++ b/releasenotes/notes/scheduler_entrypoints-467a5083d8f65e3d.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - Change default values for scheduler_driver and scheduler_host_manager to match
+    defaults values in Nova, so now we use entrypoints.
diff --git a/spec/classes/nova_scheduler_filter_spec.rb b/spec/classes/nova_scheduler_filter_spec.rb
index 857f4b008..ed7d27f92 100644
--- a/spec/classes/nova_scheduler_filter_spec.rb
+++ b/spec/classes/nova_scheduler_filter_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'nova::scheduler::filter' do
 
-  it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_manager').with_value('nova.scheduler.host_manager.HostManager') }
+  it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_manager').with_value('host_manager') }
   it { is_expected.to contain_nova_config('DEFAULT/scheduler_max_attempts').with_value('3') }
   it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_subset_size').with_value('1') }
   it { is_expected.to contain_nova_config('DEFAULT/cpu_allocation_ratio').with_value('16.0') }
diff --git a/spec/classes/nova_scheduler_spec.rb b/spec/classes/nova_scheduler_spec.rb
index fe9b22c64..34873482e 100644
--- a/spec/classes/nova_scheduler_spec.rb
+++ b/spec/classes/nova_scheduler_spec.rb
@@ -20,7 +20,7 @@ describe 'nova::scheduler' do
       :ensure    => 'running'
     )}
 
-    it { is_expected.to contain_nova_config('DEFAULT/scheduler_driver').with_value('nova.scheduler.filter_scheduler.FilterScheduler') }
+    it { is_expected.to contain_nova_config('DEFAULT/scheduler_driver').with_value('filter_scheduler') }
 
     context 'with manage_service as false' do
       let :params do