diff --git a/cinder/files/juno/cinder.conf.controller.Debian b/cinder/files/juno/cinder.conf.controller.Debian
index fa62135..cf7b94f 100644
--- a/cinder/files/juno/cinder.conf.controller.Debian
+++ b/cinder/files/juno/cinder.conf.controller.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ controller.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder
@@ -358,4 +360,4 @@
 
 {%- endif %}
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/cinder/files/juno/cinder.conf.volume.Debian b/cinder/files/juno/cinder.conf.volume.Debian
index 383a8f5..2cb1031 100644
--- a/cinder/files/juno/cinder.conf.volume.Debian
+++ b/cinder/files/juno/cinder.conf.volume.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ volume.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder
@@ -435,4 +437,4 @@
 
 {%- endif %}
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/cinder/files/kilo/cinder.conf.controller.Debian b/cinder/files/kilo/cinder.conf.controller.Debian
index bffbf73..e29a399 100644
--- a/cinder/files/kilo/cinder.conf.controller.Debian
+++ b/cinder/files/kilo/cinder.conf.controller.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ controller.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder
diff --git a/cinder/files/kilo/cinder.conf.volume.Debian b/cinder/files/kilo/cinder.conf.volume.Debian
index 1f48741..94efa00 100644
--- a/cinder/files/kilo/cinder.conf.volume.Debian
+++ b/cinder/files/kilo/cinder.conf.volume.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ volume.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder
diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 6143552..6255d9e 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ controller.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder
diff --git a/cinder/files/liberty/cinder.conf.volume.Debian b/cinder/files/liberty/cinder.conf.volume.Debian
index 1f48741..94efa00 100644
--- a/cinder/files/liberty/cinder.conf.volume.Debian
+++ b/cinder/files/liberty/cinder.conf.volume.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ volume.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder
diff --git a/cinder/files/mitaka/cinder.conf.controller.Debian b/cinder/files/mitaka/cinder.conf.controller.Debian
index 04669f9..66ef1ea 100644
--- a/cinder/files/mitaka/cinder.conf.controller.Debian
+++ b/cinder/files/mitaka/cinder.conf.controller.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ controller.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder
diff --git a/cinder/files/mitaka/cinder.conf.volume.Debian b/cinder/files/mitaka/cinder.conf.volume.Debian
index 184a695..862d621 100644
--- a/cinder/files/mitaka/cinder.conf.volume.Debian
+++ b/cinder/files/mitaka/cinder.conf.volume.Debian
@@ -10,6 +10,8 @@
 
 verbose = True
 
+osapi_volume_workers = {{ volume.get('volume_workers', '4') }}
+
 auth_strategy = keystone
 
 state_path = /var/lib/cinder