diff --git a/.github/templates/build-packages.yml b/.github/templates/build-packages.yml
index 809b83387c..02169e6c86 100644
--- a/.github/templates/build-packages.yml
+++ b/.github/templates/build-packages.yml
@@ -1,5 +1,5 @@
 #@ load("@ytt:template", "template")
-#@ load("common.lib.yml", "checkoutCode", "fetchWrapperBinaries", "msBuildMultiple", "readVersionFromPackage", "uploadArtifacts", "actionCache", "nugetPackages")
+#@ load("common.lib.yml", "checkoutCode", "fetchWrapperBinaries", "msBuildMultiple", "readVersionFromPackage", "uploadArtifacts", "actionCache", "nugetPackages", "setupDotnet")
 
 #@ def buildDocs():
   - name: Check Docfx cache
@@ -8,13 +8,14 @@
     uses: #@ actionCache
     with:
       path: 'C:\docfx'
-      key: docfx
+      key: docfx-2.59.4
   - name: Download docfx
     if: inputs.build-docs && steps.check-docfx-cache.outputs.cache-hit != 'true'
     run: |
-      Invoke-WebRequest -Uri https://github.com/dotnet/docfx/releases/download/v2.58/docfx.zip -OutFile C:\docfx.zip
+      Invoke-WebRequest -Uri https://github.com/dotnet/docfx/releases/download/v2.59.4/docfx.zip -OutFile C:\docfx.zip
       Expand-Archive -Path C:\docfx.zip -DestinationPath C:\docfx
     shell: powershell
+  - _: #@ template.replace(setupDotnet(ifCondition = "inputs.build-docs"))
   - name: Build docs
     if: inputs.build-docs
     run: |
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 1d4346c9a6..ea877aba9a 100755
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -184,13 +184,18 @@ jobs:
       uses: nirinchev/cache@d7c96a77c26ab70dd32b202c885cb4b34d95d8a8
       with:
         path: C:\docfx
-        key: docfx
+        key: docfx-2.59.4
     - name: Download docfx
       if: inputs.build-docs && steps.check-docfx-cache.outputs.cache-hit != 'true'
       run: |
-        Invoke-WebRequest -Uri https://github.com/dotnet/docfx/releases/download/v2.58/docfx.zip -OutFile C:\docfx.zip
+        Invoke-WebRequest -Uri https://github.com/dotnet/docfx/releases/download/v2.59.4/docfx.zip -OutFile C:\docfx.zip
         Expand-Archive -Path C:\docfx.zip -DestinationPath C:\docfx
       shell: powershell
+    - name: Configure .NET
+      uses: actions/setup-dotnet@v1
+      if: inputs.build-docs
+      with:
+        dotnet-version: 6.0.x
     - name: Build docs
       if: inputs.build-docs
       run: |
diff --git a/Docs/docfx.json b/Docs/docfx.json
index 4ef2f8c46e..6a4d67f296 100644
--- a/Docs/docfx.json
+++ b/Docs/docfx.json
@@ -90,6 +90,9 @@
         },
         "template": [ "default", "template" ],
         "postProcessors": [],
-        "noLangKeyword": false
+        "noLangKeyword": false,
+        "properties": {
+            "TargetFramework": "net6.0"
+        }
     }
 }
\ No newline at end of file