diff --git a/app/views/homepage/_references.html.erb b/app/views/homepage/_references.html.erb
index ba8ecf89d9..b40ef3be60 100644
--- a/app/views/homepage/_references.html.erb
+++ b/app/views/homepage/_references.html.erb
@@ -57,11 +57,7 @@
         {
           title: "Webhooks",
           link: "/docs/apis/webhooks"
-        },
-        {
-          title: "Managing API access tokens",
-          link: "/docs/apis/managing-api-tokens"
-        },
+        }
       ]
     },
     {
diff --git a/app/views/landing_page_pipelines/_advanced_guides.html.erb b/app/views/landing_page_pipelines/_advanced_guides.html.erb
index 3bc78e6cb6..dcfe04635d 100644
--- a/app/views/landing_page_pipelines/_advanced_guides.html.erb
+++ b/app/views/landing_page_pipelines/_advanced_guides.html.erb
@@ -78,7 +78,7 @@
           },
           {
             text: "Two-factor authentication (2FA)",
-            to: "/docs/team-management/2fa"
+            to: "/docs/tutorials/2fa"
           },
           {
             text: "Using GitHub merge queues",
diff --git a/config/routes.rb b/config/routes.rb
index a08c14d4da..60fd689947 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,7 +74,6 @@
   get "/docs/tutorials/bitbucket",                to: redirect("/docs/integrations/bitbucket")
   get "/docs/tutorials/custom-saml",              to: redirect("/docs/integrations/sso/custom-saml")
   get "/docs/tutorials/sso-setup-with-graphql",   to: redirect("/docs/integrations/sso/sso-setup-with-graphql")
-  get "/docs/tutorials/2fa",                      to: redirect("/docs/team-management/2fa")
   get "/docs/tutorials/deploying-to-heroku",      to: redirect("/docs/deployments/deploying-to-heroku")
   get "/docs/integrations/sso/google-oauth",      to: redirect("/docs/integrations/sso/g-suite")
   get "/docs/integrations/sso/g-suite",           to: redirect("/docs/integrations/sso/google-workspace")
diff --git a/data/nav.yml b/data/nav.yml
index abcbe14e87..b9a4037608 100644
--- a/data/nav.yml
+++ b/data/nav.yml
@@ -56,6 +56,8 @@
           path: "tutorials/bazel"
         - name: "Migrating to YAML steps"
           path: "tutorials/pipeline-upgrade"
+        - name: "Two-factor authentication (2FA)"
+          path: "tutorials/2fa"
         - name: "Using GitHub merge queues"
           path: "tutorials/github-merge-queue"
         - name: "Triggering Pipelines Using GitHub Actions"
@@ -312,8 +314,6 @@
           path: "team-management"
         - name: "User and team permissions"
           path: "team-management/permissions"
-        - name: "Two-factor authentication (2FA)"
-          path: "team-management/2fa"
     - name: "Governance"
       children:
         - name: "Overview"
diff --git a/images/docs/team_management/2fa/2fa-1.png b/images/docs/tutorials/2fa/2fa-1.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-1.png
rename to images/docs/tutorials/2fa/2fa-1.png
diff --git a/images/docs/team_management/2fa/2fa-2.png b/images/docs/tutorials/2fa/2fa-2.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-2.png
rename to images/docs/tutorials/2fa/2fa-2.png
diff --git a/images/docs/team_management/2fa/2fa-3.png b/images/docs/tutorials/2fa/2fa-3.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-3.png
rename to images/docs/tutorials/2fa/2fa-3.png
diff --git a/images/docs/team_management/2fa/2fa-4.png b/images/docs/tutorials/2fa/2fa-4.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-4.png
rename to images/docs/tutorials/2fa/2fa-4.png
diff --git a/images/docs/team_management/2fa/2fa-5.png b/images/docs/tutorials/2fa/2fa-5.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-5.png
rename to images/docs/tutorials/2fa/2fa-5.png
diff --git a/images/docs/team_management/2fa/2fa-6.png b/images/docs/tutorials/2fa/2fa-6.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-6.png
rename to images/docs/tutorials/2fa/2fa-6.png
diff --git a/images/docs/team_management/2fa/2fa-7.png b/images/docs/tutorials/2fa/2fa-7.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-7.png
rename to images/docs/tutorials/2fa/2fa-7.png
diff --git a/images/docs/team_management/2fa/2fa-8.png b/images/docs/tutorials/2fa/2fa-8.png
similarity index 100%
rename from images/docs/team_management/2fa/2fa-8.png
rename to images/docs/tutorials/2fa/2fa-8.png
diff --git a/pages/pipelines/security_overview.md b/pages/pipelines/security_overview.md
index e596fe0e7c..4be19ea3a0 100644
--- a/pages/pipelines/security_overview.md
+++ b/pages/pipelines/security_overview.md
@@ -42,7 +42,7 @@ Buildkite keeps up to date with software dependencies and has automated tools sc
 
 ## Code review and testing process
 
-All pull requests are reviewed by senior engineers with security best practice training before being deployed to production systems. [Two-factor authentication (2FA)](/docs/team-management/2fa) is enabled across GitHub and Buildkite organizations for added security.
+All pull requests are reviewed by senior engineers with security best practice training before being deployed to production systems. [Two-factor authentication (2FA)](/docs/tutorials/2fa) is enabled across GitHub and Buildkite organizations for added security.
 
 An extensive set of automated testing procedures is run for every code change.
 
diff --git a/pages/team_management.md b/pages/team_management.md
index 5ca202270d..b05209cbbd 100644
--- a/pages/team_management.md
+++ b/pages/team_management.md
@@ -7,5 +7,4 @@ toc: false
 Team management is fundamental in CI/CD tools to ensure streamlined processes, proper access controls, and efficient collaboration. Buildkite provides features for your team management needs:
 
 - [User and team permissions](/docs/team-management/permissions)
-- [Two factor authentication (2FA)](/docs/team-management/2fa)
 - [Managing API access tokens](/docs/apis/managing-api-tokens) (under the APIs section)
diff --git a/pages/team_management/2fa.md b/pages/tutorials/2fa.md
similarity index 100%
rename from pages/team_management/2fa.md
rename to pages/tutorials/2fa.md