diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 104dc44..751fe85 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -2,9 +2,9 @@ name: .NET
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "develop-v11" ]
   pull_request:
-    branches: [ "develop" ]
+    branches: [ "develop-v11" ]
 
 jobs:
   build:
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/.gitignore b/.gitignore
index 4e8929e..e0d3392 100644
--- a/.gitignore
+++ b/.gitignore
@@ -467,6 +467,7 @@ $RECYCLE.BIN/
 # JSON Schema file for appsettings
 # This is auto generated from the build
 appsettings-schema.json
+appsettings-schema.Umbraco.Cms.json
 
 **/App_Plugins/*
 !**/App_Plugins/MyCustomDashboard
diff --git a/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj b/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj
index 98748f7..b9882c8 100644
--- a/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj
+++ b/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageReference Include="Umbraco.Cms" Version="10.3.1" />
+        <PackageReference Include="Umbraco.Cms" Version="11.0.0-rc1" />
         <PackageReference Include="Umbraco.TheStarterKit" Version="10.0.0" />
     </ItemGroup>
 
diff --git a/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml
new file mode 100644
index 0000000..94eef55
--- /dev/null
+++ b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml
@@ -0,0 +1,19 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
+@{
+    if (Model?.Areas.Any() != true) { return; }
+}
+
+<div class="umb-block-grid__area-container"
+     style="--umb-block-grid--area-grid-columns: @(Model.AreaGridColumns?.ToString() ?? Model.GridColumns?.ToString() ?? "12");">
+    @foreach (var area in Model.Areas)
+    {
+        <div class="umb-block-grid__area"
+         data-area-col-span="@area.ColumnSpan"
+         data-area-row-span="@area.RowSpan"
+         data-area-alias="@area.Alias"
+         style="--umb-block-grid--grid-columns: @area.ColumnSpan;--umb-block-grid--area-column-span: @area.ColumnSpan; --umb-block-grid--area-row-span: @area.RowSpan;">
+            @await Html.GetBlockGridItemsHtmlAsync(area)
+        </div>
+    }
+</div>
diff --git a/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/default.cshtml b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/default.cshtml
new file mode 100644
index 0000000..e25839e
--- /dev/null
+++ b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/default.cshtml
@@ -0,0 +1,11 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridModel>
+@{
+    if (Model?.Any() != true) { return; }
+}
+
+<div class="umb-block-grid"
+     data-grid-columns="@(Model.GridColumns?.ToString() ?? "12");"
+     style="--umb-block-grid--grid-columns: @(Model.GridColumns?.ToString() ?? "12");">
+    @await Html.GetBlockGridItemsHtmlAsync(Model)
+</div>
diff --git a/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml
new file mode 100644
index 0000000..2831c14
--- /dev/null
+++ b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml
@@ -0,0 +1,39 @@
+@using Umbraco.Cms.Core.Models.Blocks
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<IEnumerable<BlockGridItem>>
+@{
+    if (Model?.Any() != true) { return; }
+}
+
+<div class="umb-block-grid__layout-container">
+    @foreach (var item in Model)
+    {
+        bool attrForceLeft = item.ForceLeft;
+        bool attrForceRight = item.ForceRight;
+        <div
+            class="umb-block-grid__layout-item"
+            data-content-element-type-alias="@item.Content.ContentType.Alias"
+            data-content-element-type-key="@item.Content.ContentType.Key"
+            data-element-udi="@item.ContentUdi"
+            data-col-span="@item.ColumnSpan"
+            data-row-span="@item.RowSpan"
+            @(attrForceLeft ? "data-force-left" : null)
+            @(attrForceRight ? "data-force-right" : null)
+            style=" --umb-block-grid--item-column-span: @item.ColumnSpan; --umb-block-grid--item-row-span: @item.RowSpan; ">
+            @{
+                var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias;
+                try
+                {
+                    @await Html.PartialAsync(partialViewName, item)
+                }
+                catch (InvalidOperationException)
+                {
+                    <p>
+                        <strong>Could not render component of type: @(item.Content.ContentType.Alias)</strong>
+                        <br/>
+                        This likely happened because the partial view <em>@partialViewName</em> could not be found.
+                    </p>
+                }
+            }
+        </div>
+    }
+</div>
diff --git a/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-shm b/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-shm
index 1f67ff4..38abbe9 100644
Binary files a/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-shm and b/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-shm differ
diff --git a/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-wal b/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-wal
index 1878559..c68f7bb 100644
Binary files a/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-wal and b/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-wal differ
diff --git a/global.json b/global.json
index 5338833..e91db20 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "6.0",
+    "version": "7.0",
     "rollForward": "latestMinor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }
\ No newline at end of file