diff --git a/dotnet/docs/api/index.md b/dotnet/docs/api/index.md
deleted file mode 100644
index 6103d3ac09e0e..0000000000000
--- a/dotnet/docs/api/index.md
+++ /dev/null
@@ -1 +0,0 @@
-# Welcome to the Selenium .NET API Docs
diff --git a/dotnet/docs/docfx.json b/dotnet/docs/docfx.json
index bdb6bffed9a4e..f85667fd6800e 100644
--- a/dotnet/docs/docfx.json
+++ b/dotnet/docs/docfx.json
@@ -3,29 +3,40 @@
     {
       "src": [
         {
+          "src": "../src/webdriver",
           "files": [
-            "src/webdriver/WebDriver.csproj",
-            "src/support/WebDriver.Support.csproj",
-            "bin/**/*.dll"
-          ],
-          "src": "../"
+            "**/*.csproj"
+          ]
         }
       ],
-      "dest": "api",
-      "includePrivateMembers": false,
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "noRestore": false,
-      "namespaceLayout": "flattened",
-      "memberLayout": "samePage",
-      "allowCompilationErrors": false
+      "dest": "webdriver",
+      "namespaceLayout": "nested",
+      "outputFormat": "apiPage"
+    },
+    {
+      "src": [
+        {
+          "src": "../src/support",
+          "files": [
+            "**/*.csproj"
+          ]
+        }
+      ],
+      "dest": "support",
+      "namespaceLayout": "nested",
+      "outputFormat": "apiPage"
     }
+
   ],
   "build": {
     "content": [
       {
-        "files": "**/*.{md|yml}",
-        "src": "api"
+        "files": [
+          "**/*.{md,yml}"
+        ],
+        "exclude": [
+          "_site/**"
+        ]
       }
     ],
     "resource": [
@@ -35,15 +46,16 @@
         ]
       }
     ],
-    "dest": "../../build/docs/api/dotnet",
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
+    "output": "../../build/docs/api/dotnet",
     "template": [
       "default",
       "modern"
     ],
-    "postProcessors": [],
-    "keepFileLink": false,
-    "disableGitFeatures": false
+    "globalMetadata": {
+      "_appName": "Selenium .NET API",
+      "_appLogoPath": "images/logo.svg",
+      "_appFaviconPath": "images/favicon.ico",
+      "_enableSearch": true
+    }
   }
 }
diff --git a/dotnet/docs/images/favicon.ico b/dotnet/docs/images/favicon.ico
new file mode 100644
index 0000000000000..80bf7ae9a9ac5
Binary files /dev/null and b/dotnet/docs/images/favicon.ico differ
diff --git a/dotnet/docs/images/logo.svg b/dotnet/docs/images/logo.svg
new file mode 100644
index 0000000000000..5c58484a6f7ab
--- /dev/null
+++ b/dotnet/docs/images/logo.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="40pt" height="30pt" ><defs><style>.cls-1{fill:#43b02a;}</style></defs><title>Selenium logo mark green</title><path class="cls-1" d="M25.24,25.31a2.93,2.93,0,0,0-3,2.6.1.1,0,0,0,.1.11h5.82a.1.1,0,0,0,.1-.11A2.83,2.83,0,0,0,25.24,25.31Z"/><path class="cls-1" d="M37.72,5.78,25.36,19.65a.38.38,0,0,1-.55,0l-6.31-6.5a.38.38,0,0,1,0-.47L20.55,10a.38.38,0,0,1,.61,0l3.51,3.91a.38.38,0,0,0,.57,0L35.14.42A.27.27,0,0,0,34.93,0H.29A.29.29,0,0,0,0,.29V39.71A.29.29,0,0,0,.29,40H37.9a.29.29,0,0,0,.29-.29V6A.27.27,0,0,0,37.72,5.78ZM10.65,35.61a9.51,9.51,0,0,1-6.75-2.4.37.37,0,0,1,0-.48l1.47-2.06a.37.37,0,0,1,.55-.06,7.23,7.23,0,0,0,4.94,1.93c1.93,0,2.87-.89,2.87-1.83,0-2.92-9.5-.92-9.5-7.13,0-2.75,2.38-5,6.26-5a9.28,9.28,0,0,1,6.18,2.07.37.37,0,0,1,0,.5l-1.51,2a.37.37,0,0,1-.53.06,7.15,7.15,0,0,0-4.51-1.56c-1.51,0-2.35.67-2.35,1.66,0,2.62,9.48.87,9.48,7C17.26,33.33,15.11,35.61,10.65,35.61Zm20.73-5.72a.32.32,0,0,1-.32.32H22.39a.1.1,0,0,0-.1.11,3.31,3.31,0,0,0,3.51,2.73,5.44,5.44,0,0,0,3-1,.32.32,0,0,1,.46.07l1.06,1.55a.33.33,0,0,1-.07.44,7.85,7.85,0,0,1-4.82,1.5,6.21,6.21,0,0,1-6.55-6.45,6.24,6.24,0,0,1,6.35-6.42c3.66,0,6.14,2.74,6.14,6.75Z"/></svg>
\ No newline at end of file
diff --git a/dotnet/docs/index.md b/dotnet/docs/index.md
new file mode 100644
index 0000000000000..4bf895581a8ed
--- /dev/null
+++ b/dotnet/docs/index.md
@@ -0,0 +1,9 @@
+---
+layout: landingPage
+---
+
+# Welcome to the Selenium .NET API Docs
+
+## Modules
+- [Selenium.WebDriver](/webdriver/OpenQA.Selenium.html)
+- [Selenium.Support](/support/OpenQA.Selenium.Support.html)
\ No newline at end of file
diff --git a/dotnet/docs/api/.gitignore b/dotnet/docs/support/.gitignore
similarity index 100%
rename from dotnet/docs/api/.gitignore
rename to dotnet/docs/support/.gitignore
diff --git a/dotnet/docs/toc.yml b/dotnet/docs/toc.yml
new file mode 100644
index 0000000000000..3198b53999c8e
--- /dev/null
+++ b/dotnet/docs/toc.yml
@@ -0,0 +1,9 @@
+- name: Intro
+  href: index.md
+
+- name: Modules
+  items:
+  - name: WebDriver
+    href: webdriver/OpenQA.Selenium.yml
+  - name: Support
+    href: support/OpenQA.Selenium.Support.yml
diff --git a/dotnet/docs/webdriver/.gitignore b/dotnet/docs/webdriver/.gitignore
new file mode 100644
index 0000000000000..e8079a3bef9d6
--- /dev/null
+++ b/dotnet/docs/webdriver/.gitignore
@@ -0,0 +1,5 @@
+###############
+#  temp file  #
+###############
+*.yml
+.manifest