diff --git a/src/Foundation/Features/Blocks/BootstrapCardBlock/BootstrapCardBlock.cs b/src/Foundation/Features/Blocks/BootstrapCardBlock/BootstrapCardBlock.cs
index 69ab0c179..d66707a4a 100644
--- a/src/Foundation/Features/Blocks/BootstrapCardBlock/BootstrapCardBlock.cs
+++ b/src/Foundation/Features/Blocks/BootstrapCardBlock/BootstrapCardBlock.cs
@@ -23,6 +23,7 @@ namespace Foundation.Features.Blocks.BootstrapCardBlock
     [ImageUrl("/icons/cms/blocks/CMS-icon-block-03.png")]
     public class BootstrapCardBlock : FoundationBlockData, IDashboardItem
     {
+        [GroupingHeader("Card Alignment Options")]
         // Card alignment -- left/center/right
         [SelectOne(SelectionFactoryType = typeof(CardAlignmentSelectionFactory))]
         [Display(Name = "Card alignment",
@@ -30,7 +31,7 @@ public class BootstrapCardBlock : FoundationBlockData, IDashboardItem
          GroupName = SystemTabNames.Content)]
         public virtual string CardAlignment { get; set; }
 
-        [GroupingHeader("Card Text Properties")]
+        [GroupingHeader("Card Text and Content Properties")]
         [CultureSpecific]
         [Display(Name = "Card header",
          Order = 10)]
@@ -64,6 +65,7 @@ public class BootstrapCardBlock : FoundationBlockData, IDashboardItem
          Order = 60)]
         public virtual string CardFooter { get; set; }
 
+        [GroupingHeader("Card Image Properties")]
         [CultureSpecific]
         [UIHint(UIHint.Image)]
         [Display(Name = "Card image (optional)",
@@ -71,6 +73,7 @@ public class BootstrapCardBlock : FoundationBlockData, IDashboardItem
          GroupName = SystemTabNames.Content)]
         public virtual ContentReference CardImage { get; set; }
 
+        [GroupingHeader("Card Button and Link Properties")]
         [CultureSpecific]
         [Display(Name = "Card button text (button hidden if blank)",
          Description = "Text to show for card button -- button hidden if blank",
@@ -100,6 +103,7 @@ public class BootstrapCardBlock : FoundationBlockData, IDashboardItem
         [MaxElements(3)]
         public virtual LinkItemCollection CardLinks { get; set; }
 
+        [GroupingHeader("Misc Properties")]
         [Display(Name = "CSS class",
          Description = "Custom CSS class for card (to help with custom styles)",
          Order = 200,
diff --git a/src/Foundation/Startup.cs b/src/Foundation/Startup.cs
index 1a495810e..6ed4cb1b6 100644
--- a/src/Foundation/Startup.cs
+++ b/src/Foundation/Startup.cs
@@ -1,4 +1,5 @@
 using Advanced.CMS.AdvancedReviews;
+using Advanced.CMS.GroupingHeader;
 using EPiServer.Authorization;
 using EPiServer.Cms.TinyMce.SpellChecker;
 using EPiServer.ContentApi.Cms;
@@ -229,6 +230,10 @@ public void ConfigureServices(IServiceCollection services)
 
             // Add ContentManager
             services.AddContentManager();
+
+            // Add GroupingHeader
+            // https://github.com/advanced-cms/grouping-header/
+            services.AddGroupingHeader();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.