diff --git a/manifests/storage/all.pp b/manifests/storage/all.pp
index 456f7306..05f3a531 100644
--- a/manifests/storage/all.pp
+++ b/manifests/storage/all.pp
@@ -99,15 +99,15 @@
 #
 # [*account_server_workers*]
 #   (optional) Number of account server workers.
-#   Defaults to undef.
+#   Defaults to $::os_workers.
 #
 # [*container_server_workers*]
 #   (optional) Number of container server workers.
-#   Defaults to undef.
+#   Defaults to $::os_workers.
 #
 # [*object_server_workers*]
 #   (optional) Number of account server workers.
-#   Defaults to undef.
+#   Defaults to $::os_workers.
 #
 # [*splice*]
 #   (optional) Use splice for zero-copy object GETs. This requires Linux Kernel
@@ -138,9 +138,9 @@ class swift::storage::all(
   $log_statsd_default_sample_rate = '1.0',
   $log_statsd_sample_rate_factor  = '1.0',
   $log_statsd_metric_prefix       = '',
-  $account_server_workers         = undef,
-  $container_server_workers       = undef,
-  $object_server_workers          = undef,
+  $account_server_workers         = $::os_workers,
+  $container_server_workers       = $::os_workers,
+  $object_server_workers          = $::os_workers,
   $splice                         = false,
 ) {
 
diff --git a/releasenotes/notes/cap-default-swift-server-workers-90b6206b37c6866b.yaml b/releasenotes/notes/cap-default-swift-server-workers-90b6206b37c6866b.yaml
new file mode 100644
index 00000000..c5bea107
--- /dev/null
+++ b/releasenotes/notes/cap-default-swift-server-workers-90b6206b37c6866b.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Default number of account/container/object server workers
+    capped to os_workers fact unless overridden.