diff --git a/manifests/ringbuilder/create.pp b/manifests/ringbuilder/create.pp
index f1ee9fa2..a318f1e7 100644
--- a/manifests/ringbuilder/create.pp
+++ b/manifests/ringbuilder/create.pp
@@ -8,18 +8,16 @@
 #  [*part_power*] Number of partitions in the ring. (specified as the power of 2)
 #    Optional. Defaults to 18 (2^18)
 #  [*replicas] Number of replicas to store.
-#    Optional. Defaults to 5
-#      TODO should it default to 3?
+#    Optional. Defaults to 3
 #  [*min_part_hours*] Time before a partition can be moved.
-#    Optional. Defaults to 1.
-#      TODO should it be 24?
+#    Optional. Defaults to 24.
 #
 # == Examples
 #
 #   swift::ringbuilder::create { 'account':
 #     part_power     => 19,
-#     replicas       => 3,
-#     min_part_hours => 24,
+#     replicas       => 5,
+#     min_part_hours => 1,
 #   }
 #
 # == Authors
@@ -32,8 +30,8 @@
 #
 define swift::ringbuilder::create(
   $part_power = 18,
-  $replicas = 5,
-  $min_part_hours = 1
+  $replicas = 3,
+  $min_part_hours = 24
 ) {
 
   validate_re($name, '^object|container|account$')
diff --git a/spec/classes/swift_ringbuilder_spec.rb b/spec/classes/swift_ringbuilder_spec.rb
index 35afba1b..679c7fb1 100644
--- a/spec/classes/swift_ringbuilder_spec.rb
+++ b/spec/classes/swift_ringbuilder_spec.rb
@@ -29,8 +29,8 @@ describe 'swift::ringbuilder' do
       ['object', 'account', 'container'].each do |type|
         it { should contain_swift__ringbuilder__create(type).with(
           :part_power     => '18',
-          :replicas       => '5',
-          :min_part_hours => '1'
+          :replicas       => '3',
+          :min_part_hours => '24'
         )}
       end
     end
diff --git a/spec/defines/swift_ringbuilder_create_spec.rb b/spec/defines/swift_ringbuilder_create_spec.rb
index 205fc995..c0404239 100644
--- a/spec/defines/swift_ringbuilder_create_spec.rb
+++ b/spec/defines/swift_ringbuilder_create_spec.rb
@@ -3,8 +3,8 @@ describe 'swift::ringbuilder::create' do
 
   let :default_params do
     {:part_power => 18,
-    :replicas => 5,
-    :min_part_hours => 1}
+    :replicas => 3,
+    :min_part_hours => 24}
   end
 
   describe 'with allowed titles' do