diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index ddb17e9b7..17bd889b9 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -32,7 +32,7 @@
 #
 # [*workers*]
 #   (Optional) Number of WSGI workers to spawn.
-#   Defaults to $::os_workers
+#   Defaults to $::os_workers_keystone
 #
 # [*ssl_cert*]
 #   (Optional) Path to SSL certificate
@@ -139,7 +139,7 @@ class keystone::wsgi::apache (
   $api_port                          = 5000,
   $path                              = '/',
   $ssl                               = true,
-  $workers                           = $::os_workers,
+  $workers                           = $::os_workers_keystone,
   $ssl_cert                          = undef,
   $ssl_key                           = undef,
   $ssl_chain                         = undef,
diff --git a/releasenotes/notes/double-workers-b9e340a18a5e9823.yaml b/releasenotes/notes/double-workers-b9e340a18a5e9823.yaml
new file mode 100644
index 000000000..86615856a
--- /dev/null
+++ b/releasenotes/notes/double-workers-b9e340a18a5e9823.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Workers are raised to 2 x os_workers, so that we have as many workers as
+    the one we had before we merged 2 keystone services(public and admin).
diff --git a/spec/classes/keystone_db_postgresql_spec.rb b/spec/classes/keystone_db_postgresql_spec.rb
index 2f6b7e39f..94158f817 100644
--- a/spec/classes/keystone_db_postgresql_spec.rb
+++ b/spec/classes/keystone_db_postgresql_spec.rb
@@ -30,8 +30,8 @@ describe 'keystone::db::postgresql' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :os_workers     => 8,
-          :concat_basedir => '/var/lib/puppet/concat'
+          :os_workers_keystone => 8,
+          :concat_basedir      => '/var/lib/puppet/concat'
         }))
       end
 
diff --git a/spec/classes/keystone_wsgi_apache_spec.rb b/spec/classes/keystone_wsgi_apache_spec.rb
index 1c5339678..6c30e3fe0 100644
--- a/spec/classes/keystone_wsgi_apache_spec.rb
+++ b/spec/classes/keystone_wsgi_apache_spec.rb
@@ -22,7 +22,7 @@ describe 'keystone::wsgi::apache' do
         :bind_host                   => nil,
         :bind_port                   => 5000,
         :group                       => 'keystone',
-        :workers                     => facts[:os_workers],
+        :workers                     => facts[:os_workers_keystone],
         :threads                     => 1,
         :user                        => 'keystone',
         :priority                    => '10',
@@ -193,9 +193,9 @@ describe 'keystone::wsgi::apache' do
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
-          :os_workers     => 8,
-          :concat_basedir => '/var/lib/puppet/concat',
-          :fqdn           => 'some.host.tld',
+          :os_workers_keystone => 8,
+          :concat_basedir      => '/var/lib/puppet/concat',
+          :fqdn                => 'some.host.tld',
         }))
       end