diff --git a/manifests/proxy/bulk.pp b/manifests/proxy/bulk.pp
index 31950967..3d34e2da 100644
--- a/manifests/proxy/bulk.pp
+++ b/manifests/proxy/bulk.pp
@@ -20,28 +20,29 @@
 # === Parameters
 #
 # [*max_containers_per_extraction*]
-# The maximum number of containers that can be extracted from an archive.
-# Default to 10000.
+#   (Optional) The maximum number of containers that can be extracted from
+#   an archive.
+#   Defaults to $::os_service_default.
 #
 # [*max_failed_extractions*]
-# The maximum number of failed extractions allowed when an archive has
-# extraction failures.
-# Default to 1000.
+#   (Optional) The maximum number of failed extractions allowed when an archive
+#   has extraction failures.
+#   Defaults to $::os_service_default.
 #
 # [*max_deletes_per_request*]
-# The maximum number of deletes allowed by each request.
-# Default to 10000.
+#   (Optional) The maximum number of deletes allowed by each request.
+#   Defaults to $::os_service_default.
 #
 # [*yield_frequency*]
-# The frequency the server will spit out an ' ' to keep the connection alive
-# while its processing the request.
-# Default to 10.
+#   (Optional) The frequency the server will spit out an ' ' to keep
+#   the connection alive while its processing the request.
+#   Defaults to $::os_service_default.
 #
 class swift::proxy::bulk(
-  $max_containers_per_extraction = '10000',
-  $max_failed_extractions        = '1000',
-  $max_deletes_per_request       = '10000',
-  $yield_frequency               = '10',
+  $max_containers_per_extraction = $::os_service_default,
+  $max_failed_extractions        = $::os_service_default,
+  $max_deletes_per_request       = $::os_service_default,
+  $yield_frequency               = $::os_service_default,
 ) {
 
   include swift::deps
diff --git a/spec/classes/swift_proxy_bulk_spec.rb b/spec/classes/swift_proxy_bulk_spec.rb
index 0230e7e5..5a8bd325 100644
--- a/spec/classes/swift_proxy_bulk_spec.rb
+++ b/spec/classes/swift_proxy_bulk_spec.rb
@@ -24,27 +24,27 @@ describe 'swift::proxy::bulk' do
   shared_examples 'swift::proxy::bulk' do
     describe "when using default parameters" do
       it { is_expected.to contain_swift_proxy_config('filter:bulk/use').with_value('egg:swift#bulk') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('10000') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('1000') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('10000') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('10') }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('<SERVICE DEFAULT>') }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('<SERVICE DEFAULT>') }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('<SERVICE DEFAULT>') }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('<SERVICE DEFAULT>') }
     end
 
     describe "when overriding default parameters" do
       let :params do
         {
-          :max_containers_per_extraction => 5000,
-          :max_failed_extractions        => 500,
-          :max_deletes_per_request       => 5000,
-          :yield_frequency               => 60,
+          :max_containers_per_extraction => 10000,
+          :max_failed_extractions        => 1000,
+          :max_deletes_per_request       => 10001,
+          :yield_frequency               => 10,
         }
       end
 
       it { is_expected.to contain_swift_proxy_config('filter:bulk/use').with_value('egg:swift#bulk') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('5000') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('500') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('5000') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('60') }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value(10000) }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value(1000) }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value(10001) }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value(10) }
     end
   end