diff --git a/manifests/api.pp b/manifests/api.pp
index 4243da5e..74df7c9b 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -27,7 +27,7 @@
 #
 # [*workers*]
 #   (optional) Number of Glance API worker processes to start
-#   Default: $::processorcount
+#   Default: $::os_workers.
 #
 # [*log_file*]
 #   (optional) The path of file used for logging
@@ -320,7 +320,7 @@ class glance::api(
   $bind_host                            = $::os_service_default,
   $bind_port                            = '9292',
   $backlog                              = $::os_service_default,
-  $workers                              = $::processorcount,
+  $workers                              = $::os_workers,
   $log_file                             = undef,
   $log_dir                              = undef,
   $registry_host                        = '0.0.0.0',
diff --git a/manifests/glare.pp b/manifests/glare.pp
index 156a9723..ab35db6c 100644
--- a/manifests/glare.pp
+++ b/manifests/glare.pp
@@ -23,7 +23,7 @@
 #
 # [*workers*]
 #   (optional) Number of Glance Glare worker processes to start
-#   Default: $::processorcount
+#   Default: $::os_workers.
 #
 # [*auth_strategy*]
 #   (optional) Type is authorization being used.
@@ -134,7 +134,7 @@ class glance::glare(
   $bind_host                 = '0.0.0.0',
   $bind_port                 = '9494',
   $backlog                   = '4096',
-  $workers                   = $::processorcount,
+  $workers                   = $::os_workers,
   $auth_strategy             = 'keystone',
   $pipeline                  = 'keystone',
   $manage_service            = true,
diff --git a/manifests/registry.pp b/manifests/registry.pp
index b1ed97f0..a6aa8025 100644
--- a/manifests/registry.pp
+++ b/manifests/registry.pp
@@ -22,7 +22,7 @@
 #  [*workers*]
 #    (optional) The number of child process workers that will be
 #    created to service Registry requests.
-#    Defaults to: $::processorcount
+#    Defaults to: $::os_workers.
 #
 #  [*log_file*]
 #    (optional) Log file for glance-registry.
@@ -174,7 +174,7 @@ class glance::registry(
   $debug                   = undef,
   $bind_host               = $::os_service_default,
   $bind_port               = '9191',
-  $workers                 = $::processorcount,
+  $workers                 = $::os_workers,
   $log_file                = undef,
   $log_dir                 = undef,
   $database_connection     = undef,
diff --git a/releasenotes/notes/os_workers_for_worker_count-f86aa67474d5cac9.yaml b/releasenotes/notes/os_workers_for_worker_count-f86aa67474d5cac9.yaml
new file mode 100644
index 00000000..5616f0d7
--- /dev/null
+++ b/releasenotes/notes/os_workers_for_worker_count-f86aa67474d5cac9.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - Parameters that control the number of spawned child processes for
+    distributing processing have had their default value changed from
+    ::processorcount to ::os_workers.
diff --git a/spec/classes/glance_registry_spec.rb b/spec/classes/glance_registry_spec.rb
index 6bef35b2..220d1877 100644
--- a/spec/classes/glance_registry_spec.rb
+++ b/spec/classes/glance_registry_spec.rb
@@ -7,7 +7,7 @@ describe 'glance::registry' do
       :use_stderr             => '<SERVICE DEFAULT>',
       :bind_host              => '<SERVICE DEFAULT>',
       :bind_port              => '9191',
-      :workers                => facts[:processorcount],
+      :workers                => facts[:os_workers],
       :log_file               => '/var/log/glance/registry.log',
       :log_dir                => '/var/log/glance',
       :enabled                => true,