diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 090c7b0e223..ba8f9b3a0f7 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -28,5 +28,5 @@ Please provide a description of any known workarounds.
 * Branch
 * .NET Runtime, CoreCLR or Mono Version
 * Indications of severity
-* Version of FAKE (4.X, 5.X)
+* Version of FAKE (4.X, 5.X, 6.x)
 * (if performance issue) Performance information, links to performance testing scripts
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index dd1be59b879..1179073f901 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,7 @@ Feel free to open the PR and ask for help
   > Note: Consider using the `CreateProcess` API which can be tested more easily, see https://github.com/fsharp/FAKE/pull/2131/files#diff-4fb4a77e110fbbe8210205dfe022389b for an example (the changes in the `DotNet.Testing.NUnit` module)
   
 - [ ] boy scout rule: "leave the code behind in a better state than you found it" (fix warnings, obsolete members or code-style in the places you worked in)     
-- [ ] (if new module) the module has been linked from the "Modules" menu, edit `help/templates/template.cshtml`, linking to the API-reference is fine.
-- [ ] (if new module) the module is in the correct namespace
+- [ ] (if new module) the module has been linked from the "side navigation" menu, edit `docs/data.json`.
+- [ ] (if new module) the module is in the correct namespace.
 - [ ] (if new module) the module is added to Fake.sln (`dotnet sln Fake.sln add src/app/Fake.*/Fake.*.fsproj`)
 - [ ] Fake [API guideline](https://fake.build/guide/contributing.html#API-Design-Guidelines) is honored
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index e1cc23f717a..737ec79a6cd 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -16,12 +16,6 @@ jobs:
               uses: actions/setup-dotnet@v1
               with:
                   dotnet-version: '6.0.101'
-            - uses: actions/cache@v2
-              with:
-                  path: ~/.nuget/packages
-                  key: ${{ matrix.os }}-nuget-${{ hashFiles('**/paket.lock') }}
-                  restore-keys: |
-                      ${{ matrix.os }}-nuget
             - name: Restore dotnet tools
               run: dotnet tool restore
             - name: remove current fake runner tool
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 32cc5f7308e..8aac2bd9e33 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,12 +20,6 @@ jobs:
               uses: actions/setup-dotnet@v1
               with:
                   dotnet-version: '6.0.101'
-            - uses: actions/cache@v2
-              with:
-                  path: ~/.nuget/packages
-                  key: windows-latest-nuget-${{ hashFiles('**/paket.lock') }}
-                  restore-keys: |
-                      windows-latest-nuget
             - name: Restore dotnet tools
               run: dotnet tool restore
             - name: remove current fake runner tool