diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 89e87713bf..fde3ec4a1c 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -16,6 +16,7 @@ env:
   GOPRIVATE: git.marketally.com
   GONOSUMDB: git.marketally.com
   GOTOOLCHAIN: local
+  GOMODCACHE: /tmp/gomod-${{ github.run_id }}-${{ github.job }}
   GO_VERSION: "1.25.5"
   NODE_VERSION: "22"
 
@@ -52,7 +53,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          go clean -modcache
           make deps-frontend deps-backend
 
       - name: Run Go linter
@@ -86,7 +86,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          go clean -modcache
           go mod download
 
       - name: Run unit tests
@@ -145,7 +144,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          go clean -modcache
           make deps-frontend deps-backend
 
       - name: Build frontend
@@ -385,14 +383,12 @@ jobs:
       - name: Install dependencies (Unix)
         if: matrix.goos != 'windows'
         run: |
-          go clean -modcache
           make deps-frontend deps-backend
 
       - name: Install dependencies (Windows)
         if: matrix.goos == 'windows'
         shell: pwsh
         run: |
-          go clean -modcache
           go mod download
           pnpm install
 
@@ -643,7 +639,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          /usr/local/go/bin/go clean -modcache
           /usr/local/go/bin/go mod download
           pnpm install
 
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index 825c7dbd53..3d1a47e6cf 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -53,7 +53,7 @@
 				</a>
 			{{end}}
 		{{end}}
-		<details class="item toggleable-item" {{if or .PageIsSettingsPagesGeneral .PageIsSettingsPagesBrand .PageIsSettingsPagesHero .PageIsSettingsPagesContent .PageIsSettingsPagesComparison .PageIsSettingsPagesSocial .PageIsSettingsPagesPricing .PageIsSettingsPagesFooter .PageIsSettingsPagesTheme .PageIsSettingsPagesLanguages}}open{{end}}>
+		<details class="item toggleable-item" {{if or .PageIsSettingsPagesGeneral .PageIsSettingsPagesBrand .PageIsSettingsPagesHero .PageIsSettingsPagesContent .PageIsSettingsPagesComparison .PageIsSettingsPagesSocial .PageIsSettingsPagesPricing .PageIsSettingsPagesFooter .PageIsSettingsPagesTheme .PageIsSettingsPagesLanguages .PageIsSettingsPagesAdvanced}}open{{end}}>
 			<summary>{{ctx.Locale.Tr "repo.settings.pages"}}</summary>
 			<div class="menu">
 				<a class="{{if .PageIsSettingsPagesGeneral}}active {{end}}item" href="{{.RepoLink}}/settings/pages">
@@ -86,6 +86,9 @@
 				<a class="{{if .PageIsSettingsPagesLanguages}}active {{end}}item" href="{{.RepoLink}}/settings/pages/languages">
 					{{ctx.Locale.Tr "repo.settings.pages.languages"}}
 				</a>
+				<a class="{{if .PageIsSettingsPagesAdvanced}}active {{end}}item" href="{{.RepoLink}}/settings/pages/advanced">
+					{{ctx.Locale.Tr "repo.settings.pages.advanced"}}
+				</a>
 			</div>
 		</details>
 		<details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets .PageIsSharedSettingsVariables .PageIsActionsSettingsGeneral}}open{{end}}>
diff --git a/templates/repo/settings/pages_nav.tmpl b/templates/repo/settings/pages_nav.tmpl
deleted file mode 100644
index b8e200e2cc..0000000000
--- a/templates/repo/settings/pages_nav.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{if .PagesEnabled}}
-<div class="ui secondary pointing menu tw-mb-4">
-	<a class="{{if .PageIsSettingsPagesGeneral}}active {{end}}item" href="{{.RepoLink}}/settings/pages">
-		{{ctx.Locale.Tr "repo.settings.pages.general"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesBrand}}active {{end}}item" href="{{.RepoLink}}/settings/pages/brand">
-		{{ctx.Locale.Tr "repo.settings.pages.brand"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesHero}}active {{end}}item" href="{{.RepoLink}}/settings/pages/hero">
-		{{ctx.Locale.Tr "repo.settings.pages.hero"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesContent}}active {{end}}item" href="{{.RepoLink}}/settings/pages/content">
-		{{ctx.Locale.Tr "repo.settings.pages.content"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesComparison}}active {{end}}item" href="{{.RepoLink}}/settings/pages/comparison">
-		{{ctx.Locale.Tr "repo.settings.pages.comparison"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesSocial}}active {{end}}item" href="{{.RepoLink}}/settings/pages/social">
-		{{ctx.Locale.Tr "repo.settings.pages.social"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesPricing}}active {{end}}item" href="{{.RepoLink}}/settings/pages/pricing">
-		{{ctx.Locale.Tr "repo.settings.pages.pricing"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesFooter}}active {{end}}item" href="{{.RepoLink}}/settings/pages/footer">
-		{{ctx.Locale.Tr "repo.settings.pages.footer"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesTheme}}active {{end}}item" href="{{.RepoLink}}/settings/pages/theme">
-		{{ctx.Locale.Tr "repo.settings.pages.theme"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesLanguages}}active {{end}}item" href="{{.RepoLink}}/settings/pages/languages">
-		{{ctx.Locale.Tr "repo.settings.pages.languages"}}
-	</a>
-	<a class="{{if .PageIsSettingsPagesAdvanced}}active {{end}}item" href="{{.RepoLink}}/settings/pages/advanced">
-		{{ctx.Locale.Tr "repo.settings.pages.advanced"}}
-	</a>
-</div>
-{{end}}