diff --git a/README.rst b/README.rst
index 152d9a7..ee64e32 100644
--- a/README.rst
+++ b/README.rst
@@ -23,6 +23,7 @@
         cpu_allocation_ratio: 8.0
         ram_allocation_ratio: 1.0
         disk_allocation_ratio: 1.0
+        workers: 8
         bind:
           public_address: 10.0.0.122
           public_name: openstack.domain.com
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index f23aada..2e2837c 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -18,6 +18,7 @@
       cpu_allocation_ratio: 16.0
       ram_allocation_ratio: 1.5
       disk_allocation_ratio: 1.0
+      workers: 8
       logging:
       - engine: syslog
         facility: local0
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 1f45b14..b4add44 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -18,6 +18,7 @@
       cpu_allocation_ratio: 16.0
       ram_allocation_ratio: 1.5
       disk_allocation_ratio: 1.0
+      workers: 1
       logging:
       - engine: syslog
         facility: local0
diff --git a/nova/files/kilo/nova-controller.conf.Debian b/nova/files/kilo/nova-controller.conf.Debian
index c509951..864056c 100644
--- a/nova/files/kilo/nova-controller.conf.Debian
+++ b/nova/files/kilo/nova-controller.conf.Debian
@@ -84,7 +84,7 @@
 osapi_compute_listen={{ controller.bind.private_address }}
 metadata_listen={{ controller.bind.private_address }}
 glance_host = {{ controller.glance.host }}
-osapi_compute_workers=8
+osapi_compute_workers = {{ controller.workers }}
 
 #NoVNC
 vnc_enabled=true
@@ -162,7 +162,7 @@
 {%- endif %}
 
 [conductor]
-workers = 8
+workers = {{ controller.workers }}
 
 [database]
 idle_timeout = 180
diff --git a/nova/files/liberty/nova-controller.conf.Debian b/nova/files/liberty/nova-controller.conf.Debian
index d4b57e6..0e2f237 100644
--- a/nova/files/liberty/nova-controller.conf.Debian
+++ b/nova/files/liberty/nova-controller.conf.Debian
@@ -83,7 +83,7 @@
 osapi_compute_listen={{ controller.bind.private_address }}
 metadata_listen={{ controller.bind.private_address }}
 glance_host = {{ controller.glance.host }}
-osapi_compute_workers=8
+osapi_compute_workers = {{ controller.workers }}
 
 #NoVNC
 vnc_enabled=true
@@ -161,7 +161,7 @@
 {%- endif %}
 
 [conductor]
-workers = 8
+workers = {{ controller.workers  }}
 
 [database]
 idle_timeout = 180
diff --git a/nova/meta/sphinx.yml b/nova/meta/sphinx.yml
index 56b7a3a..c4f67ed 100644
--- a/nova/meta/sphinx.yml
+++ b/nova/meta/sphinx.yml
@@ -89,6 +89,9 @@
         disk_allocation_ratio:
           name: "Disk allocation ratio"
           value: {{ controller.disk_allocation_ratio }}
+        workers:
+          name: "Number of osapi and conductor workers"
+          value: {{ controller.workers }}
         dhcp_domain:
           name: "DHCP domain"
           value: {{ controller.dhcp_domain }}
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 2de3368..5e33712 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -10,6 +10,7 @@
     cpu_allocation_ratio: 16.0
     ram_allocation_ratio: 1.5
     disk_allocation_ratio: 1.0
+    workers: 8
     bind:
       private_address: 127.0.0.1
       public_address: 127.0.0.1
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 6b55229..8a06a7d 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -10,6 +10,7 @@
     cpu_allocation_ratio: 16.0
     ram_allocation_ratio: 1.5
     disk_allocation_ratio: 1.0
+    workers: 8
     bind:
       private_address: 127.0.0.1
       public_address: 127.0.0.1