diff --git a/playbook/app/pb_kits/playbook/pb_multi_level_select/multi_level_select.html.erb b/playbook/app/pb_kits/playbook/pb_multi_level_select/multi_level_select.html.erb
index 26faaa16d5..e1a48697f3 100644
--- a/playbook/app/pb_kits/playbook/pb_multi_level_select/multi_level_select.html.erb
+++ b/playbook/app/pb_kits/playbook/pb_multi_level_select/multi_level_select.html.erb
@@ -1,8 +1,3 @@
-<%= content_tag(:div,
-      aria: object.aria,
-      data: object.data,
-      id: object.id,
-      class: object.classname,
-      **combined_html_options) do %>
+<%= pb_content_tag do %>
   <%= react_component("MultiLevelSelect", object.multi_level_select_options)  %>
 <% end %>
diff --git a/playbook/app/pb_kits/playbook/pb_nav/item.html.erb b/playbook/app/pb_kits/playbook/pb_nav/item.html.erb
index cec49d1cf2..03b1650f55 100755
--- a/playbook/app/pb_kits/playbook/pb_nav/item.html.erb
+++ b/playbook/app/pb_kits/playbook/pb_nav/item.html.erb
@@ -1,15 +1,9 @@
   <% if object.collapsible %>
     <%= pb_rails("collapsible", props: { name: "collapsible-nav-example", classname: object.collapsible_nav_classname }) do %>
       <%= pb_rails("collapsible/collapsible_main", props: { name: "default-collapsible-nav", icon: object.collapsible_icons, size: "xs", dark: object.dark, classname:object.margin_classes }) do %>
-        <%= content_tag(object.tag,
-          aria: object.aria,
-          class: object.classname,
-          data: object.data,
-          dark: object.dark,
-          id: object.id,
-          href: object.link && object.link,
-          target: object.link && object.target,
-          **combined_html_options
+        <%= pb_content_tag( object.tag,
+            href: object.link && object.link,
+            target: object.link && object.target
           ) do %>
           <% if object.image_url %>
             <%= pb_rails("image", props: { url: object.image_url, classname: "pb_nav_img_wrapper_collapsible" }) %>
@@ -20,22 +14,16 @@
           <span class="pb_nav_list_item_text_collapsible">
             <%= object.text %>
           </span>
-        <% end %>    
+        <% end %>
        <% end %>
       <%= pb_rails("collapsible/collapsible_content", props: {collapsed: object.collapsed}) do %>
         <%= content.presence %>
       <% end %>
     <% end %>
   <% else %>
-    <%= content_tag(object.tag,
-      aria: object.aria,
-      class: object.classname,
-      **combined_html_options,
-      data: object.data,
-      dark: object.dark,
-      id: object.id,
-      href: object.link && object.link,
-      target: object.link && object.target
+    <%= pb_content_tag( object.tag,
+        href: object.link && object.link,
+        target: object.link && object.target
       ) do %>
       <% if object.image_url %>
         <%= pb_rails("image", props: { url: object.image_url, classname: "pb_nav_img_wrapper" }) %>
diff --git a/playbook/app/pb_kits/playbook/pb_nav/nav.html.erb b/playbook/app/pb_kits/playbook/pb_nav/nav.html.erb
index 1b80db133c..2f0715ea9f 100755
--- a/playbook/app/pb_kits/playbook/pb_nav/nav.html.erb
+++ b/playbook/app/pb_kits/playbook/pb_nav/nav.html.erb
@@ -1,12 +1,7 @@
-<%= content_tag(:nav,
-    aria: object.aria,
-    class: object.classname,
-    data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+<%= pb_content_tag(:nav) do %>
   <% if object.title %>
-    <%= content_tag(:div, class: "pb_nav_list_title") do %>
-      <%= content_tag(:a, class: "pb_nav_list_item_link_text", href: object.link) do %>
+    <%= pb_content_tag do %>
+      <%= pb_content_tag(:a) do %>
         <%= pb_rails("caption", props: { text: object.title, dark: dark }) %>
       <% end %>
     <% end %>
diff --git a/playbook/app/pb_kits/playbook/pb_online_status/online_status.html.erb b/playbook/app/pb_kits/playbook/pb_online_status/online_status.html.erb
index 8f78a43bb5..7e3e040ad2 100644
--- a/playbook/app/pb_kits/playbook/pb_online_status/online_status.html.erb
+++ b/playbook/app/pb_kits/playbook/pb_online_status/online_status.html.erb
@@ -1,7 +1,2 @@
-<%= content_tag(:div,
-    aria: object.aria.merge!(label: object.status),
-    class: object.classname,
-    data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+<%= pb_content_tag do %>
 <% end %>
diff --git a/playbook/app/pb_kits/playbook/pb_popover/popover.html.erb b/playbook/app/pb_kits/playbook/pb_popover/popover.html.erb
index c97b2eafbd..083b0b815b 100644
--- a/playbook/app/pb_kits/playbook/pb_popover/popover.html.erb
+++ b/playbook/app/pb_kits/playbook/pb_popover/popover.html.erb
@@ -1,9 +1,4 @@
-<%= content_tag(:div,
-  aria: object.aria,
-  class: object.classname,
-  data: object.data,
-  id: object.id,
-  **combined_html_options) do %>
+<%= pb_content_tag do %>
   <div class="pb_popover_tooltip hide" id="<%= object.tooltip_id %>" role="tooltip" style="<%= object.z_index_helper %>">
     <div class="pb_popover_body <%= object.width_height_class_helper %> <%= object.popover_spacing_helper %>" style="<%= object.width_height_helper %>">
       <%= content.presence %>