diff --git a/release-notes/8.0.0/4139.md b/release-notes/8.0.0/4139.md
new file mode 100644
index 000000000..116a36d88
--- /dev/null
+++ b/release-notes/8.0.0/4139.md
@@ -0,0 +1,5 @@
+Reorder repo tabs for better UX:
+- Actions is now the last tab
+- Packages are located after Releases
+- This puts Projects after Pull requests
+(tab positions may depend on which units are enabled in the repo)
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 82e7679cd..d8c53d08b 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -85,9 +85,9 @@
 		{{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}}
 			<div class="overflow-menu-items">
 				{{if .Permission.CanRead $.UnitTypeCode}}
-				<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if and (ne .BranchName .Repository.DefaultBranch) (not $.PageIsWiki)}}/src/{{.BranchNameSubURL}}{{end}}">
-					{{svg "octicon-code"}} {{ctx.Locale.Tr "repo.code"}}
-				</a>
+					<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if and (ne .BranchName .Repository.DefaultBranch) (not $.PageIsWiki)}}/src/{{.BranchNameSubURL}}{{end}}">
+						{{svg "octicon-code"}} {{ctx.Locale.Tr "repo.code"}}
+					</a>
 				{{end}}
 
 				{{if .Permission.CanRead $.UnitTypeIssues}}
@@ -114,21 +114,6 @@
 					</a>
 				{{end}}
 
-				{{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
-					<a class="{{if .PageIsActions}}active {{end}}item" href="{{.RepoLink}}/actions">
-						{{svg "octicon-play"}} {{ctx.Locale.Tr "actions.actions"}}
-						{{if .Repository.NumOpenActionRuns}}
-							<span class="ui small label">{{CountFmt .Repository.NumOpenActionRuns}}</span>
-						{{end}}
-					</a>
-				{{end}}
-
-				{{if .Permission.CanRead $.UnitTypePackages}}
-					<a href="{{.RepoLink}}/packages" class="{{if .IsPackagesPage}}active {{end}}item">
-						{{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}}
-					</a>
-				{{end}}
-
 				{{if and (not .UnitProjectsGlobalDisabled) (.Permission.CanRead $.UnitTypeProjects)}}
 					<a href="{{.RepoLink}}/projects" class="{{if .IsProjectsPage}}active {{end}}item">
 						{{svg "octicon-project"}} {{ctx.Locale.Tr "repo.project"}}
@@ -139,12 +124,18 @@
 				{{end}}
 
 				{{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo)}}
-				<a class="{{if or .PageIsReleaseList .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/releases">
-					{{svg "octicon-tag"}} {{ctx.Locale.Tr "repo.releases"}}
-					{{if .NumReleases}}
-						<span class="ui small label">{{CountFmt .NumReleases}}</span>
-					{{end}}
-				</a>
+					<a class="{{if or .PageIsReleaseList .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/releases">
+						{{svg "octicon-tag"}} {{ctx.Locale.Tr "repo.releases"}}
+						{{if .NumReleases}}
+							<span class="ui small label">{{CountFmt .NumReleases}}</span>
+						{{end}}
+					</a>
+				{{end}}
+
+				{{if .Permission.CanRead $.UnitTypePackages}}
+					<a href="{{.RepoLink}}/packages" class="{{if .IsPackagesPage}}active {{end}}item">
+						{{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}}
+					</a>
 				{{end}}
 
 				{{if .Permission.CanRead $.UnitTypeWiki}}
@@ -165,6 +156,15 @@
 					</a>
 				{{end}}
 
+				{{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
+					<a class="{{if .PageIsActions}}active {{end}}item" href="{{.RepoLink}}/actions">
+						{{svg "octicon-play"}} {{ctx.Locale.Tr "actions.actions"}}
+						{{if .Repository.NumOpenActionRuns}}
+							<span class="ui small label">{{CountFmt .Repository.NumOpenActionRuns}}</span>
+						{{end}}
+					</a>
+				{{end}}
+
 				{{template "custom/extra_tabs" .}}
 
 				{{if and RepoFlagsEnabled .SignedUser.IsAdmin}}