diff --git a/lib/bootstrap_form/inputs/inputs_collection.rb b/lib/bootstrap_form/inputs/inputs_collection.rb
index a8e1a6c0..0da18b60 100644
--- a/lib/bootstrap_form/inputs/inputs_collection.rb
+++ b/lib/bootstrap_form/inputs/inputs_collection.rb
@@ -8,7 +8,7 @@ module InputsCollection
       private
 
       def inputs_collection(name, collection, value, text, options={})
-        options[:label] ||= { class: group_label_class(options[:layout]) }
+        options[:label] ||= { class: group_label_class(field_layout(options)) }
         options[:inline] ||= layout_inline?(options[:layout])
 
         form_group_builder(name, options) do
@@ -24,6 +24,8 @@ def inputs_collection(name, collection, value, text, options={})
         end
       end
 
+      def field_layout(options) = options[:layout] || (:inline if options[:inline] == true)
+
       def group_label_class(field_layout)
         if layout_horizontal?(field_layout)
           group_label_class = "col-form-label #{label_col} pt-0"
diff --git a/test/bootstrap_checkbox_test.rb b/test/bootstrap_checkbox_test.rb
index 3eb9fc76..48a8bb94 100644
--- a/test/bootstrap_checkbox_test.rb
+++ b/test/bootstrap_checkbox_test.rb
@@ -256,7 +256,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
     expected = <<~HTML
       <input #{autocomplete_attr_55336} id="user_misc" name="user[misc][]" type="hidden" value="" />
       <div class="mb-3">
-        <label class="form-label" for="user_misc">Misc</label>
+        <label class="form-check form-check-inline ps-0" for="user_misc">Misc</label>
         <div class="form-check form-check-inline">
           <input class="form-check-input" id="user_misc_1" name="user[misc][]" type="checkbox" value="1" />
           <label class="form-check-label" for="user_misc_1">
@@ -272,8 +272,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
       </div>
     HTML
 
-    assert_equivalent_html expected, @builder.collection_check_boxes(:misc, collection, :id, :street,
-                                                                     inline: true)
+    assert_equivalent_html expected, @builder.collection_check_boxes(:misc, collection, :id, :street, inline: true)
   end
 
   test "collection_check_boxes renders with checked option correctly" do
diff --git a/test/bootstrap_radio_button_test.rb b/test/bootstrap_radio_button_test.rb
index 1f6098b2..c7543bdf 100644
--- a/test/bootstrap_radio_button_test.rb
+++ b/test/bootstrap_radio_button_test.rb
@@ -209,7 +209,7 @@ class BootstrapRadioButtonTest < ActionView::TestCase
     collection = [Address.new(id: 1, street: "Foo"), Address.new(id: 2, street: "Bar")]
     expected = <<~HTML
       <div class="mb-3">
-        <label class="form-label" for="user_misc">Misc</label>
+        <label class="form-check form-check-inline ps-0" for="user_misc">Misc</label>
         <div class="form-check form-check-inline">
           <input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
           <label class="form-check-label" for="user_misc_1"> Foo</label>