diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml
index 5d9438cc5e6..27a807005b1 100644
--- a/.gitlab/ci/qa-common/main.gitlab-ci.yml
+++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml
@@ -14,7 +14,7 @@ include:
       gitlab_auth_token_variable_name: "PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE"
       allure_job_name: "${QA_RUN_TYPE}"
   - project: gitlab-org/quality/pipeline-common
-    ref: 7.12.1
+    ref: 7.13.3
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/knapsack-report.yml
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 19712d9d551..e0e2ac0dc32 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -230,7 +230,6 @@ Layout/LineLength:
     - 'app/helpers/merge_requests_helper.rb'
     - 'app/helpers/mirror_helper.rb'
     - 'app/helpers/nav/new_dropdown_helper.rb'
-    - 'app/helpers/nav/top_nav_helper.rb'
     - 'app/helpers/nav_helper.rb'
     - 'app/helpers/notify_helper.rb'
     - 'app/helpers/operations_helper.rb'
diff --git a/.rubocop_todo/metrics/abc_size.yml b/.rubocop_todo/metrics/abc_size.yml
index babf39d6630..85097a9e69e 100644
--- a/.rubocop_todo/metrics/abc_size.yml
+++ b/.rubocop_todo/metrics/abc_size.yml
@@ -2,7 +2,6 @@
 Metrics/AbcSize:
   Exclude:
     - 'app/helpers/issuables_helper.rb'
-    - 'app/helpers/nav/top_nav_helper.rb'
     - 'app/models/instance_configuration.rb'
     - 'app/services/projects/create_service.rb'
     - 'lib/gitlab/analytics/cycle_analytics/request_params.rb'
diff --git a/.rubocop_todo/metrics/cyclomatic_complexity.yml b/.rubocop_todo/metrics/cyclomatic_complexity.yml
index 2519705f21a..e52e93e55f6 100644
--- a/.rubocop_todo/metrics/cyclomatic_complexity.yml
+++ b/.rubocop_todo/metrics/cyclomatic_complexity.yml
@@ -4,7 +4,6 @@ Metrics/CyclomaticComplexity:
     - 'app/controllers/admin/application_settings_controller.rb'
     - 'app/finders/deployments_finder.rb'
     - 'app/helpers/button_helper.rb'
-    - 'app/helpers/nav/top_nav_helper.rb'
     - 'app/models/concerns/issuable.rb'
     - 'app/services/projects/create_service.rb'
     - 'ee/app/controllers/ee/groups_controller.rb'
diff --git a/.rubocop_todo/metrics/perceived_complexity.yml b/.rubocop_todo/metrics/perceived_complexity.yml
index 6e541bee880..3f09e7f9270 100644
--- a/.rubocop_todo/metrics/perceived_complexity.yml
+++ b/.rubocop_todo/metrics/perceived_complexity.yml
@@ -4,7 +4,6 @@ Metrics/PerceivedComplexity:
     - 'app/controllers/admin/application_settings_controller.rb'
     - 'app/finders/deployments_finder.rb'
     - 'app/helpers/button_helper.rb'
-    - 'app/helpers/nav/top_nav_helper.rb'
     - 'app/services/projects/create_service.rb'
     - 'ee/app/controllers/ee/groups_controller.rb'
     - 'lib/banzai/filter/references/abstract_reference_filter.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index ba1bdb3f194..d3ebe8427fd 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -1418,7 +1418,6 @@ RSpec/ContextWording:
     - 'spec/helpers/listbox_helper_spec.rb'
     - 'spec/helpers/markup_helper_spec.rb'
     - 'spec/helpers/members_helper_spec.rb'
-    - 'spec/helpers/nav/top_nav_helper_spec.rb'
     - 'spec/helpers/nav_helper_spec.rb'
     - 'spec/helpers/notes_helper_spec.rb'
     - 'spec/helpers/operations_helper_spec.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
index 88d2255f681..ca85767e0f1 100644
--- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml
+++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -291,7 +291,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'spec/helpers/members_helper_spec.rb'
     - 'spec/helpers/merge_requests_helper_spec.rb'
     - 'spec/helpers/namespaces_helper_spec.rb'
-    - 'spec/helpers/nav/top_nav_helper_spec.rb'
     - 'spec/helpers/nav_helper_spec.rb'
     - 'spec/helpers/notes_helper_spec.rb'
     - 'spec/helpers/notifications_helper_spec.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index 12377071205..37d27964038 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -2434,7 +2434,6 @@ RSpec/FeatureCategory:
     - 'spec/helpers/markup_helper_spec.rb'
     - 'spec/helpers/members_helper_spec.rb'
     - 'spec/helpers/milestones_helper_spec.rb'
-    - 'spec/helpers/nav/top_nav_helper_spec.rb'
     - 'spec/helpers/notifications_helper_spec.rb'
     - 'spec/helpers/notify_helper_spec.rb'
     - 'spec/helpers/numbers_helper_spec.rb'
@@ -3799,7 +3798,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/multi_collection_paginator_spec.rb'
     - 'spec/lib/gitlab/multi_destination_logger_spec.rb'
     - 'spec/lib/gitlab/namespaced_session_store_spec.rb'
-    - 'spec/lib/gitlab/nav/top_nav_menu_header_spec.rb'
     - 'spec/lib/gitlab/no_cache_headers_spec.rb'
     - 'spec/lib/gitlab/noteable_metadata_spec.rb'
     - 'spec/lib/gitlab/object_hierarchy_spec.rb'
diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml
index 93404a43df2..dd4928d9c8a 100644
--- a/.rubocop_todo/rspec/named_subject.yml
+++ b/.rubocop_todo/rspec/named_subject.yml
@@ -1617,7 +1617,6 @@ RSpec/NamedSubject:
     - 'spec/helpers/markup_helper_spec.rb'
     - 'spec/helpers/merge_requests_helper_spec.rb'
     - 'spec/helpers/namespaces_helper_spec.rb'
-    - 'spec/helpers/nav/top_nav_helper_spec.rb'
     - 'spec/helpers/nav_helper_spec.rb'
     - 'spec/helpers/operations_helper_spec.rb'
     - 'spec/helpers/page_layout_helper_spec.rb'
diff --git a/.rubocop_todo/rspec/return_from_stub.yml b/.rubocop_todo/rspec/return_from_stub.yml
index ed5b6fa5486..034d4fe4b09 100644
--- a/.rubocop_todo/rspec/return_from_stub.yml
+++ b/.rubocop_todo/rspec/return_from_stub.yml
@@ -99,7 +99,6 @@ RSpec/ReturnFromStub:
     - 'spec/helpers/explore_helper_spec.rb'
     - 'spec/helpers/groups_helper_spec.rb'
     - 'spec/helpers/issues_helper_spec.rb'
-    - 'spec/helpers/nav/top_nav_helper_spec.rb'
     - 'spec/helpers/nav_helper_spec.rb'
     - 'spec/helpers/operations_helper_spec.rb'
     - 'spec/helpers/projects_helper_spec.rb'
diff --git a/.rubocop_todo/style/arguments_forwarding.yml b/.rubocop_todo/style/arguments_forwarding.yml
index f51e582b5a0..f578b75e5f0 100644
--- a/.rubocop_todo/style/arguments_forwarding.yml
+++ b/.rubocop_todo/style/arguments_forwarding.yml
@@ -110,7 +110,6 @@ Style/ArgumentsForwarding:
     - 'lib/gitlab/legacy_github_import/client.rb'
     - 'lib/gitlab/memory/watchdog/configuration.rb'
     - 'lib/gitlab/metrics/prometheus.rb'
-    - 'lib/gitlab/nav/top_nav_view_model_builder.rb'
     - 'lib/gitlab/quick_actions/dsl.rb'
     - 'lib/gitlab/rack_attack.rb'
     - 'lib/gitlab/redis/multi_store.rb'
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 04dc90edb95..05f3afd6232 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -61,7 +61,6 @@ Style/GuardClause:
     - 'app/helpers/admin/user_actions_helper.rb'
     - 'app/helpers/events_helper.rb'
     - 'app/helpers/issues_helper.rb'
-    - 'app/helpers/nav/top_nav_helper.rb'
     - 'app/helpers/notes_helper.rb'
     - 'app/helpers/preferences_helper.rb'
     - 'app/helpers/profiles_helper.rb'
@@ -275,7 +274,6 @@ Style/GuardClause:
     - 'ee/app/helpers/ee/application_helper.rb'
     - 'ee/app/helpers/ee/auth_helper.rb'
     - 'ee/app/helpers/ee/nav/new_dropdown_helper.rb'
-    - 'ee/app/helpers/ee/nav/top_nav_helper.rb'
     - 'ee/app/helpers/ee/projects/pipeline_helper.rb'
     - 'ee/app/helpers/ee/projects_helper.rb'
     - 'ee/app/models/allowed_email_domain.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 6c52c2d9f8e..5c4f93e0d55 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -88,7 +88,6 @@ Style/IfUnlessModifier:
     - 'app/helpers/lazy_image_tag_helper.rb'
     - 'app/helpers/markup_helper.rb'
     - 'app/helpers/merge_requests_helper.rb'
-    - 'app/helpers/nav/top_nav_helper.rb'
     - 'app/helpers/nav_helper.rb'
     - 'app/helpers/page_layout_helper.rb'
     - 'app/helpers/preferences_helper.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index a353755aa7b..55a3320cedd 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -351,7 +351,6 @@ Style/InlineDisableAnnotation:
     - 'app/helpers/issuables_helper.rb'
     - 'app/helpers/lazy_image_tag_helper.rb'
     - 'app/helpers/namespaces_helper.rb'
-    - 'app/helpers/nav/top_nav_helper.rb'
     - 'app/helpers/page_layout_helper.rb'
     - 'app/helpers/routing/projects_helper.rb'
     - 'app/helpers/routing/pseudonymization_helper.rb'
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 29ada2ea395..9807f6e9cbf 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-c0b07ba36fc8fc40830f061cb55a5c951a166e1c
+61813ee439cc7a3e0858b4955f4511315eaab650
diff --git a/app/assets/javascripts/ci/catalog/components/pages/ci_resources_page.vue b/app/assets/javascripts/ci/catalog/components/pages/ci_resources_page.vue
index f2e98d50c43..e1c86f38d7e 100644
--- a/app/assets/javascripts/ci/catalog/components/pages/ci_resources_page.vue
+++ b/app/assets/javascripts/ci/catalog/components/pages/ci_resources_page.vue
@@ -8,6 +8,8 @@ import CatalogListSkeletonLoader from '../list/catalog_list_skeleton_loader.vue'
 import CatalogHeader from '../list/catalog_header.vue';
 import EmptyState from '../list/empty_state.vue';
 import getCatalogResources from '../../graphql/queries/get_ci_catalog_resources.query.graphql';
+import getCurrentPage from '../../graphql/queries/client/get_current_page.query.graphql';
+import updateCurrentPageMutation from '../../graphql/mutations/client/update_current_page.mutation.graphql';
 
 export default {
   components: {
@@ -46,6 +48,12 @@ export default {
         createAlert({ message: e.message || this.$options.i18n.fetchError, variant: 'danger' });
       },
     },
+    currentPage: {
+      query: getCurrentPage,
+      update(data) {
+        return data?.page?.current || 1;
+      },
+    },
   },
   computed: {
     hasResources() {
@@ -72,7 +80,7 @@ export default {
           },
         });
 
-        this.currentPage -= 1;
+        this.decrementPage();
       } catch (e) {
         // Ensure that the current query is properly stoped if an error occurs.
         this.$apollo.queries.catalogResources.stop();
@@ -87,7 +95,7 @@ export default {
           },
         });
 
-        this.currentPage += 1;
+        this.incrementPage();
       } catch (e) {
         // Ensure that the current query is properly stoped if an error occurs.
         this.$apollo.queries.catalogResources.stop();
@@ -95,6 +103,20 @@ export default {
         createAlert({ message: e?.message || this.$options.i18n.fetchError, variant: 'danger' });
       }
     },
+    updatePageCount(pageNumber) {
+      this.$apollo.mutate({
+        mutation: updateCurrentPageMutation,
+        variables: {
+          pageNumber,
+        },
+      });
+    },
+    decrementPage() {
+      this.updatePageCount(this.currentPage - 1);
+    },
+    incrementPage() {
+      this.updatePageCount(this.currentPage + 1);
+    },
     onUpdateSearchTerm(searchTerm) {
       this.searchTerm = !searchTerm.length ? null : searchTerm;
       this.resetPageCount();
@@ -109,7 +131,7 @@ export default {
       });
     },
     resetPageCount() {
-      this.currentPage = 1;
+      this.updatePageCount(1);
     },
   },
   i18n: {
diff --git a/app/assets/javascripts/ci/catalog/graphql/mutations/client/update_current_page.mutation.graphql b/app/assets/javascripts/ci/catalog/graphql/mutations/client/update_current_page.mutation.graphql
new file mode 100644
index 00000000000..7ffd8f6ea61
--- /dev/null
+++ b/app/assets/javascripts/ci/catalog/graphql/mutations/client/update_current_page.mutation.graphql
@@ -0,0 +1,7 @@
+mutation updateCurrentPage($pageNumber: Int!) {
+  updateCurrentPage(pageNumber: $pageNumber) @client {
+    page {
+      current
+    }
+  }
+}
diff --git a/app/assets/javascripts/ci/catalog/graphql/queries/client/get_current_page.query.graphql b/app/assets/javascripts/ci/catalog/graphql/queries/client/get_current_page.query.graphql
new file mode 100644
index 00000000000..b49895a64aa
--- /dev/null
+++ b/app/assets/javascripts/ci/catalog/graphql/queries/client/get_current_page.query.graphql
@@ -0,0 +1,5 @@
+query getCurrentPage {
+  page @client {
+    current
+  }
+}
diff --git a/app/assets/javascripts/ci/catalog/graphql/settings.js b/app/assets/javascripts/ci/catalog/graphql/settings.js
index 5e71fee818e..c3c6dcca261 100644
--- a/app/assets/javascripts/ci/catalog/graphql/settings.js
+++ b/app/assets/javascripts/ci/catalog/graphql/settings.js
@@ -1,33 +1,45 @@
 import { componentsMockData } from '../constants';
+import getCurrentPage from './queries/client/get_current_page.query.graphql';
 
 export const ciCatalogResourcesItemsCount = 20;
 export const CI_CATALOG_RESOURCE_TYPE = 'Ci::Catalog::Resource';
 
 export const cacheConfig = {
-  cacheConfig: {
-    typePolicies: {
-      Query: {
-        fields: {
-          ciCatalogResource(_, { args, toReference }) {
-            return toReference({
-              __typename: 'CiCatalogResource',
-              // Webpath is the fullpath with a leading slash
-              webPath: `/${args.fullPath}`,
-            });
-          },
-          ciCatalogResources: {
-            keyArgs: false,
-          },
+  typePolicies: {
+    Query: {
+      fields: {
+        ciCatalogResource(_, { args, toReference }) {
+          return toReference({
+            __typename: 'CiCatalogResource',
+            // Webpath is the fullpath with a leading slash
+            webPath: `/${args.fullPath}`,
+          });
+        },
+        ciCatalogResources: {
+          keyArgs: false,
         },
       },
-      CiCatalogResource: {
-        keyFields: ['webPath'],
-      },
+    },
+    CiCatalogResource: {
+      keyFields: ['webPath'],
     },
   },
 };
 
 export const resolvers = {
+  Mutation: {
+    updateCurrentPage: (_, { pageNumber }, { cache }) => {
+      cache.writeQuery({
+        query: getCurrentPage,
+        data: {
+          page: {
+            __typename: 'CatalogPage',
+            current: pageNumber,
+          },
+        },
+      });
+    },
+  },
   CiCatalogResource: {
     components() {
       return componentsMockData;
diff --git a/app/assets/javascripts/ci/catalog/graphql/typedefs.graphql b/app/assets/javascripts/ci/catalog/graphql/typedefs.graphql
new file mode 100644
index 00000000000..8604fae0655
--- /dev/null
+++ b/app/assets/javascripts/ci/catalog/graphql/typedefs.graphql
@@ -0,0 +1,11 @@
+type CatalogPage {
+  current: Int
+}
+
+extend type Query {
+  page: CatalogPage
+}
+
+extend type Mutation {
+  updateCurrentPage(pageNumber: Int!): CatalogPage
+}
diff --git a/app/assets/javascripts/ci/catalog/index.js b/app/assets/javascripts/ci/catalog/index.js
index 5815245506c..34866bfb821 100644
--- a/app/assets/javascripts/ci/catalog/index.js
+++ b/app/assets/javascripts/ci/catalog/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
 import { cacheConfig, resolvers } from '~/ci/catalog/graphql/settings';
+import typeDefs from '~/ci/catalog/graphql/typedefs.graphql';
 
 import GlobalCatalog from './global_catalog.vue';
 import CiResourcesPage from './components/pages/ci_resources_page.vue';
@@ -19,7 +20,7 @@ export const initCatalog = (selector = '#js-ci-cd-catalog') => {
   Vue.use(VueApollo);
 
   const apolloProvider = new VueApollo({
-    defaultClient: createDefaultClient(resolvers, cacheConfig),
+    defaultClient: createDefaultClient(resolvers, { cacheConfig, typeDefs }),
   });
 
   return new Vue({
diff --git a/app/assets/javascripts/ci/job_details/components/log/line.vue b/app/assets/javascripts/ci/job_details/components/log/line.vue
index 416f75372f9..6ff2bb766c7 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line.vue
@@ -68,7 +68,7 @@ export default {
       {
         class: [
           'js-log-line',
-          'log-line',
+          'job-log-line',
           { 'gl-bg-gray-700': isHighlighted || applyHashHighlight },
         ],
       },
diff --git a/app/assets/javascripts/ci/job_details/components/log/line_header.vue b/app/assets/javascripts/ci/job_details/components/log/line_header.vue
index 4e009afe8c9..4716f1e5162 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line_header.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line_header.vue
@@ -68,7 +68,7 @@ export default {
 
 <template>
   <div
-    class="js-log-line log-line collapsible-line d-flex justify-content-between ws-normal gl-align-items-flex-start gl-relative"
+    class="js-log-line job-log-line-header job-log-line"
     :class="{ 'gl-bg-gray-700': isHighlighted || applyHashHighlight }"
     role="button"
     @click="handleOnClick"
@@ -78,7 +78,7 @@ export default {
     <span
       v-for="(content, i) in line.content"
       :key="i"
-      class="line-text w-100 gl-white-space-pre-wrap"
+      class="gl-flex-grow-1 gl-white-space-pre-wrap"
       :class="content.style"
       >{{ content.text }}</span
     >
diff --git a/app/assets/javascripts/ci/job_details/components/log/line_number.vue b/app/assets/javascripts/ci/job_details/components/log/line_number.vue
index 30b4c80f3fa..ea39c00c8a3 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line_number.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line_number.vue
@@ -20,7 +20,7 @@ export default {
     return h(
       'a',
       {
-        class: 'gl-link d-inline-block text-right line-number flex-shrink-0',
+        class: 'job-log-line-number',
         attrs: {
           id: lineId,
           href: lineHref,
diff --git a/app/assets/javascripts/ci/job_details/components/log/log.vue b/app/assets/javascripts/ci/job_details/components/log/log.vue
index 2f5830c2967..b8ad4801510 100644
--- a/app/assets/javascripts/ci/job_details/components/log/log.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/log.vue
@@ -66,7 +66,7 @@ export default {
 };
 </script>
 <template>
-  <code class="job-log d-block" data-testid="job-log-content">
+  <code class="job-log gl-display-block" data-testid="job-log-content">
     <template v-for="line in jobLog">
       <template v-if="isLineVisible(line)">
         <log-line-header
diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json
index 7da180912a9..4edad63cc79 100644
--- a/app/assets/javascripts/graphql_shared/possible_types.json
+++ b/app/assets/javascripts/graphql_shared/possible_types.json
@@ -207,6 +207,7 @@
   "WorkItemWidgetDefinition": [
     "WorkItemWidgetDefinitionAssignees",
     "WorkItemWidgetDefinitionGeneric",
+    "WorkItemWidgetDefinitionHierarchy",
     "WorkItemWidgetDefinitionLabels"
   ]
 }
diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index 464889a6388..ec17b635d22 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -178,9 +178,6 @@ export default {
     canAssignUnassignUser() {
       return this.workItemAssignees && this.canSetWorkItemMetadata;
     },
-    projectFullPath() {
-      return this.workItem.namespace?.fullPath;
-    },
     workItemsMvc2Enabled() {
       return this.glFeatures.workItemsMvc2;
     },
@@ -450,7 +447,7 @@ export default {
               v-if="showWorkItemCurrentUserTodos"
               :work-item-id="workItem.id"
               :work-item-iid="workItemIid"
-              :work-item-fullpath="projectFullPath"
+              :work-item-fullpath="fullPath"
               :current-user-todos="currentUserTodos"
               @error="updateError = $event"
             />
@@ -546,7 +543,7 @@ export default {
             <work-item-award-emoji
               v-if="workItemAwardEmoji"
               :work-item-id="workItem.id"
-              :work-item-fullpath="projectFullPath"
+              :work-item-fullpath="fullPath"
               :award-emoji="workItemAwardEmoji.awardEmoji"
               :work-item-iid="workItemIid"
               @error="updateError = $event"
@@ -569,7 +566,7 @@ export default {
               v-if="showWorkItemLinkedItems"
               :work-item-id="workItem.id"
               :work-item-iid="workItemIid"
-              :work-item-full-path="projectFullPath"
+              :work-item-full-path="fullPath"
               :work-item-type="workItem.workItemType.name"
               @showModal="openInModal"
             />
diff --git a/app/assets/stylesheets/page_bundles/build.scss b/app/assets/stylesheets/page_bundles/build.scss
index 9b96c224d88..b25ab5564ac 100644
--- a/app/assets/stylesheets/page_bundles/build.scss
+++ b/app/assets/stylesheets/page_bundles/build.scss
@@ -180,18 +180,19 @@
   background-color: $builds-log-bg;
 }
 
-.log-line {
+.job-log-line {
   padding: 1px $gl-padding-8 1px $job-log-line-padding;
   min-height: $gl-line-height-20;
 }
 
-.line-number {
+.job-log-line-number {
   color: $gray-500;
-  padding: 0 $gl-padding-8;
+  padding: 0 1em 0 $gl-padding-8;
   min-width: $job-line-number-width;
   margin-left: -$job-line-number-margin;
-  padding-right: 1em;
   user-select: none;
+  display: inline-block;
+  text-align: right;
 
   &:hover,
   &:active,
@@ -201,7 +202,11 @@
   }
 }
 
-.collapsible-line {
+.job-log-line-header {
+  display: flex;
+  position: relative;
+  align-items: flex-start;
+
   &:hover {
     background-color: rgba($white, 0.2);
   }
diff --git a/app/finders/milestones_finder.rb b/app/finders/milestones_finder.rb
index 9ffd623338f..38379f5bbbf 100644
--- a/app/finders/milestones_finder.rb
+++ b/app/finders/milestones_finder.rb
@@ -96,7 +96,7 @@ class MilestonesFinder
   end
 
   def by_iids(items)
-    return items unless params[:iids].present? && !params[:include_parent_milestones]
+    return items unless params[:iids].present? && !params[:include_ancestors]
 
     items.by_iid(params[:iids])
   end
diff --git a/app/graphql/resolvers/work_items/types_resolver.rb b/app/graphql/resolvers/work_items/types_resolver.rb
index d560c2bf612..11db096b5ba 100644
--- a/app/graphql/resolvers/work_items/types_resolver.rb
+++ b/app/graphql/resolvers/work_items/types_resolver.rb
@@ -30,6 +30,12 @@ module Resolvers
           widget_definitions: :enabled_widget_definitions
         }
       end
+
+      def nested_preloads
+        {
+          widget_definitions: { allowed_child_types: :allowed_child_types_by_name }
+        }
+      end
     end
   end
 end
diff --git a/app/graphql/types/work_items/widget_definition_interface.rb b/app/graphql/types/work_items/widget_definition_interface.rb
index 0dd051b35f5..032e78779e7 100644
--- a/app/graphql/types/work_items/widget_definition_interface.rb
+++ b/app/graphql/types/work_items/widget_definition_interface.rb
@@ -13,7 +13,8 @@ module Types
 
       ORPHAN_TYPES = [
         ::Types::WorkItems::WidgetDefinitions::AssigneesType,
-        ::Types::WorkItems::WidgetDefinitions::GenericType
+        ::Types::WorkItems::WidgetDefinitions::GenericType,
+        ::Types::WorkItems::WidgetDefinitions::HierarchyType
       ].freeze
 
       def self.ce_orphan_types
@@ -23,6 +24,8 @@ module Types
       def self.resolve_type(object, _context)
         if object == ::WorkItems::Widgets::Assignees
           ::Types::WorkItems::WidgetDefinitions::AssigneesType
+        elsif object == ::WorkItems::Widgets::Hierarchy
+          ::Types::WorkItems::WidgetDefinitions::HierarchyType
         else
           ::Types::WorkItems::WidgetDefinitions::GenericType
         end
diff --git a/app/graphql/types/work_items/widget_definitions/hierarchy_type.rb b/app/graphql/types/work_items/widget_definitions/hierarchy_type.rb
new file mode 100644
index 00000000000..8bd70050c7c
--- /dev/null
+++ b/app/graphql/types/work_items/widget_definitions/hierarchy_type.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Types
+  module WorkItems
+    module WidgetDefinitions
+      # rubocop:disable Graphql/AuthorizeTypes -- authorized in work item type entity
+      class HierarchyType < BaseObject
+        graphql_name 'WorkItemWidgetDefinitionHierarchy'
+        description 'Represents a hierarchy widget definition'
+
+        implements Types::WorkItems::WidgetDefinitionInterface
+
+        field :allowed_child_types, Types::WorkItems::TypeType.connection_type,
+          null: true,
+          complexity: 5,
+          extras: [:parent],
+          description: 'Allowed child types for the work item type.'
+
+        def allowed_child_types(parent:)
+          parent.allowed_child_types(cache: true)
+        end
+      end
+      # rubocop:enable Graphql/AuthorizeTypes
+    end
+  end
+end
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 7c239f78088..d19b0a9a43a 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -15,14 +15,6 @@ module DashboardHelper
     merge_requests_dashboard_path(reviewer_username: current_user.username)
   end
 
-  def dashboard_nav_links
-    @dashboard_nav_links ||= get_dashboard_nav_links
-  end
-
-  def dashboard_nav_link?(link)
-    dashboard_nav_links.include?(link)
-  end
-
   def has_start_trial?
     false
   end
@@ -53,18 +45,6 @@ module DashboardHelper
       end
     end
   end
-
-  private
-
-  def get_dashboard_nav_links
-    links = [:projects, :groups, :snippets, :your_work, :explore]
-
-    if can?(current_user, :read_cross_project)
-      links += [:activity, :milestones]
-    end
-
-    links
-  end
 end
 
 DashboardHelper.prepend_mod_with('DashboardHelper')
diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb
index ed24f2509e8..0b58ebc1fb2 100644
--- a/app/helpers/explore_helper.rb
+++ b/app/helpers/explore_helper.rb
@@ -25,14 +25,6 @@ module ExploreHelper
     request_path_with_options(options)
   end
 
-  def explore_nav_links
-    @explore_nav_links ||= get_explore_nav_links
-  end
-
-  def explore_nav_link?(link)
-    explore_nav_links.include?(link)
-  end
-
   def public_visibility_restricted?
     Gitlab::VisibilityLevel.public_visibility_restricted?
   end
@@ -56,10 +48,6 @@ module ExploreHelper
 
   private
 
-  def get_explore_nav_links
-    [:projects, :groups, :topics, :snippets]
-  end
-
   def request_path_with_options(options = {})
     request.path + "?#{options.to_param}"
   end
diff --git a/app/helpers/nav/top_nav_helper.rb b/app/helpers/nav/top_nav_helper.rb
deleted file mode 100644
index d74efac76aa..00000000000
--- a/app/helpers/nav/top_nav_helper.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-# frozen_string_literal: true
-
-module Nav
-  module TopNavHelper
-    PROJECTS_VIEW = :projects
-    GROUPS_VIEW = :groups
-    NEW_VIEW = :new
-    SEARCH_VIEW = :search
-
-    def top_nav_view_model(project:, group:)
-      builder = ::Gitlab::Nav::TopNavViewModelBuilder.new
-
-      build_base_view_model(builder: builder, project: project, group: group)
-
-      builder.build
-    end
-
-    def top_nav_responsive_view_model(project:, group:)
-      builder = ::Gitlab::Nav::TopNavViewModelBuilder.new
-
-      build_base_view_model(builder: builder, project: project, group: group)
-
-      new_view_model = new_dropdown_view_model(project: project, group: group)
-
-      if new_view_model && new_view_model.fetch(:menu_sections)&.any?
-        builder.add_view(NEW_VIEW, new_view_model)
-      end
-
-      if top_nav_show_search
-        builder.add_view(SEARCH_VIEW, ::Gitlab::Nav::TopNavMenuItem.build(**top_nav_search_menu_item_attrs))
-      end
-
-      builder.build
-    end
-
-    def top_nav_show_search
-      header_link?(:search)
-    end
-
-    def top_nav_search_menu_item_attrs
-      {
-        id: 'search',
-        title: _('Search'),
-        icon: 'search',
-        href: search_context.search_url
-      }
-    end
-
-    private
-
-    def top_nav_localized_headers
-      {
-        explore: s_('TopNav|Explore'),
-        switch_to: s_('TopNav|Switch to')
-      }.freeze
-    end
-
-    def build_base_view_model(builder:, project:, group:)
-      if current_user
-        build_view_model(builder: builder, project: project, group: group)
-      else
-        build_anonymous_view_model(builder: builder)
-      end
-    end
-
-    def build_anonymous_view_model(builder:)
-      if explore_nav_link?(:projects)
-        builder.add_primary_menu_item_with_shortcut(
-          header: top_nav_localized_headers[:explore],
-          href: explore_root_path,
-          active: nav == 'project' || active_nav_link?(path: %w[dashboard#show root#show projects#trending projects#starred projects#index]),
-          **projects_menu_item_attrs
-        )
-      end
-
-      if explore_nav_link?(:groups)
-        builder.add_primary_menu_item_with_shortcut(
-          header: top_nav_localized_headers[:explore],
-          href: explore_groups_path,
-          active: nav == 'group' || active_nav_link?(controller: [:groups, 'groups/milestones', 'groups/group_members']),
-          **groups_menu_item_attrs
-        )
-      end
-
-      if explore_nav_link?(:topics)
-        builder.add_primary_menu_item_with_shortcut(
-          header: top_nav_localized_headers[:explore],
-          active: active_nav_link?(page: topics_explore_projects_path, path: 'projects#topic'),
-          href: topics_explore_projects_path,
-          **topics_menu_item_attrs
-        )
-      end
-
-      if explore_nav_link?(:snippets)
-        builder.add_primary_menu_item_with_shortcut(
-          header: top_nav_localized_headers[:explore],
-          active: active_nav_link?(controller: :snippets),
-          href: explore_snippets_path,
-          **snippets_menu_item_attrs
-        )
-      end
-    end
-
-    def build_view_model(builder:, project:, group:)
-      # These come from `app/views/layouts/nav/_dashboard.html.haml`
-      if dashboard_nav_link?(:projects)
-        current_item = project ? current_project(project: project) : {}
-
-        builder.add_primary_menu_item_with_shortcut(
-          header: top_nav_localized_headers[:switch_to],
-          active: nav == 'project' || active_nav_link?(path: %w[root#index projects#trending projects#starred dashboard/projects#index]),
-          data: { track_label: "projects_dropdown", track_action: "click_dropdown", track_property: "navigation_top", testid: "projects_dropdown" },
-          view: PROJECTS_VIEW,
-          shortcut_href: dashboard_projects_path,
-          **projects_menu_item_attrs
-        )
-        builder.add_view(PROJECTS_VIEW, container_view_props(namespace: 'projects', current_item: current_item, submenu: projects_submenu))
-      end
-
-      if dashboard_nav_link?(:groups)
-        current_item = group ? current_group(group: group) : {}
-
-        builder.add_primary_menu_item_with_shortcut(
-          header: top_nav_localized_headers[:switch_to],
-          active: nav == 'group' || active_nav_link?(path: %w[dashboard/groups explore/groups]),
-          data: { track_label: "groups_dropdown", track_action: "click_dropdown", track_property: "navigation_top", testid: "groups_dropdown" },
-          view: GROUPS_VIEW,
-          shortcut_href: dashboard_groups_path,
-          **groups_menu_item_attrs
-        )
-        builder.add_view(GROUPS_VIEW, container_view_props(namespace: 'groups', current_item: current_item, submenu: groups_submenu))
-      end
-
-      if dashboard_nav_link?(:your_work)
-        builder.add_primary_menu_item(
-          id: 'your-work',
-          header: top_nav_localized_headers[:switch_to],
-          title: _('Your work'),
-          href: dashboard_projects_path,
-          active: active_nav_link?(controller: []),
-          icon: 'work',
-          data: { **menu_data_tracking_attrs('your-work') }
-        )
-      end
-
-      if dashboard_nav_link?(:explore)
-        builder.add_primary_menu_item(
-          id: 'explore',
-          header: top_nav_localized_headers[:switch_to],
-          title: _('Explore'),
-          href: explore_projects_path,
-          active: active_nav_link?(controller: ["explore/groups", "explore/snippets"], page: ["/explore/projects", "/explore", "/explore/projects/topics"], path: ["projects#topic"]),
-          icon: 'compass',
-          data: { **menu_data_tracking_attrs('explore') }
-        )
-      end
-
-      if dashboard_nav_link?(:milestones)
-        builder.add_shortcut(
-          id: 'milestones-shortcut',
-          title: _('Milestones'),
-          href: dashboard_milestones_path,
-          css_class: 'dashboard-shortcuts-milestones'
-        )
-      end
-
-      if dashboard_nav_link?(:snippets)
-        builder.add_shortcut(
-          id: 'snippets-shortcut',
-          title: _('Snippets'),
-          href: dashboard_snippets_path,
-          css_class: 'dashboard-shortcuts-snippets'
-        )
-      end
-
-      if dashboard_nav_link?(:activity)
-        builder.add_shortcut(
-          id: 'activity-shortcut',
-          title: _('Activity'),
-          href: activity_dashboard_path,
-          css_class: 'dashboard-shortcuts-activity'
-        )
-      end
-
-      # Using admin? is generally discouraged because it does not check for
-      # "admin_mode". In this case we are migrating code and check both, so
-      # we should be good.
-      # rubocop: disable Cop/UserAdmin
-      if current_user&.admin?
-        title = _('Admin')
-
-        builder.add_secondary_menu_item(
-          id: 'admin',
-          title: title,
-          active: active_nav_link?(controller: 'admin/dashboard'),
-          icon: 'admin',
-          href: admin_root_path,
-          data: { qa_selector: 'admin_area_link', **menu_data_tracking_attrs(title) }
-        )
-      end
-
-      if Gitlab::CurrentSettings.admin_mode
-        if header_link?(:admin_mode)
-          builder.add_secondary_menu_item(
-            id: 'leave_admin_mode',
-            title: _('Leave admin mode'),
-            active: active_nav_link?(controller: 'admin/sessions'),
-            icon: 'lock-open',
-            href: destroy_admin_session_path,
-            data: { method: 'post', **menu_data_tracking_attrs('leave_admin_mode') }
-          )
-        elsif current_user.admin?
-          title = _('Enter admin mode')
-
-          builder.add_secondary_menu_item(
-            id: 'enter_admin_mode',
-            title: title,
-            active: active_nav_link?(controller: 'admin/sessions'),
-            icon: 'lock',
-            href: new_admin_session_path,
-            data: { testid: 'menu_item_link', qa_title: title, **menu_data_tracking_attrs(title) }
-          )
-        end
-      end
-      # rubocop: enable Cop/UserAdmin
-    end
-
-    def projects_menu_item_attrs
-      {
-        id: 'project',
-        title: _('Projects'),
-        icon: 'project',
-        shortcut_class: 'dashboard-shortcuts-projects'
-      }
-    end
-
-    def groups_menu_item_attrs
-      {
-        id: 'groups',
-        title: _('Groups'),
-        icon: 'group',
-        shortcut_class: 'dashboard-shortcuts-groups'
-      }
-    end
-
-    def topics_menu_item_attrs
-      {
-        id: 'topics',
-        title: _('Topics'),
-        icon: 'labels',
-        shortcut_class: 'dashboard-shortcuts-topics'
-      }
-    end
-
-    def snippets_menu_item_attrs
-      {
-        id: 'snippets',
-        title: _('Snippets'),
-        icon: 'snippet',
-        shortcut_class: 'dashboard-shortcuts-snippets'
-      }
-    end
-
-    def menu_data_tracking_attrs(label)
-      tracking_attrs(
-        "menu_#{label.underscore.parameterize(separator: '_')}",
-        'click_dropdown',
-        'navigation_top'
-      )[:data] || {}
-    end
-
-    def container_view_props(namespace:, current_item:, submenu:)
-      {
-        namespace: namespace,
-        currentUserName: current_user&.username,
-        currentItem: current_item,
-        linksPrimary: submenu[:primary],
-        linksSecondary: submenu[:secondary]
-      }
-    end
-
-    def current_project(project:)
-      return {} unless project.persisted?
-
-      {
-        id: project.id,
-        name: project.name,
-        namespace: project.full_name,
-        webUrl: project_path(project),
-        avatarUrl: project.avatar_url
-      }
-    end
-
-    def current_group(group:)
-      return {} unless group.persisted?
-
-      {
-        id: group.id,
-        name: group.name,
-        namespace: group.full_name,
-        webUrl: group_path(group),
-        avatarUrl: group.avatar_url
-      }
-    end
-
-    def projects_submenu
-      builder = ::Gitlab::Nav::TopNavMenuBuilder.new
-      projects_submenu_items(builder: builder)
-      builder.build
-    end
-
-    def projects_submenu_items(builder:)
-      title = _('View all projects')
-
-      builder.add_primary_menu_item(
-        id: 'your',
-        title: title,
-        href: dashboard_projects_path,
-        data: { testid: 'menu_item_link', qa_title: title, **menu_data_tracking_attrs(title) }
-      )
-    end
-
-    def groups_submenu
-      # These group links come from `app/views/layouts/nav/groups_dropdown/_show.html.haml`
-      builder = ::Gitlab::Nav::TopNavMenuBuilder.new
-
-      title = _('View all groups')
-
-      builder.add_primary_menu_item(
-        id: 'your',
-        title: title,
-        href: dashboard_groups_path,
-        data: { testid: 'menu_item_link', qa_title: title, **menu_data_tracking_attrs(title) }
-      )
-      builder.build
-    end
-  end
-end
-
-Nav::TopNavHelper.prepend_mod
diff --git a/app/models/project.rb b/app/models/project.rb
index 655ca2095a5..29afe9de722 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1937,7 +1937,7 @@ class Project < ApplicationRecord
     repository = project_repository || build_project_repository
     repository.update!(shard_name: repository_storage, disk_path: disk_path)
 
-    cleanup if replicate_object_pool_on_move_ff_enabled?
+    cleanup
   end
 
   def create_repository(force: false, default_branch: nil, object_format: nil)
@@ -2760,7 +2760,6 @@ class Project < ApplicationRecord
 
   # After repository is moved from shard to shard, disconnect it from the previous object pool and connect to the new pool
   def swap_pool_repository!
-    return unless replicate_object_pool_on_move_ff_enabled?
     return unless repository_exists?
 
     old_pool_repository = pool_repository
@@ -2775,7 +2774,7 @@ class Project < ApplicationRecord
 
   def link_pool_repository
     return unless pool_repository
-    return if (pool_repository.shard_name != repository.shard) && replicate_object_pool_on_move_ff_enabled?
+    return if pool_repository.shard_name != repository.shard
 
     pool_repository.link_repository(repository)
   end
@@ -3463,10 +3462,6 @@ class Project < ApplicationRecord
     RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX
   end
 
-  def replicate_object_pool_on_move_ff_enabled?
-    Feature.enabled?(:replicate_object_pool_on_move, self)
-  end
-
   def pool_repository_shard_matches_repository?(pool)
     pool_repository_shard = pool.shard.name
 
diff --git a/app/models/work_items/type.rb b/app/models/work_items/type.rb
index 4ccef4c93d3..4c55209259c 100644
--- a/app/models/work_items/type.rb
+++ b/app/models/work_items/type.rb
@@ -9,6 +9,11 @@ module WorkItems
     self.table_name = 'work_item_types'
 
     include CacheMarkdownField
+    include ReactiveCaching
+
+    self.reactive_cache_work_type = :no_dependency
+    self.reactive_cache_refresh_interval = 10.minutes
+    self.reactive_cache_lifetime = 1.hour
 
     # type name is used in restrictions DB seeder to assure restrictions for
     # default types are pre-filled
@@ -53,8 +58,14 @@ module WorkItems
     has_many :widget_definitions, foreign_key: :work_item_type_id, inverse_of: :work_item_type
     has_many :enabled_widget_definitions, -> { where(disabled: false) }, foreign_key: :work_item_type_id,
       inverse_of: :work_item_type, class_name: 'WorkItems::WidgetDefinition'
+    has_many :child_restrictions, class_name: 'WorkItems::HierarchyRestriction', foreign_key: :parent_type_id,
+      inverse_of: :parent_type
+    has_many :allowed_child_types_by_name, -> { order_by_name_asc },
+      through: :child_restrictions, class_name: 'WorkItems::Type',
+      foreign_key: :child_type_id, source: :child_type
 
     before_validation :strip_whitespace
+    after_save :clear_reactive_cache!
 
     # TODO: review validation rules
     # https://gitlab.com/gitlab-org/gitlab/-/issues/336919
@@ -101,6 +112,16 @@ module WorkItems
       name == WorkItems::Type::TYPE_NAMES[:issue]
     end
 
+    def calculate_reactive_cache
+      allowed_child_types_by_name
+    end
+
+    def allowed_child_types(cache: false)
+      cached_data = cache ? with_reactive_cache { |query_data| query_data } : nil
+
+      cached_data || allowed_child_types_by_name
+    end
+
     private
 
     def strip_whitespace
diff --git a/app/services/projects/update_repository_storage_service.rb b/app/services/projects/update_repository_storage_service.rb
index e727181666e..9c65b261274 100644
--- a/app/services/projects/update_repository_storage_service.rb
+++ b/app/services/projects/update_repository_storage_service.rb
@@ -18,7 +18,7 @@ module Projects
       project.track_project_repository
 
       # Link repository from the new shard to pool repository from the new shard
-      project.link_pool_repository if replicate_object_pool_on_move_ff_enabled?
+      project.link_pool_repository
     end
 
     def mirror_repositories
@@ -36,7 +36,6 @@ module Projects
     end
 
     def mirror_object_pool(destination_storage_name)
-      return unless replicate_object_pool_on_move_ff_enabled?
       return unless project.repository_exists?
 
       pool_repository = project.pool_repository
@@ -92,9 +91,5 @@ module Projects
         state: 'ready'
       )
     end
-
-    def replicate_object_pool_on_move_ff_enabled?
-      Feature.enabled?(:replicate_object_pool_on_move, project)
-    end
   end
 end
diff --git a/app/views/projects/commit/x509/_certificate_details.html.haml b/app/views/projects/commit/x509/_certificate_details.html.haml
index cea216d0d9d..22d297248f8 100644
--- a/app/views/projects/commit/x509/_certificate_details.html.haml
+++ b/app/views/projects/commit/x509/_certificate_details.html.haml
@@ -1,17 +1,18 @@
-.gpg-popover-certificate-details
-  %strong= _('Certificate Subject')
-  - if signature.x509_certificate.revoked?
-    %strong.cred= _('(revoked)')
-  %ul
-    - x509_subject(signature.x509_certificate.subject, ["CN", "O"]).map do |key, value|
-      %li= key + "=" + value
-    %li= _('Subject Key Identifier:')
-    %li.unstyled= signature.x509_certificate.subject_key_identifier.gsub(":", " ")
+- if signature.x509_certificate
+  .gpg-popover-certificate-details
+    %strong= _('Certificate Subject')
+    - if signature.x509_certificate.revoked?
+      %strong.cred= _('(revoked)')
+    %ul
+      - x509_subject(signature.x509_certificate.subject, ["CN", "O"]).map do |key, value|
+        %li= key + "=" + value
+      %li= _('Subject Key Identifier:')
+      %li.unstyled= signature.x509_certificate.subject_key_identifier.gsub(":", " ")
 
-.gpg-popover-certificate-details
-  %strong= _('Certificate Issuer')
-  %ul
-    - x509_subject(signature.x509_certificate.x509_issuer.subject, ["CN", "OU", "O"]).map do |key, value|
-      %li= key + "=" + value
-    %li= _('Subject Key Identifier:')
-    %li.unstyled= signature.x509_certificate.x509_issuer.subject_key_identifier.gsub(":", " ")
+  .gpg-popover-certificate-details
+    %strong= _('Certificate Issuer')
+    %ul
+      - x509_subject(signature.x509_certificate.x509_issuer.subject, ["CN", "OU", "O"]).map do |key, value|
+        %li= key + "=" + value
+      %li= _('Subject Key Identifier:')
+      %li.unstyled= signature.x509_certificate.x509_issuer.subject_key_identifier.gsub(":", " ")
diff --git a/config/feature_flags/development/replicate_object_pool_on_move.yml b/config/feature_flags/development/replicate_object_pool_on_move.yml
deleted file mode 100644
index e413c8ee56c..00000000000
--- a/config/feature_flags/development/replicate_object_pool_on_move.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: replicate_object_pool_on_move
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127143
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/420720
-milestone: '16.3'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/data/deprecations/16-7-list-repos-rake-task.yml b/data/deprecations/16-7-list-repos-rake-task.yml
new file mode 100644
index 00000000000..f5b2cd929be
--- /dev/null
+++ b/data/deprecations/16-7-list-repos-rake-task.yml
@@ -0,0 +1,12 @@
+- title: "List repository directories Rake task"
+  removal_milestone: "17.0"
+  announcement_milestone: "16.7"
+  breaking_change: true
+  reporter: mkozono
+  stage: enablement
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384361
+  body: |
+    The `gitlab-rake gitlab:list_repos` Rake task does not work and will be removed in GitLab 17.0.
+    If you're migrating GitLab, use
+    [backup and restore](https://docs.gitlab.com/ee/administration/operations/moving_repositories.html#recommended-approach-in-all-cases)
+    instead.
diff --git a/doc/administration/admin_area.md b/doc/administration/admin_area.md
index a4fe5a83b73..93d67546cb5 100644
--- a/doc/administration/admin_area.md
+++ b/doc/administration/admin_area.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # GitLab Admin Area **(FREE SELF)**
diff --git a/doc/administration/auth/atlassian.md b/doc/administration/auth/atlassian.md
index cbb9663cfa6..abe2ab9c353 100644
--- a/doc/administration/auth/atlassian.md
+++ b/doc/administration/auth/atlassian.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/cognito.md b/doc/administration/auth/cognito.md
index 2e2d9ec3d28..cdf20c094ff 100644
--- a/doc/administration/auth/cognito.md
+++ b/doc/administration/auth/cognito.md
@@ -1,5 +1,4 @@
 ---
-type: concepts, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/crowd.md b/doc/administration/auth/crowd.md
index 0034f244809..68d1981a63d 100644
--- a/doc/administration/auth/crowd.md
+++ b/doc/administration/auth/crowd.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/index.md b/doc/administration/auth/index.md
index 037a2943b2e..a0224c6e5a0 100644
--- a/doc/administration/auth/index.md
+++ b/doc/administration/auth/index.md
@@ -1,5 +1,4 @@
 ---
-type: index
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/jwt.md b/doc/administration/auth/jwt.md
index 67f72b3344e..5852e5d1746 100644
--- a/doc/administration/auth/jwt.md
+++ b/doc/administration/auth/jwt.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/ldap/google_secure_ldap.md b/doc/administration/auth/ldap/google_secure_ldap.md
index 5b9bddc34c5..efb04ddda69 100644
--- a/doc/administration/auth/ldap/google_secure_ldap.md
+++ b/doc/administration/auth/ldap/google_secure_ldap.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/ldap/index.md b/doc/administration/auth/ldap/index.md
index 0c42ce90346..0babc0d31d8 100644
--- a/doc/administration/auth/ldap/index.md
+++ b/doc/administration/auth/ldap/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/ldap/ldap-troubleshooting.md b/doc/administration/auth/ldap/ldap-troubleshooting.md
index 517e58b532c..b4f65699dd0 100644
--- a/doc/administration/auth/ldap/ldap-troubleshooting.md
+++ b/doc/administration/auth/ldap/ldap-troubleshooting.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/oidc.md b/doc/administration/auth/oidc.md
index 25124e7e7ab..35462260792 100644
--- a/doc/administration/auth/oidc.md
+++ b/doc/administration/auth/oidc.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md
index f4c64efb7b4..c3e9fb83118 100644
--- a/doc/administration/auth/smartcard.md
+++ b/doc/administration/auth/smartcard.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Smartcard authentication **(PREMIUM SELF)**
diff --git a/doc/administration/broadcast_messages.md b/doc/administration/broadcast_messages.md
index 1d18d5e480f..48c2dd3db52 100644
--- a/doc/administration/broadcast_messages.md
+++ b/doc/administration/broadcast_messages.md
@@ -2,7 +2,6 @@
 stage: Growth
 group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Broadcast messages **(FREE SELF)**
diff --git a/doc/administration/cicd.md b/doc/administration/cicd.md
index 10bc60fe399..34645bdd04f 100644
--- a/doc/administration/cicd.md
+++ b/doc/administration/cicd.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # GitLab CI/CD instance configuration **(FREE SELF)**
diff --git a/doc/administration/configure.md b/doc/administration/configure.md
index 8ff2ae5aa9d..d29eff54411 100644
--- a/doc/administration/configure.md
+++ b/doc/administration/configure.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Configure your GitLab installation **(FREE SELF)**
diff --git a/doc/administration/consul.md b/doc/administration/consul.md
index a65b2100237..cd4394aea5b 100644
--- a/doc/administration/consul.md
+++ b/doc/administration/consul.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # How to set up Consul **(PREMIUM SELF)**
diff --git a/doc/administration/credentials_inventory.md b/doc/administration/credentials_inventory.md
index 34819780420..5ce6b322fdc 100644
--- a/doc/administration/credentials_inventory.md
+++ b/doc/administration/credentials_inventory.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Credentials inventory **(ULTIMATE SELF)**
diff --git a/doc/administration/diff_limits.md b/doc/administration/diff_limits.md
index 636b6fc1211..0a278de28bb 100644
--- a/doc/administration/diff_limits.md
+++ b/doc/administration/diff_limits.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Diff limits administration **(FREE SELF)**
diff --git a/doc/administration/email_from_gitlab.md b/doc/administration/email_from_gitlab.md
index 8982552c689..e76e93a7a4d 100644
--- a/doc/administration/email_from_gitlab.md
+++ b/doc/administration/email_from_gitlab.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto, reference
 ---
 
 # Email from GitLab **(PREMIUM SELF)**
diff --git a/doc/administration/encrypted_configuration.md b/doc/administration/encrypted_configuration.md
index 4ffb1495ec8..b66dae59ea7 100644
--- a/doc/administration/encrypted_configuration.md
+++ b/doc/administration/encrypted_configuration.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Encrypted Configuration **(FREE SELF)**
diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md
index e060a1917e1..9584a3413b3 100644
--- a/doc/administration/environment_variables.md
+++ b/doc/administration/environment_variables.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Environment variables **(FREE SELF)**
diff --git a/doc/administration/external_pipeline_validation.md b/doc/administration/external_pipeline_validation.md
index 9d182a95fc9..2e74cdfa0be 100644
--- a/doc/administration/external_pipeline_validation.md
+++ b/doc/administration/external_pipeline_validation.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # External pipeline validation **(FREE SELF)**
diff --git a/doc/administration/file_hooks.md b/doc/administration/file_hooks.md
index d1b46a9fec1..d47128f9313 100644
--- a/doc/administration/file_hooks.md
+++ b/doc/administration/file_hooks.md
@@ -2,7 +2,6 @@
 stage: Manage
 group: Import and Integrate
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # File hooks **(FREE SELF)**
diff --git a/doc/administration/geo/disaster_recovery/bring_primary_back.md b/doc/administration/geo/disaster_recovery/bring_primary_back.md
index 5f2cbd4d03b..692835b2ace 100644
--- a/doc/administration/geo/disaster_recovery/bring_primary_back.md
+++ b/doc/administration/geo/disaster_recovery/bring_primary_back.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Bring a demoted primary site back online **(PREMIUM SELF)**
diff --git a/doc/administration/geo/disaster_recovery/planned_failover.md b/doc/administration/geo/disaster_recovery/planned_failover.md
index 20346ea82d6..9ecac393f0c 100644
--- a/doc/administration/geo/disaster_recovery/planned_failover.md
+++ b/doc/administration/geo/disaster_recovery/planned_failover.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Disaster recovery for planned failover **(PREMIUM SELF)**
diff --git a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md
index 4b0dbb880cc..e69f891dc51 100644
--- a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md
+++ b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 WARNING:
diff --git a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md
index 845402a1d5f..d39628cff55 100644
--- a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md
+++ b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 WARNING:
diff --git a/doc/administration/geo/glossary.md b/doc/administration/geo/glossary.md
index d0f94ba39f5..635a06a108c 100644
--- a/doc/administration/geo/glossary.md
+++ b/doc/administration/geo/glossary.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 
diff --git a/doc/administration/geo/replication/configuration.md b/doc/administration/geo/replication/configuration.md
index ce63cd98d68..895eaac681c 100644
--- a/doc/administration/geo/replication/configuration.md
+++ b/doc/administration/geo/replication/configuration.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Geo configuration **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/container_registry.md b/doc/administration/geo/replication/container_registry.md
index d8f3d86556e..3add82c28c7 100644
--- a/doc/administration/geo/replication/container_registry.md
+++ b/doc/administration/geo/replication/container_registry.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Container registry for a secondary site **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/datatypes.md b/doc/administration/geo/replication/datatypes.md
index 7a1800c0ae5..0a736da8c8e 100644
--- a/doc/administration/geo/replication/datatypes.md
+++ b/doc/administration/geo/replication/datatypes.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Supported Geo data types **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/disable_geo.md b/doc/administration/geo/replication/disable_geo.md
index 4cbd934e881..0559d75887b 100644
--- a/doc/administration/geo/replication/disable_geo.md
+++ b/doc/administration/geo/replication/disable_geo.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Disabling Geo **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/location_aware_git_url.md b/doc/administration/geo/replication/location_aware_git_url.md
index a3abc945288..0834b347d74 100644
--- a/doc/administration/geo/replication/location_aware_git_url.md
+++ b/doc/administration/geo/replication/location_aware_git_url.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Location-aware Git remote URL with AWS Route53 **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/multiple_servers.md b/doc/administration/geo/replication/multiple_servers.md
index 786030736f6..b80cbb1b3f6 100644
--- a/doc/administration/geo/replication/multiple_servers.md
+++ b/doc/administration/geo/replication/multiple_servers.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Geo for multiple nodes **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/object_storage.md b/doc/administration/geo/replication/object_storage.md
index 11b52ffca42..08ecf5e1b77 100644
--- a/doc/administration/geo/replication/object_storage.md
+++ b/doc/administration/geo/replication/object_storage.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Geo with Object storage **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/remove_geo_site.md b/doc/administration/geo/replication/remove_geo_site.md
index 08ff66ce0da..f4596f06168 100644
--- a/doc/administration/geo/replication/remove_geo_site.md
+++ b/doc/administration/geo/replication/remove_geo_site.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Removing secondary Geo sites **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/security_review.md b/doc/administration/geo/replication/security_review.md
index e099c2b2e9d..851c44501a4 100644
--- a/doc/administration/geo/replication/security_review.md
+++ b/doc/administration/geo/replication/security_review.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Geo security review (Q&A) **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/single_sign_on.md b/doc/administration/geo/replication/single_sign_on.md
index 15e24cdcefb..56f6a52a49d 100644
--- a/doc/administration/geo/replication/single_sign_on.md
+++ b/doc/administration/geo/replication/single_sign_on.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Geo with Single Sign On (SSO) **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/tuning.md b/doc/administration/geo/replication/tuning.md
index f08b53ece50..58eb2f8c2eb 100644
--- a/doc/administration/geo/replication/tuning.md
+++ b/doc/administration/geo/replication/tuning.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Tuning Geo **(PREMIUM SELF)**
diff --git a/doc/administration/geo/replication/upgrading_the_geo_sites.md b/doc/administration/geo/replication/upgrading_the_geo_sites.md
index 6f02ef29f99..b6b2f6b4817 100644
--- a/doc/administration/geo/replication/upgrading_the_geo_sites.md
+++ b/doc/administration/geo/replication/upgrading_the_geo_sites.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Upgrading the Geo sites **(PREMIUM SELF)**
diff --git a/doc/administration/geo/secondary_proxy/index.md b/doc/administration/geo/secondary_proxy/index.md
index bae6ad1371a..87b194765e1 100644
--- a/doc/administration/geo/secondary_proxy/index.md
+++ b/doc/administration/geo/secondary_proxy/index.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Geo proxying for secondary sites **(PREMIUM SELF)**
diff --git a/doc/administration/geo/secondary_proxy/location_aware_external_url.md b/doc/administration/geo/secondary_proxy/location_aware_external_url.md
index ae701bb8482..0a95106732a 100644
--- a/doc/administration/geo/secondary_proxy/location_aware_external_url.md
+++ b/doc/administration/geo/secondary_proxy/location_aware_external_url.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Location-aware public URL **(PREMIUM SELF)**
diff --git a/doc/administration/geo/setup/database.md b/doc/administration/geo/setup/database.md
index 6835231ab70..c75cea2cf47 100644
--- a/doc/administration/geo/setup/database.md
+++ b/doc/administration/geo/setup/database.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Geo database replication **(PREMIUM SELF)**
diff --git a/doc/administration/geo/setup/index.md b/doc/administration/geo/setup/index.md
index e5ab3cea5db..3bb785e61bc 100644
--- a/doc/administration/geo/setup/index.md
+++ b/doc/administration/geo/setup/index.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Geo
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Setting up Geo **(PREMIUM SELF)**
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md
index a2fb3b7eb10..77d683a84b9 100644
--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # GitLab application limits **(FREE SELF)**
diff --git a/doc/administration/integration/diagrams_net.md b/doc/administration/integration/diagrams_net.md
index 356c361fcb8..bc545046c27 100644
--- a/doc/administration/integration/diagrams_net.md
+++ b/doc/administration/integration/diagrams_net.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, howto
 ---
 
 # Diagrams.net **(FREE SELF)**
diff --git a/doc/administration/integration/mailgun.md b/doc/administration/integration/mailgun.md
index aa08a2cbd6b..f19b577200a 100644
--- a/doc/administration/integration/mailgun.md
+++ b/doc/administration/integration/mailgun.md
@@ -2,7 +2,6 @@
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Mailgun **(FREE SELF)**
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md
index 3b7b96d583f..85b5c42a093 100644
--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, howto
 ---
 
 # PlantUML **(FREE SELF)**
diff --git a/doc/administration/invalidate_markdown_cache.md b/doc/administration/invalidate_markdown_cache.md
index 5db08075449..274ccb9694d 100644
--- a/doc/administration/invalidate_markdown_cache.md
+++ b/doc/administration/invalidate_markdown_cache.md
@@ -2,7 +2,6 @@
 stage: Plan
 group: Project Management
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Markdown cache **(FREE SELF)**
diff --git a/doc/administration/issue_closing_pattern.md b/doc/administration/issue_closing_pattern.md
index d179b77530a..c6dc7251e2a 100644
--- a/doc/administration/issue_closing_pattern.md
+++ b/doc/administration/issue_closing_pattern.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Issue closing pattern **(FREE SELF)**
diff --git a/doc/administration/job_logs.md b/doc/administration/job_logs.md
index c8702260ccb..390cfcc369d 100644
--- a/doc/administration/job_logs.md
+++ b/doc/administration/job_logs.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Job logs **(FREE SELF)**
diff --git a/doc/administration/labels.md b/doc/administration/labels.md
index ceb987153c1..5ff9a9930de 100644
--- a/doc/administration/labels.md
+++ b/doc/administration/labels.md
@@ -2,7 +2,6 @@
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Labels administration **(FREE SELF)**
diff --git a/doc/administration/libravatar.md b/doc/administration/libravatar.md
index 899269fb9d1..340fa095472 100644
--- a/doc/administration/libravatar.md
+++ b/doc/administration/libravatar.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Using the Libravatar service with GitLab **(FREE SELF)**
diff --git a/doc/administration/merge_requests_approvals.md b/doc/administration/merge_requests_approvals.md
index 58bcb2620f4..c549efc667c 100644
--- a/doc/administration/merge_requests_approvals.md
+++ b/doc/administration/merge_requests_approvals.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, concepts
 ---
 
 # Merge request approvals **(PREMIUM SELF)**
diff --git a/doc/administration/moderate_users.md b/doc/administration/moderate_users.md
index 57c2b6e0b3a..cbbb3621921 100644
--- a/doc/administration/moderate_users.md
+++ b/doc/administration/moderate_users.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Moderate users (administration) **(FREE SELF)**
diff --git a/doc/administration/nfs.md b/doc/administration/nfs.md
index c3ea1baf954..d588cab70d4 100644
--- a/doc/administration/nfs.md
+++ b/doc/administration/nfs.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Using NFS with GitLab **(FREE SELF)**
diff --git a/doc/administration/postgresql/pgbouncer.md b/doc/administration/postgresql/pgbouncer.md
index 7e46933113b..0a6067c4026 100644
--- a/doc/administration/postgresql/pgbouncer.md
+++ b/doc/administration/postgresql/pgbouncer.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Database
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Working with the bundled PgBouncer service **(FREE SELF)**
diff --git a/doc/administration/postgresql/replication_and_failover.md b/doc/administration/postgresql/replication_and_failover.md
index 5c438fa65b8..7e28e24dc96 100644
--- a/doc/administration/postgresql/replication_and_failover.md
+++ b/doc/administration/postgresql/replication_and_failover.md
@@ -898,6 +898,12 @@ Stopping or restarting the Patroni service on the leader node triggers an automa
 
 ### Manual failover procedure for Patroni
 
+WARNING:
+In GitLab 16.5 and earlier, PgBouncer nodes do not automatically fail over alongside
+Patroni nodes. PgBouncer services
+[must be restarted manually](#pgbouncer-errors-error-running-command-gitlabctlerrorsexecutionerror-and-error-database-gitlabhq_production-is-not-paused)
+for a successful switchover.
+
 While Patroni supports automatic failover, you also have the ability to perform
 a manual one, where you have two slightly different options:
 
@@ -920,7 +926,7 @@ For further details on this subject, see the
 
 #### Geo secondary site considerations
 
-When a Geo secondary site is replicating from a primary site that uses `Patroni` and `PgBouncer`, [replicating through PgBouncer is not supported](https://github.com/pgbouncer/pgbouncer/issues/382#issuecomment-517911529). The secondary *must* replicate directly from the leader node in the `Patroni` cluster. When there is an automatic or manual failover in the `Patroni` cluster, you can manually re-point your secondary site to replicate from the new leader with:
+When a Geo secondary site is replicating from a primary site that uses `Patroni` and `PgBouncer`, [replicating through PgBouncer is not supported](https://github.com/pgbouncer/pgbouncer/issues/382#issuecomment-517911529). The secondary _must_ replicate directly from the leader node in the `Patroni` cluster. When there is an automatic or manual failover in the `Patroni` cluster, you can manually re-point your secondary site to replicate from the new leader with:
 
 ```shell
 sudo gitlab-ctl replicate-geo-database --host=<new_leader_ip> --replication-slot=<slot_name>
@@ -957,7 +963,7 @@ For further details, see [Patroni documentation on this subject](https://patroni
 ### Switching from repmgr to Patroni
 
 WARNING:
-Switching from repmgr to Patroni is straightforward, the other way around is *not*. Rolling back from Patroni to repmgr can be complicated and may involve deletion of data directory. If you need to do that, contact GitLab support.
+Switching from repmgr to Patroni is straightforward, the other way around is _not_. Rolling back from Patroni to repmgr can be complicated and may involve deletion of data directory. If you need to do that, contact GitLab support.
 
 You can switch an exiting database cluster to use Patroni instead of repmgr with the following steps:
 
@@ -1011,7 +1017,7 @@ Here are a few key facts that you must consider before upgrading PostgreSQL:
   GitLab deployment is down for the duration of database upgrade or, at least, as long as your leader
   node is upgraded. This can be **a significant downtime depending on the size of your database**.
 
-- Upgrading PostgreSQL creates a new data directory with a new control data. From the perspective of Petroni, this is a new cluster that needs to be bootstrapped again. Therefore, as part of the upgrade procedure, the cluster state (stored in Consul) is wiped out. After the upgrade is complete, Patroni bootstraps a new cluster. **This changes your _cluster ID_**.
+- Upgrading PostgreSQL creates a new data directory with a new control data. From the perspective of Patroni, this is a new cluster that needs to be bootstrapped again. Therefore, as part of the upgrade procedure, the cluster state (stored in Consul) is wiped out. After the upgrade is complete, Patroni bootstraps a new cluster. **This changes your _cluster ID_**.
 
 - The procedures for upgrading leader and replicas are not the same. That is why it is important to use the right procedure on each node.
 
@@ -1311,9 +1317,11 @@ postgresql['trust_auth_cidr_addresses'] = %w(123.123.123.123/32 <other_cidrs>)
 
 ### PgBouncer errors `Error running command: GitlabCtl::Errors::ExecutionError` and `ERROR: database gitlabhq_production is not paused`
 
-In versions of GitLab prior to 16.5.0, the automatic failover of PgBouncer does not
-happen after a Patroni switchover. GitLab failed to detect a paused database, then
-attempted to `RESUME` a not-paused database:
+Due to a [known issue](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8166) that
+affects versions of GitLab prior to 16.5.0, the automatic failover of PgBouncer nodes does not
+happen after a [Patroni switchover](#manual-failover-procedure-for-patroni). In this
+example, GitLab failed to detect a paused database, then attempted to `RESUME` a
+not-paused database:
 
 ```plaintext
 INFO -- : Running: gitlab-ctl pgb-notify --pg-database gitlabhq_production --newhost database7.example.com --user pgbouncer --hostuser gitlab-consul
@@ -1321,6 +1329,13 @@ ERROR -- : STDERR: Error running command: GitlabCtl::Errors::ExecutionError
 ERROR -- : STDERR: ERROR: ERROR:  database gitlabhq_production is not paused
 ```
 
+To ensure a [Patroni switchover](#manual-failover-procedure-for-patroni) succeeds,
+you must manually restart the PgBouncer service on all PgBouncer nodes with this command:
+
+```shell
+gitlab-ctl restart pgbouncer
+```
+
 ### Reinitialize a replica
 
 If a replica cannot start or rejoin the cluster, or when it lags behind and cannot catch up, it might be necessary to reinitialize the replica:
diff --git a/doc/administration/redis/index.md b/doc/administration/redis/index.md
index ad5aca37830..2d06df116b2 100644
--- a/doc/administration/redis/index.md
+++ b/doc/administration/redis/index.md
@@ -1,5 +1,4 @@
 ---
-type: index
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/redis/replication_and_failover.md b/doc/administration/redis/replication_and_failover.md
index 82b9a33d2c6..113398c1ff5 100644
--- a/doc/administration/redis/replication_and_failover.md
+++ b/doc/administration/redis/replication_and_failover.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/redis/replication_and_failover_external.md b/doc/administration/redis/replication_and_failover_external.md
index cfe5a3157d9..71a239d78ff 100644
--- a/doc/administration/redis/replication_and_failover_external.md
+++ b/doc/administration/redis/replication_and_failover_external.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/redis/standalone.md b/doc/administration/redis/standalone.md
index b9d00b92f95..f0b48f3b5a3 100644
--- a/doc/administration/redis/standalone.md
+++ b/doc/administration/redis/standalone.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/redis/troubleshooting.md b/doc/administration/redis/troubleshooting.md
index 5f0be709d78..1e226aad173 100644
--- a/doc/administration/redis/troubleshooting.md
+++ b/doc/administration/redis/troubleshooting.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md
index a1d68abc874..47231d6dabc 100644
--- a/doc/administration/reference_architectures/index.md
+++ b/doc/administration/reference_architectures/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, concepts
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/review_abuse_reports.md b/doc/administration/review_abuse_reports.md
index ac31f233bbd..e9cd962b316 100644
--- a/doc/administration/review_abuse_reports.md
+++ b/doc/administration/review_abuse_reports.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Anti-Abuse
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Review abuse reports **(FREE SELF)**
diff --git a/doc/administration/review_spam_logs.md b/doc/administration/review_spam_logs.md
index ff39c024a17..f716ec2098d 100644
--- a/doc/administration/review_spam_logs.md
+++ b/doc/administration/review_spam_logs.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Anti-Abuse
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Review spam logs **(FREE SELF)**
diff --git a/doc/administration/settings/account_and_limit_settings.md b/doc/administration/settings/account_and_limit_settings.md
index b378cd08194..05257a1a866 100644
--- a/doc/administration/settings/account_and_limit_settings.md
+++ b/doc/administration/settings/account_and_limit_settings.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Account and limit settings **(FREE SELF)**
diff --git a/doc/administration/settings/continuous_integration.md b/doc/administration/settings/continuous_integration.md
index 552dedbedb0..be66d67dba5 100644
--- a/doc/administration/settings/continuous_integration.md
+++ b/doc/administration/settings/continuous_integration.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Continuous Integration and Deployment Admin Area settings **(FREE SELF)**
diff --git a/doc/administration/settings/deprecated_api_rate_limits.md b/doc/administration/settings/deprecated_api_rate_limits.md
index b8bac82bc31..d493f275003 100644
--- a/doc/administration/settings/deprecated_api_rate_limits.md
+++ b/doc/administration/settings/deprecated_api_rate_limits.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Deprecated API rate limits **(FREE SELF)**
diff --git a/doc/administration/settings/email.md b/doc/administration/settings/email.md
index 6680c5aa495..a5e3f3e4a47 100644
--- a/doc/administration/settings/email.md
+++ b/doc/administration/settings/email.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/files_api_rate_limits.md b/doc/administration/settings/files_api_rate_limits.md
index 0d9738dc4c1..e1a7f2e8fed 100644
--- a/doc/administration/settings/files_api_rate_limits.md
+++ b/doc/administration/settings/files_api_rate_limits.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Rate limits on Repository files API **(FREE SELF)**
diff --git a/doc/administration/settings/git_lfs_rate_limits.md b/doc/administration/settings/git_lfs_rate_limits.md
index ac0fcfa7936..2c27bb8a1af 100644
--- a/doc/administration/settings/git_lfs_rate_limits.md
+++ b/doc/administration/settings/git_lfs_rate_limits.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Rate limits on Git LFS **(FREE SELF)**
diff --git a/doc/administration/settings/help_page.md b/doc/administration/settings/help_page.md
index 592a3d68fde..426e4a30153 100644
--- a/doc/administration/settings/help_page.md
+++ b/doc/administration/settings/help_page.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Customize the Help and sign-in page messages **(FREE SELF)**
diff --git a/doc/administration/settings/import_and_export_settings.md b/doc/administration/settings/import_and_export_settings.md
index 9cdd7ca782a..7b5f01240b7 100644
--- a/doc/administration/settings/import_and_export_settings.md
+++ b/doc/administration/settings/import_and_export_settings.md
@@ -2,7 +2,6 @@
 stage: Manage
 group: Import and Integrate
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Import and export settings **(FREE SELF)**
diff --git a/doc/administration/settings/incident_management_rate_limits.md b/doc/administration/settings/incident_management_rate_limits.md
index 7ed455c01ee..77c2562158b 100644
--- a/doc/administration/settings/incident_management_rate_limits.md
+++ b/doc/administration/settings/incident_management_rate_limits.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Service Management
 group: Respond
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/index.md b/doc/administration/settings/index.md
index 5988b2d15a8..0f76d039bed 100644
--- a/doc/administration/settings/index.md
+++ b/doc/administration/settings/index.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index
 ---
 
 # Update your Admin Area settings **(FREE SELF)**
diff --git a/doc/administration/settings/instance_template_repository.md b/doc/administration/settings/instance_template_repository.md
index 55e4591358e..4e63404988e 100644
--- a/doc/administration/settings/instance_template_repository.md
+++ b/doc/administration/settings/instance_template_repository.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Instance template repository **(PREMIUM SELF)**
diff --git a/doc/administration/settings/localization.md b/doc/administration/settings/localization.md
index d3666aea491..dd895ff7a71 100644
--- a/doc/administration/settings/localization.md
+++ b/doc/administration/settings/localization.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index
 ---
 
 # Localization **(FREE SELF)**
diff --git a/doc/administration/settings/package_registry_rate_limits.md b/doc/administration/settings/package_registry_rate_limits.md
index c23bdcfa9f7..f8dacfb741e 100644
--- a/doc/administration/settings/package_registry_rate_limits.md
+++ b/doc/administration/settings/package_registry_rate_limits.md
@@ -2,7 +2,6 @@
 stage: Package
 group: Package Registry
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Package registry rate limits **(FREE SELF)**
diff --git a/doc/administration/settings/protected_paths.md b/doc/administration/settings/protected_paths.md
index ce1e6c6d66c..daf0c8fee40 100644
--- a/doc/administration/settings/protected_paths.md
+++ b/doc/administration/settings/protected_paths.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Protected paths **(FREE SELF)**
diff --git a/doc/administration/settings/push_event_activities_limit.md b/doc/administration/settings/push_event_activities_limit.md
index 55b70dcd3f2..2e8100ec4b8 100644
--- a/doc/administration/settings/push_event_activities_limit.md
+++ b/doc/administration/settings/push_event_activities_limit.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Push event activities limit and bulk push events **(FREE SELF)**
diff --git a/doc/administration/settings/rate_limit_on_issues_creation.md b/doc/administration/settings/rate_limit_on_issues_creation.md
index f8bba5737d9..c85c3b642ea 100644
--- a/doc/administration/settings/rate_limit_on_issues_creation.md
+++ b/doc/administration/settings/rate_limit_on_issues_creation.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/rate_limit_on_notes_creation.md b/doc/administration/settings/rate_limit_on_notes_creation.md
index a5bdb4cde8f..be723fd7f9a 100644
--- a/doc/administration/settings/rate_limit_on_notes_creation.md
+++ b/doc/administration/settings/rate_limit_on_notes_creation.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/rate_limit_on_pipelines_creation.md b/doc/administration/settings/rate_limit_on_pipelines_creation.md
index 45949b300b8..90061533dbd 100644
--- a/doc/administration/settings/rate_limit_on_pipelines_creation.md
+++ b/doc/administration/settings/rate_limit_on_pipelines_creation.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/rate_limit_on_projects_api.md b/doc/administration/settings/rate_limit_on_projects_api.md
index bbb7d1fec61..555b090fc1f 100644
--- a/doc/administration/settings/rate_limit_on_projects_api.md
+++ b/doc/administration/settings/rate_limit_on_projects_api.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Data Stores
 group: Tenant Scale
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/rate_limit_on_users_api.md b/doc/administration/settings/rate_limit_on_users_api.md
index c56f56baee4..60c4305693c 100644
--- a/doc/administration/settings/rate_limit_on_users_api.md
+++ b/doc/administration/settings/rate_limit_on_users_api.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/rate_limits.md b/doc/administration/settings/rate_limits.md
index b6efb1e302f..b06daf352d8 100644
--- a/doc/administration/settings/rate_limits.md
+++ b/doc/administration/settings/rate_limits.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index
 ---
 
 # Rate limits
diff --git a/doc/administration/settings/rate_limits_on_git_ssh_operations.md b/doc/administration/settings/rate_limits_on_git_ssh_operations.md
index 42cb834b510..4219f6cd665 100644
--- a/doc/administration/settings/rate_limits_on_git_ssh_operations.md
+++ b/doc/administration/settings/rate_limits_on_git_ssh_operations.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Rate limits on Git SSH operations **(FREE SELF)**
diff --git a/doc/administration/settings/rate_limits_on_raw_endpoints.md b/doc/administration/settings/rate_limits_on_raw_endpoints.md
index be81963bb2b..05a60871158 100644
--- a/doc/administration/settings/rate_limits_on_raw_endpoints.md
+++ b/doc/administration/settings/rate_limits_on_raw_endpoints.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Rate limits on raw endpoints **(FREE SELF)**
diff --git a/doc/administration/settings/scim_setup.md b/doc/administration/settings/scim_setup.md
index a08ffe0a682..0cd012caec5 100644
--- a/doc/administration/settings/scim_setup.md
+++ b/doc/administration/settings/scim_setup.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/administration/settings/security_and_compliance.md b/doc/administration/settings/security_and_compliance.md
index e3708912b45..0aae19811d2 100644
--- a/doc/administration/settings/security_and_compliance.md
+++ b/doc/administration/settings/security_and_compliance.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Composition Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Security and Compliance Admin Area settings **(ULTIMATE SELF)**
diff --git a/doc/administration/settings/sidekiq_job_limits.md b/doc/administration/settings/sidekiq_job_limits.md
index 32c1cc25276..ae7fa54992f 100644
--- a/doc/administration/settings/sidekiq_job_limits.md
+++ b/doc/administration/settings/sidekiq_job_limits.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Sidekiq job size limits **(FREE SELF)**
diff --git a/doc/administration/settings/sign_up_restrictions.md b/doc/administration/settings/sign_up_restrictions.md
index d97f1af7af5..aba793de234 100644
--- a/doc/administration/settings/sign_up_restrictions.md
+++ b/doc/administration/settings/sign_up_restrictions.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Sign-up restrictions **(FREE SELF)**
diff --git a/doc/administration/settings/terms.md b/doc/administration/settings/terms.md
index 58f86722863..cf806b6186b 100644
--- a/doc/administration/settings/terms.md
+++ b/doc/administration/settings/terms.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Terms of Service and Privacy Policy **(FREE SELF)**
diff --git a/doc/administration/settings/terraform_limits.md b/doc/administration/settings/terraform_limits.md
index 873c4a1ed9c..be398403922 100644
--- a/doc/administration/settings/terraform_limits.md
+++ b/doc/administration/settings/terraform_limits.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Terraform limits **(FREE SELF)**
diff --git a/doc/administration/settings/third_party_offers.md b/doc/administration/settings/third_party_offers.md
index 65fa816ed33..5ffe58e835b 100644
--- a/doc/administration/settings/third_party_offers.md
+++ b/doc/administration/settings/third_party_offers.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Tenant Scale
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Customer experience improvement and third-party offers **(FREE SELF)**
diff --git a/doc/administration/settings/user_and_ip_rate_limits.md b/doc/administration/settings/user_and_ip_rate_limits.md
index e1283208f57..cfc45ae29eb 100644
--- a/doc/administration/settings/user_and_ip_rate_limits.md
+++ b/doc/administration/settings/user_and_ip_rate_limits.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # User and IP rate limits **(FREE SELF)**
diff --git a/doc/administration/settings/visibility_and_access_controls.md b/doc/administration/settings/visibility_and_access_controls.md
index c00fd59afbc..9e2f5d1c178 100644
--- a/doc/administration/settings/visibility_and_access_controls.md
+++ b/doc/administration/settings/visibility_and_access_controls.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Control access and visibility **(FREE SELF)**
diff --git a/doc/administration/snippets/index.md b/doc/administration/snippets/index.md
index b59432b0b9e..17a5dbb1492 100644
--- a/doc/administration/snippets/index.md
+++ b/doc/administration/snippets/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
diff --git a/doc/administration/static_objects_external_storage.md b/doc/administration/static_objects_external_storage.md
index 6c353509ad0..502232db6e7 100644
--- a/doc/administration/static_objects_external_storage.md
+++ b/doc/administration/static_objects_external_storage.md
@@ -2,7 +2,6 @@
 stage: Create
 group: IDE
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # External storage for static objects **(FREE SELF)**
diff --git a/doc/administration/system_hooks.md b/doc/administration/system_hooks.md
index ca4039a4f7c..fe062730751 100644
--- a/doc/administration/system_hooks.md
+++ b/doc/administration/system_hooks.md
@@ -2,7 +2,6 @@
 stage: Manage
 group: Import and Integrate
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # System hooks **(FREE SELF)**
diff --git a/doc/administration/troubleshooting/diagnostics_tools.md b/doc/administration/troubleshooting/diagnostics_tools.md
index 32b07d8c4af..6dc8d0d6d7f 100644
--- a/doc/administration/troubleshooting/diagnostics_tools.md
+++ b/doc/administration/troubleshooting/diagnostics_tools.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Diagnostics tools **(FREE SELF)**
diff --git a/doc/administration/troubleshooting/linux_cheat_sheet.md b/doc/administration/troubleshooting/linux_cheat_sheet.md
index ae0ef44f0b1..528104f47e1 100644
--- a/doc/administration/troubleshooting/linux_cheat_sheet.md
+++ b/doc/administration/troubleshooting/linux_cheat_sheet.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Linux cheat sheet **(FREE SELF)**
diff --git a/doc/administration/troubleshooting/test_environments.md b/doc/administration/troubleshooting/test_environments.md
index 63ccbce9480..aa4d05c252c 100644
--- a/doc/administration/troubleshooting/test_environments.md
+++ b/doc/administration/troubleshooting/test_environments.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Apps for a testing environment **(FREE SELF)**
diff --git a/doc/administration/wikis/index.md b/doc/administration/wikis/index.md
index fd7c1825e8d..6fd569cbb3a 100644
--- a/doc/administration/wikis/index.md
+++ b/doc/administration/wikis/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Plan
 group: Knowledge
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/api/branches.md b/doc/api/branches.md
index cd0266a05f1..e6a0c015d80 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Branches API **(FREE ALL)**
diff --git a/doc/api/deployments.md b/doc/api/deployments.md
index 2dbc4bd0831..7432c81536d 100644
--- a/doc/api/deployments.md
+++ b/doc/api/deployments.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Deployments API **(FREE ALL)**
diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index 63794030673..209d996a4ce 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, api
 ---
 
 # Discussions API **(FREE ALL)**
diff --git a/doc/api/dora/metrics.md b/doc/api/dora/metrics.md
index 1af21e84f5e..f1fb18fbba6 100644
--- a/doc/api/dora/metrics.md
+++ b/doc/api/dora/metrics.md
@@ -2,7 +2,6 @@
 stage: Plan
 group: Optimize
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, api
 ---
 
 # DevOps Research and Assessment (DORA) key metrics API **(ULTIMATE ALL)**
diff --git a/doc/api/environments.md b/doc/api/environments.md
index 06f75381000..acd9366ccbd 100644
--- a/doc/api/environments.md
+++ b/doc/api/environments.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Environments API **(FREE ALL)**
diff --git a/doc/api/freeze_periods.md b/doc/api/freeze_periods.md
index 55a083ae9a7..936062bf4c1 100644
--- a/doc/api/freeze_periods.md
+++ b/doc/api/freeze_periods.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Freeze Periods API **(FREE ALL)**
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index d265a1cfeac..d6d901f9532 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -28572,6 +28572,17 @@ Represents a generic widget definition.
 | ---- | ---- | ----------- |
 | <a id="workitemwidgetdefinitiongenerictype"></a>`type` | [`WorkItemWidgetType!`](#workitemwidgettype) | Widget type. |
 
+### `WorkItemWidgetDefinitionHierarchy`
+
+Represents a hierarchy widget definition.
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="workitemwidgetdefinitionhierarchyallowedchildtypes"></a>`allowedChildTypes` | [`WorkItemTypeConnection`](#workitemtypeconnection) | Allowed child types for the work item type. (see [Connections](#connections)) |
+| <a id="workitemwidgetdefinitionhierarchytype"></a>`type` | [`WorkItemWidgetType!`](#workitemwidgettype) | Widget type. |
+
 ### `WorkItemWidgetDefinitionLabels`
 
 Represents a labels widget definition.
@@ -33320,6 +33331,7 @@ Implementations:
 
 - [`WorkItemWidgetDefinitionAssignees`](#workitemwidgetdefinitionassignees)
 - [`WorkItemWidgetDefinitionGeneric`](#workitemwidgetdefinitiongeneric)
+- [`WorkItemWidgetDefinitionHierarchy`](#workitemwidgetdefinitionhierarchy)
 - [`WorkItemWidgetDefinitionLabels`](#workitemwidgetdefinitionlabels)
 
 ##### Fields
diff --git a/doc/api/group_milestones.md b/doc/api/group_milestones.md
index 92664376365..6e8cd23a004 100644
--- a/doc/api/group_milestones.md
+++ b/doc/api/group_milestones.md
@@ -30,11 +30,12 @@ Parameters:
 | Attribute                   | Type   | Required | Description |
 | ---------                   | ------ | -------- | ----------- |
 | `id`                        | integer/string | yes | The ID or [URL-encoded path of the group](rest/index.md#namespaced-path-encoding) owned by the authenticated user |
-| `iids[]`                    | integer array | no | Return only the milestones having the given `iid` (Note: ignored if `include_parent_milestones` is set as `true`) |
+| `iids[]`                    | integer array | no | Return only the milestones having the given `iid`. Ignored if `include_ancestors` is `true`. |
 | `state`                     | string | no | Return only `active` or `closed` milestones |
 | `title`                     | string | no | Return only the milestones having the given `title` |
 | `search`                    | string | no | Return only milestones with a title or description matching the provided string |
-| `include_parent_milestones` | boolean | no | Include milestones from parent group and its ancestors. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196066) in GitLab 13.4 |
+| `include_parent_milestones` | boolean | no | [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/433298) in GitLab 16.7. Use `include_ancestors` instead. |
+| `include_ancestors`         | boolean | no | Include milestones from all parent groups. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196066) in GitLab 13.4. |
 | `updated_before`            | datetime | no | Return only milestones updated before the given datetime. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). Introduced in GitLab 15.10 |
 | `updated_after`             | datetime | no | Return only milestones updated after the given datetime. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). Introduced in GitLab 15.10 |
 
diff --git a/doc/api/group_protected_environments.md b/doc/api/group_protected_environments.md
index 3010c9794b6..d76aecedcc7 100644
--- a/doc/api/group_protected_environments.md
+++ b/doc/api/group_protected_environments.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Group-level protected environments API **(PREMIUM ALL)**
diff --git a/doc/api/group_repository_storage_moves.md b/doc/api/group_repository_storage_moves.md
index 6f0e0ee0b74..909cd6a26ae 100644
--- a/doc/api/group_repository_storage_moves.md
+++ b/doc/api/group_repository_storage_moves.md
@@ -2,7 +2,6 @@
 stage: Create
 group: IDE
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Group repository storage moves API **(PREMIUM SELF)**
diff --git a/doc/api/group_wikis.md b/doc/api/group_wikis.md
index a3b8fec9248..e2dbb540096 100644
--- a/doc/api/group_wikis.md
+++ b/doc/api/group_wikis.md
@@ -2,7 +2,6 @@
 stage: Plan
 group: Knowledge
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Group wikis API **(PREMIUM ALL)**
diff --git a/doc/api/keys.md b/doc/api/keys.md
index 571c193c1d3..445fafe63e7 100644
--- a/doc/api/keys.md
+++ b/doc/api/keys.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Keys API **(FREE ALL)**
diff --git a/doc/api/merge_request_context_commits.md b/doc/api/merge_request_context_commits.md
index b277b9147b5..dd02b59782d 100644
--- a/doc/api/merge_request_context_commits.md
+++ b/doc/api/merge_request_context_commits.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Merge request context commits API **(FREE ALL)**
diff --git a/doc/api/metrics_dashboard_annotations.md b/doc/api/metrics_dashboard_annotations.md
index 56bd1066e2e..74d8ec3062c 100644
--- a/doc/api/metrics_dashboard_annotations.md
+++ b/doc/api/metrics_dashboard_annotations.md
@@ -2,7 +2,6 @@
 stage: Service Management
 group: Respond
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Dashboard annotations API **(FREE ALL)**
diff --git a/doc/api/metrics_user_starred_dashboards.md b/doc/api/metrics_user_starred_dashboards.md
index 2c358e080c2..20dd98c9a7d 100644
--- a/doc/api/metrics_user_starred_dashboards.md
+++ b/doc/api/metrics_user_starred_dashboards.md
@@ -2,7 +2,6 @@
 stage: Service Management
 group: Respond
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # User-starred metrics dashboards API **(FREE ALL)**
diff --git a/doc/api/milestones.md b/doc/api/milestones.md
index 38c11216e4f..373c7ad18cf 100644
--- a/doc/api/milestones.md
+++ b/doc/api/milestones.md
@@ -30,11 +30,12 @@ Parameters:
 | Attribute                         | Type   | Required | Description |
 | ----------------------------      | ------ | -------- | ----------- |
 | `id`                              | integer or string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding) owned by the authenticated user |
-| `iids[]`                          | integer array | no | Return only the milestones having the given `iid` (Note: ignored if `include_parent_milestones` is set as `true`) |
+| `iids[]`                          | integer array | no | Return only the milestones having the given `iid`. Ignored if `include_ancestors` is `true`.  |
 | `state`                           | string | no | Return only `active` or `closed` milestones |
 | `title`                           | string | no | Return only the milestones having the given `title` |
 | `search`                          | string | no | Return only milestones with a title or description matching the provided string |
-| `include_parent_milestones`       | boolean | no | Include group milestones from parent group and its ancestors. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196066) in GitLab 13.4 |
+| `include_parent_milestones`       | boolean | no | [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/433298) in GitLab 16.7. Use `include_ancestors` instead. |
+| `include_ancestors`               | boolean | no | Include milestones from all parent groups. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196066) in GitLab 13.4. |
 | `updated_before`                  | datetime | no | Return only milestones updated before the given datetime. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). Introduced in GitLab 15.10 |
 | `updated_after`                   | datetime | no | Return only milestones updated after the given datetime. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). Introduced in GitLab 15.10 |
 
diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md
index b8a574e85e4..508b23ec852 100644
--- a/doc/api/oauth2.md
+++ b/doc/api/oauth2.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/api/project_aliases.md b/doc/api/project_aliases.md
index b8ca5c2674c..a9303a7b883 100644
--- a/doc/api/project_aliases.md
+++ b/doc/api/project_aliases.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Project Aliases API **(PREMIUM SELF)**
diff --git a/doc/api/project_level_variables.md b/doc/api/project_level_variables.md
index 7cc10816f5e..64dc52a8599 100644
--- a/doc/api/project_level_variables.md
+++ b/doc/api/project_level_variables.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, api
 ---
 
 # Project-level CI/CD variables API **(FREE ALL)**
diff --git a/doc/api/project_statistics.md b/doc/api/project_statistics.md
index adc977d7d73..202dea67254 100644
--- a/doc/api/project_statistics.md
+++ b/doc/api/project_statistics.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Project statistics API **(FREE ALL)**
diff --git a/doc/api/project_vulnerabilities.md b/doc/api/project_vulnerabilities.md
index 677ec2afc84..0828925cfea 100644
--- a/doc/api/project_vulnerabilities.md
+++ b/doc/api/project_vulnerabilities.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Threat Insights
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Project Vulnerabilities API **(ULTIMATE ALL)**
diff --git a/doc/api/protected_environments.md b/doc/api/protected_environments.md
index 8b502d78d0d..c49eba8e301 100644
--- a/doc/api/protected_environments.md
+++ b/doc/api/protected_environments.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Protected environments API **(PREMIUM ALL)**
diff --git a/doc/api/remote_mirrors.md b/doc/api/remote_mirrors.md
index 4808c317dc4..54bf5492ea6 100644
--- a/doc/api/remote_mirrors.md
+++ b/doc/api/remote_mirrors.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Project remote mirrors API **(FREE ALL)**
diff --git a/doc/api/repositories.md b/doc/api/repositories.md
index e17044f1c38..53664e43f29 100644
--- a/doc/api/repositories.md
+++ b/doc/api/repositories.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Repositories API **(FREE ALL)**
diff --git a/doc/api/repository_files.md b/doc/api/repository_files.md
index cc0b4ea1972..f4b8fd43484 100644
--- a/doc/api/repository_files.md
+++ b/doc/api/repository_files.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Repository files API **(FREE ALL)**
diff --git a/doc/api/scim.md b/doc/api/scim.md
index f3be1a479a8..1c05859bfcd 100644
--- a/doc/api/scim.md
+++ b/doc/api/scim.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/api/secure_files.md b/doc/api/secure_files.md
index 27aeaf2cd5b..33a56441d66 100644
--- a/doc/api/secure_files.md
+++ b/doc/api/secure_files.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, api
 ---
 
 # Project-level Secure Files API **(FREE ALL)**
diff --git a/doc/api/snippet_repository_storage_moves.md b/doc/api/snippet_repository_storage_moves.md
index 37bbe6bbf49..3ef73140a73 100644
--- a/doc/api/snippet_repository_storage_moves.md
+++ b/doc/api/snippet_repository_storage_moves.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Snippet repository storage moves API **(FREE SELF)**
diff --git a/doc/api/status_checks.md b/doc/api/status_checks.md
index 70a1acdb939..bd06c3ad566 100644
--- a/doc/api/status_checks.md
+++ b/doc/api/status_checks.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Compliance
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # External Status Checks API **(ULTIMATE ALL)**
diff --git a/doc/api/suggestions.md b/doc/api/suggestions.md
index 3dd3ef3712c..45d5abae210 100644
--- a/doc/api/suggestions.md
+++ b/doc/api/suggestions.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Suggest Changes API **(FREE ALL)**
diff --git a/doc/api/templates/dockerfiles.md b/doc/api/templates/dockerfiles.md
index 0f20d38d9e8..6105f0a02cc 100644
--- a/doc/api/templates/dockerfiles.md
+++ b/doc/api/templates/dockerfiles.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Dockerfiles API **(FREE ALL)**
diff --git a/doc/api/templates/gitignores.md b/doc/api/templates/gitignores.md
index d22b9373ccd..73576bd96ed 100644
--- a/doc/api/templates/gitignores.md
+++ b/doc/api/templates/gitignores.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # .gitignore API **(FREE ALL)**
diff --git a/doc/api/templates/gitlab_ci_ymls.md b/doc/api/templates/gitlab_ci_ymls.md
index d436e6385a9..f2de00c8110 100644
--- a/doc/api/templates/gitlab_ci_ymls.md
+++ b/doc/api/templates/gitlab_ci_ymls.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # GitLab CI YAML API **(FREE ALL)**
diff --git a/doc/api/templates/licenses.md b/doc/api/templates/licenses.md
index fc9af40a963..d410406edd0 100644
--- a/doc/api/templates/licenses.md
+++ b/doc/api/templates/licenses.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Composition Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Licenses API **(FREE ALL)**
diff --git a/doc/api/usage_data.md b/doc/api/usage_data.md
index e62186d4b26..e5b74534120 100644
--- a/doc/api/usage_data.md
+++ b/doc/api/usage_data.md
@@ -2,7 +2,6 @@
 stage: Monitor
 group: Analytics Instrumentation
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, api
 ---
 
 # Service Data API **(FREE SELF)**
diff --git a/doc/architecture/blueprints/new_diffs/index.md b/doc/architecture/blueprints/new_diffs/index.md
index d9dab14e683..cfada28284c 100644
--- a/doc/architecture/blueprints/new_diffs/index.md
+++ b/doc/architecture/blueprints/new_diffs/index.md
@@ -207,10 +207,25 @@ Some of the visual indicators that require alternatives for assistive technology
 - `+` or red highlighting to be read as `added`
 - `-` or green highlighting to be read as `removed`
 
+## Alternative Solutions
+
+<!--
+It might be a good idea to include a list of alternative solutions or paths considered, although it is not required. Include pros and cons for
+each alternative solution/path.
+
+"Do nothing" and its pros and cons could be included in the list too.
+-->
+
+## Proposed changes
+
+These changes (indicated by an arbitrary name like "Design A") suggest a proposed final path forward for this blueprint, but have not yet been accepted as the authoritative content.
+
+- Mark the highest hierarchical heading with your design name. If you are changing multiple headings at the same level, make sure to mark them all with the same name. This will create a high-level table of contents that is easier to reason about.
+
 ### Front end (Design A)
 
 NOTE:
-This draft proposal suggests one potential front end architecture which may not be chosen.
+This draft proposal suggests one potential front end architecture which may not be chosen. It is not necessarily mutually exclusive with other proposed designs.
 
 Ideally, we would meet our definition of done and our accountability metrics on our first try.
 We also need to continue to stay within those boundaries as we move forward. To ensure this,
@@ -233,6 +248,9 @@ we need to design an application architecture that:
 
 #### High-level implementation
 
+NOTE:
+This draft proposal suggests one potential front end architecture which may not be chosen. It is not necessarily mutually exclusive with other proposed designs.
+
 (See [New Diffs: Technical Architecture Design](https://gitlab.com/gitlab-org/gitlab/-/issues/431276) for nicer visuals of this chart)
 
 ```mermaid
@@ -313,11 +331,17 @@ end
     Network --> Socket --> API --> unk
 ```
 
-## Alternative Solutions
+### Metrics (Design B)
 
-<!--
-It might be a good idea to include a list of alternative solutions or paths considered, although it is not required. Include pros and cons for
-each alternative solution/path.
+NOTE:
+This draft proposal suggests one potential front end architecture which may not be chosen. It is not necessarily mutually exclusive with other proposed designs.
 
-"Do nothing" and its pros and cons could be included in the list too.
--->
+1. _(no change)_
+1. _(no change)_
+1. _(no change)_
+1. _(no change)_
+1. _(no change)_
+1. When rendering diffs on the server:
+    - The total server-rendered count should not exceed 5 files.
+    - It should not try to render empty diffs. (It should render at least 1 file.)
+    - The total lines of diff code rendered should not exceed 1000 lines.
diff --git a/doc/ci/chatops/index.md b/doc/ci/chatops/index.md
index 0fbcbae4cf0..195a8bd984c 100644
--- a/doc/ci/chatops/index.md
+++ b/doc/ci/chatops/index.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, concepts, howto
 ---
 
 # GitLab ChatOps **(FREE ALL)**
diff --git a/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md b/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md
index afbeff412a9..7b9cbf711f8 100644
--- a/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md
+++ b/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Using GitLab CI/CD with a Bitbucket Cloud repository **(PREMIUM ALL)**
diff --git a/doc/ci/ci_cd_for_external_repos/github_integration.md b/doc/ci/ci_cd_for_external_repos/github_integration.md
index 0cb5ab68efd..2c7b4857d2c 100644
--- a/doc/ci/ci_cd_for_external_repos/github_integration.md
+++ b/doc/ci/ci_cd_for_external_repos/github_integration.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Using GitLab CI/CD with a GitHub repository **(PREMIUM ALL)**
diff --git a/doc/ci/ci_cd_for_external_repos/index.md b/doc/ci/ci_cd_for_external_repos/index.md
index 3460b014ec6..a8731de85f8 100644
--- a/doc/ci/ci_cd_for_external_repos/index.md
+++ b/doc/ci/ci_cd_for_external_repos/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, howto
 ---
 
 # GitLab CI/CD for external repositories **(PREMIUM ALL)**
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index 0d601e2a4a8..eb434df69f3 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Deploy to AWS from GitLab CI/CD **(FREE ALL)**
diff --git a/doc/ci/debugging.md b/doc/ci/debugging.md
index 359d4960ffe..9adf393f9e5 100644
--- a/doc/ci/debugging.md
+++ b/doc/ci/debugging.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Debugging CI/CD pipelines **(FREE ALL)**
diff --git a/doc/ci/directed_acyclic_graph/index.md b/doc/ci/directed_acyclic_graph/index.md
index a1163a3acff..509bfea2715 100644
--- a/doc/ci/directed_acyclic_graph/index.md
+++ b/doc/ci/directed_acyclic_graph/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Directed Acyclic Graph **(FREE ALL)**
diff --git a/doc/ci/docker/authenticate_registry.md b/doc/ci/docker/authenticate_registry.md
index 28edb5140dd..ecc6f58a678 100644
--- a/doc/ci/docker/authenticate_registry.md
+++ b/doc/ci/docker/authenticate_registry.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Authenticate with registry in Docker-in-Docker
diff --git a/doc/ci/docker/buildah_rootless_tutorial.md b/doc/ci/docker/buildah_rootless_tutorial.md
index 9597d22f92a..9d843fb7a15 100644
--- a/doc/ci/docker/buildah_rootless_tutorial.md
+++ b/doc/ci/docker/buildah_rootless_tutorial.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Tutorial: Use Buildah in a rootless container with GitLab Runner Operator on OpenShift **(FREE)**
diff --git a/doc/ci/docker/docker_layer_caching.md b/doc/ci/docker/docker_layer_caching.md
index b34b58ce964..079ec57eb0f 100644
--- a/doc/ci/docker/docker_layer_caching.md
+++ b/doc/ci/docker/docker_layer_caching.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Make Docker-in-Docker builds faster with Docker layer caching
diff --git a/doc/ci/docker/index.md b/doc/ci/docker/index.md
index d1dff953a5c..eacff6ff2df 100644
--- a/doc/ci/docker/index.md
+++ b/doc/ci/docker/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index
 ---
 
 # Docker integration **(FREE ALL)**
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index a2ef28bdaa0..bfb121a4465 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Use Docker to build Docker images **(FREE ALL)**
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 06baab38e41..654150c4eec 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Run your CI/CD jobs in Docker containers **(FREE ALL)**
diff --git a/doc/ci/docker/using_kaniko.md b/doc/ci/docker/using_kaniko.md
index d0a437b6f62..44aa8beb130 100644
--- a/doc/ci/docker/using_kaniko.md
+++ b/doc/ci/docker/using_kaniko.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Use kaniko to build Docker images **(FREE ALL)**
diff --git a/doc/ci/environments/configure_kubernetes_deployments.md b/doc/ci/environments/configure_kubernetes_deployments.md
index e618aae7cae..7a964179584 100644
--- a/doc/ci/environments/configure_kubernetes_deployments.md
+++ b/doc/ci/environments/configure_kubernetes_deployments.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Configure Kubernetes deployments (deprecated)
diff --git a/doc/ci/environments/environments_dashboard.md b/doc/ci/environments/environments_dashboard.md
index 0beaf2b8888..0b5bf75f8d2 100644
--- a/doc/ci/environments/environments_dashboard.md
+++ b/doc/ci/environments/environments_dashboard.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Environments Dashboard **(PREMIUM ALL)**
diff --git a/doc/ci/environments/external_deployment_tools.md b/doc/ci/environments/external_deployment_tools.md
index ac31d196887..b3282f7d90d 100644
--- a/doc/ci/environments/external_deployment_tools.md
+++ b/doc/ci/environments/external_deployment_tools.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Track deployments of an external deployment tool **(FREE ALL)**
diff --git a/doc/ci/environments/incremental_rollouts.md b/doc/ci/environments/incremental_rollouts.md
index 309e311e252..3ec670fea08 100644
--- a/doc/ci/environments/incremental_rollouts.md
+++ b/doc/ci/environments/incremental_rollouts.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Incremental rollouts with GitLab CI/CD **(FREE ALL)**
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index 8306746dd1f..719d5e123b9 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Environments and deployments **(FREE ALL)**
diff --git a/doc/ci/environments/kubernetes_dashboard.md b/doc/ci/environments/kubernetes_dashboard.md
index a77074214dc..779e99db92f 100644
--- a/doc/ci/environments/kubernetes_dashboard.md
+++ b/doc/ci/environments/kubernetes_dashboard.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Dashboard for Kubernetes **(FREE ALL BETA)**
diff --git a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
index 4cd59e9d3f1..342ff52cebe 100644
--- a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
+++ b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # Authenticating and reading secrets with HashiCorp Vault **(PREMIUM ALL)**
diff --git a/doc/ci/examples/deployment/composer-npm-deploy.md b/doc/ci/examples/deployment/composer-npm-deploy.md
index dfdaa1866c3..e22659a31d2 100644
--- a/doc/ci/examples/deployment/composer-npm-deploy.md
+++ b/doc/ci/examples/deployment/composer-npm-deploy.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # Running Composer and npm scripts with deployment via SCP in GitLab CI/CD **(FREE ALL)**
diff --git a/doc/ci/examples/deployment/index.md b/doc/ci/examples/deployment/index.md
index 2be800efcbb..cccd2eafdae 100644
--- a/doc/ci/examples/deployment/index.md
+++ b/doc/ci/examples/deployment/index.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # Using Dpl as a deployment tool **(FREE ALL)**
diff --git a/doc/ci/examples/index.md b/doc/ci/examples/index.md
index 93ac30c0171..57cbaa3cd7c 100644
--- a/doc/ci/examples/index.md
+++ b/doc/ci/examples/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index
 ---
 
 # GitLab CI/CD examples **(FREE ALL)**
diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md
index 0e0d40f12f6..7b3c98d0aea 100644
--- a/doc/ci/examples/php.md
+++ b/doc/ci/examples/php.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # Testing PHP projects **(FREE ALL)**
diff --git a/doc/ci/git_submodules.md b/doc/ci/git_submodules.md
index 2561ab6465e..c3d1cebc271 100644
--- a/doc/ci/git_submodules.md
+++ b/doc/ci/git_submodules.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Using Git submodules with GitLab CI/CD **(FREE ALL)**
diff --git a/doc/ci/index.md b/doc/ci/index.md
index 7af8de6351f..5079d96c635 100644
--- a/doc/ci/index.md
+++ b/doc/ci/index.md
@@ -3,7 +3,6 @@ stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 description: "Learn how to use GitLab CI/CD, the GitLab built-in Continuous Integration, Continuous Deployment, and Continuous Delivery toolset to build, test, and deploy your application."
-type: index
 ---
 
 # Get started with GitLab CI/CD **(FREE ALL)**
diff --git a/doc/ci/interactive_web_terminal/index.md b/doc/ci/interactive_web_terminal/index.md
index 1125061d830..c8111881f12 100644
--- a/doc/ci/interactive_web_terminal/index.md
+++ b/doc/ci/interactive_web_terminal/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Interactive web terminals **(FREE ALL)**
diff --git a/doc/ci/migration/bamboo.md b/doc/ci/migration/bamboo.md
index 93091d2a30a..d7309f0c8d4 100644
--- a/doc/ci/migration/bamboo.md
+++ b/doc/ci/migration/bamboo.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, howto
 ---
 
 # Migrating from Bamboo **(FREE ALL)**
diff --git a/doc/ci/migration/circleci.md b/doc/ci/migration/circleci.md
index 984191108bd..233a41e95bc 100644
--- a/doc/ci/migration/circleci.md
+++ b/doc/ci/migration/circleci.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, howto
 ---
 
 # Migrating from CircleCI **(FREE ALL)**
diff --git a/doc/ci/migration/examples/jenkins-maven.md b/doc/ci/migration/examples/jenkins-maven.md
index 0ed08357eef..07b2c573adb 100644
--- a/doc/ci/migration/examples/jenkins-maven.md
+++ b/doc/ci/migration/examples/jenkins-maven.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, howto
 ---
 
 # Migrate a Maven build from Jenkins to GitLab CI/CD
diff --git a/doc/ci/migration/github_actions.md b/doc/ci/migration/github_actions.md
index 46d15f506ac..0045d64e9e4 100644
--- a/doc/ci/migration/github_actions.md
+++ b/doc/ci/migration/github_actions.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, howto
 ---
 
 # Migrating from GitHub Actions **(FREE ALL)**
diff --git a/doc/ci/migration/jenkins.md b/doc/ci/migration/jenkins.md
index 4352b495e7b..045a275be17 100644
--- a/doc/ci/migration/jenkins.md
+++ b/doc/ci/migration/jenkins.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, howto
 ---
 
 # Migrating from Jenkins **(FREE ALL)**
diff --git a/doc/ci/migration/plan_a_migration.md b/doc/ci/migration/plan_a_migration.md
index 22c4645d6c2..aa163bb90d6 100644
--- a/doc/ci/migration/plan_a_migration.md
+++ b/doc/ci/migration/plan_a_migration.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, howto
 ---
 
 # Plan a migration from another tool to GitLab CI/CD
diff --git a/doc/ci/mobile_devops.md b/doc/ci/mobile_devops.md
index 4e1a0f4683c..99c178019b0 100644
--- a/doc/ci/mobile_devops.md
+++ b/doc/ci/mobile_devops.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Mobile DevOps **(EXPERIMENT)**
diff --git a/doc/ci/pipeline_editor/index.md b/doc/ci/pipeline_editor/index.md
index c7bd402bd23..2029ce5ad4c 100644
--- a/doc/ci/pipeline_editor/index.md
+++ b/doc/ci/pipeline_editor/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Pipeline editor **(FREE ALL)**
diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index d93ee8b8aba..92650b851c8 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Compute quota **(PREMIUM ALL)**
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index 80a416059e8..d64728210fa 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # CI/CD pipelines **(FREE ALL)**
diff --git a/doc/ci/pipelines/pipeline_architectures.md b/doc/ci/pipelines/pipeline_architectures.md
index 305e48ca9f5..2b94e26de0c 100644
--- a/doc/ci/pipelines/pipeline_architectures.md
+++ b/doc/ci/pipelines/pipeline_architectures.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Pipeline architecture **(FREE ALL)**
diff --git a/doc/ci/pipelines/pipeline_efficiency.md b/doc/ci/pipelines/pipeline_efficiency.md
index 471699707ff..9ad69363d74 100644
--- a/doc/ci/pipelines/pipeline_efficiency.md
+++ b/doc/ci/pipelines/pipeline_efficiency.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Pipeline efficiency **(FREE ALL)**
diff --git a/doc/ci/pipelines/pipeline_security.md b/doc/ci/pipelines/pipeline_security.md
index d499da21b88..35195b1edff 100644
--- a/doc/ci/pipelines/pipeline_security.md
+++ b/doc/ci/pipelines/pipeline_security.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Pipeline security
diff --git a/doc/ci/pipelines/schedules.md b/doc/ci/pipelines/schedules.md
index 1003c03bebf..17d60b72448 100644
--- a/doc/ci/pipelines/schedules.md
+++ b/doc/ci/pipelines/schedules.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Scheduled pipelines **(FREE ALL)**
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md
index 31a2b74f555..6387f3df007 100644
--- a/doc/ci/pipelines/settings.md
+++ b/doc/ci/pipelines/settings.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Customize pipeline configuration **(FREE ALL)**
diff --git a/doc/ci/quick_start/index.md b/doc/ci/quick_start/index.md
index 1f8c33a9700..90840ead9a0 100644
--- a/doc/ci/quick_start/index.md
+++ b/doc/ci/quick_start/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Tutorial: Create and run your first GitLab CI/CD pipeline **(FREE ALL)**
diff --git a/doc/ci/runners/index.md b/doc/ci/runners/index.md
index 7e597264e1e..4684d5c5fe6 100644
--- a/doc/ci/runners/index.md
+++ b/doc/ci/runners/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner SaaS
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Runner SaaS **(FREE SAAS)**
diff --git a/doc/ci/runners/runners_scope.md b/doc/ci/runners/runners_scope.md
index 5c80c2424b2..97ec3b8dd51 100644
--- a/doc/ci/runners/runners_scope.md
+++ b/doc/ci/runners/runners_scope.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Manage runners **(FREE ALL)**
diff --git a/doc/ci/secrets/azure_key_vault.md b/doc/ci/secrets/azure_key_vault.md
index 8cd3c375b05..e7af74b1880 100644
--- a/doc/ci/secrets/azure_key_vault.md
+++ b/doc/ci/secrets/azure_key_vault.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Use Azure Key Vault secrets in GitLab CI/CD **(PREMIUM ALL)**
diff --git a/doc/ci/secrets/convert-to-id-tokens.md b/doc/ci/secrets/convert-to-id-tokens.md
index 20eae01f45b..4da9f108771 100644
--- a/doc/ci/secrets/convert-to-id-tokens.md
+++ b/doc/ci/secrets/convert-to-id-tokens.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # Tutorial: Update HashiCorp Vault configuration to use ID Tokens **(PREMIUM ALL)**
diff --git a/doc/ci/secrets/id_token_authentication.md b/doc/ci/secrets/id_token_authentication.md
index 325972e06c2..6cb6cd9c535 100644
--- a/doc/ci/secrets/id_token_authentication.md
+++ b/doc/ci/secrets/id_token_authentication.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # OpenID Connect (OIDC) Authentication Using ID Tokens **(FREE ALL)**
diff --git a/doc/ci/secrets/index.md b/doc/ci/secrets/index.md
index e663d8d5c14..24dd4032948 100644
--- a/doc/ci/secrets/index.md
+++ b/doc/ci/secrets/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Using external secrets in CI **(FREE ALL)**
diff --git a/doc/ci/secure_files/index.md b/doc/ci/secure_files/index.md
index d2ce98ad048..26859d3806e 100644
--- a/doc/ci/secure_files/index.md
+++ b/doc/ci/secure_files/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Project-level Secure Files **(FREE ALL)**
diff --git a/doc/ci/services/gitlab.md b/doc/ci/services/gitlab.md
index 54fc664ef12..19915a502ba 100644
--- a/doc/ci/services/gitlab.md
+++ b/doc/ci/services/gitlab.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Use GitLab as a microservice **(FREE ALL)**
diff --git a/doc/ci/services/index.md b/doc/ci/services/index.md
index d782f233780..ab04cdda8b7 100644
--- a/doc/ci/services/index.md
+++ b/doc/ci/services/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index
 ---
 
 # Services **(FREE ALL)**
diff --git a/doc/ci/services/mysql.md b/doc/ci/services/mysql.md
index d02df1faf55..ada15c5d9b0 100644
--- a/doc/ci/services/mysql.md
+++ b/doc/ci/services/mysql.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Using MySQL **(FREE ALL)**
diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md
index b491786b4a1..f277640c054 100644
--- a/doc/ci/services/postgres.md
+++ b/doc/ci/services/postgres.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Using PostgreSQL **(FREE ALL)**
diff --git a/doc/ci/services/redis.md b/doc/ci/services/redis.md
index d86ffdfabd6..1a985478837 100644
--- a/doc/ci/services/redis.md
+++ b/doc/ci/services/redis.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Using Redis **(FREE ALL)**
diff --git a/doc/ci/ssh_keys/index.md b/doc/ci/ssh_keys/index.md
index c86b3ef000d..fe1437cfb8a 100644
--- a/doc/ci/ssh_keys/index.md
+++ b/doc/ci/ssh_keys/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # Using SSH keys with GitLab CI/CD **(FREE ALL)**
diff --git a/doc/ci/test_cases/index.md b/doc/ci/test_cases/index.md
index 9341f8fecea..d0861ba7aec 100644
--- a/doc/ci/test_cases/index.md
+++ b/doc/ci/test_cases/index.md
@@ -3,7 +3,6 @@ stage: Plan
 group: Product Planning
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 description: Test cases in GitLab can help your teams create testing scenarios in their existing development platform.
-type: reference
 ---
 
 # Test cases **(ULTIMATE ALL)**
diff --git a/doc/ci/triggers/index.md b/doc/ci/triggers/index.md
index 605c74808ad..39a28aca052 100644
--- a/doc/ci/triggers/index.md
+++ b/doc/ci/triggers/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: tutorial
 ---
 
 # Trigger pipelines by using the API **(FREE ALL)**
diff --git a/doc/ci/variables/index.md b/doc/ci/variables/index.md
index d20ba33eb99..77f88abec4c 100644
--- a/doc/ci/variables/index.md
+++ b/doc/ci/variables/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # GitLab CI/CD variables **(FREE ALL)**
diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md
index 0ff1c2bf14e..f3b1794318c 100644
--- a/doc/ci/variables/predefined_variables.md
+++ b/doc/ci/variables/predefined_variables.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Predefined variables reference **(FREE ALL)**
diff --git a/doc/ci/variables/where_variables_can_be_used.md b/doc/ci/variables/where_variables_can_be_used.md
index dc2ea3adfdd..da64beac024 100644
--- a/doc/ci/variables/where_variables_can_be_used.md
+++ b/doc/ci/variables/where_variables_can_be_used.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Security
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Where variables can be used **(FREE ALL)**
diff --git a/doc/ci/yaml/includes.md b/doc/ci/yaml/includes.md
index f0e5a475838..07d830dde59 100644
--- a/doc/ci/yaml/includes.md
+++ b/doc/ci/yaml/includes.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Use CI/CD configuration from other files **(FREE ALL)**
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index 5e3cd97c78b..7432e008d48 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # CI/CD YAML syntax reference **(FREE ALL)**
diff --git a/doc/ci/yaml/yaml_optimization.md b/doc/ci/yaml/yaml_optimization.md
index 84be9c85676..53894752d0b 100644
--- a/doc/ci/yaml/yaml_optimization.md
+++ b/doc/ci/yaml/yaml_optimization.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Optimize GitLab CI/CD configuration files **(FREE ALL)**
diff --git a/doc/development/backend/ruby_style_guide.md b/doc/development/backend/ruby_style_guide.md
index 78f3de17031..73c4d8719a0 100644
--- a/doc/development/backend/ruby_style_guide.md
+++ b/doc/development/backend/ruby_style_guide.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/cicd/index.md b/doc/development/cicd/index.md
index 6ef4a67cfa0..6e6156c8f52 100644
--- a/doc/development/cicd/index.md
+++ b/doc/development/cicd/index.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Execution
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
-type: index, concepts, howto
 ---
 
 # CI/CD development guidelines
diff --git a/doc/development/cicd/schema.md b/doc/development/cicd/schema.md
index cbf485a87e8..e9a0b93b5f3 100644
--- a/doc/development/cicd/schema.md
+++ b/doc/development/cicd/schema.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
-type: index, howto
 ---
 
 # Contribute to the CI/CD Schema
diff --git a/doc/development/cicd/templates.md b/doc/development/cicd/templates.md
index 2b5b8ccb5dd..e9cfe0fc56f 100644
--- a/doc/development/cicd/templates.md
+++ b/doc/development/cicd/templates.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Pipeline Authoring
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
-type: index, concepts, howto
 ---
 
 # Development guide for GitLab CI/CD templates
diff --git a/doc/development/contributing/design.md b/doc/development/contributing/design.md
index b849daec18e..27e46c57098 100644
--- a/doc/development/contributing/design.md
+++ b/doc/development/contributing/design.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/contributing/index.md b/doc/development/contributing/index.md
index 5dc789aa1ac..f95d6abca54 100644
--- a/doc/development/contributing/index.md
+++ b/doc/development/contributing/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md
index ed63a26a86f..b5a49ffa995 100644
--- a/doc/development/contributing/issue_workflow.md
+++ b/doc/development/contributing/issue_workflow.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md
index 7978ec1cb3b..c6376c083aa 100644
--- a/doc/development/contributing/merge_request_workflow.md
+++ b/doc/development/contributing/merge_request_workflow.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/contributing/style_guides.md b/doc/development/contributing/style_guides.md
index f0398145404..e560920cca1 100644
--- a/doc/development/contributing/style_guides.md
+++ b/doc/development/contributing/style_guides.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/contributing/verify/index.md b/doc/development/contributing/verify/index.md
index 8d1bd3c76f0..9cd44b6cb64 100644
--- a/doc/development/contributing/verify/index.md
+++ b/doc/development/contributing/verify/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: Verify
 group: Pipeline Execution
 ---
diff --git a/doc/development/database/batched_background_migrations.md b/doc/development/database/batched_background_migrations.md
index 585f9069ef6..7a0a55b26ec 100644
--- a/doc/development/database/batched_background_migrations.md
+++ b/doc/development/database/batched_background_migrations.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: Data Stores
 group: Database
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
diff --git a/doc/development/documentation/graphql_styleguide.md b/doc/development/documentation/graphql_styleguide.md
index bad22110a3a..264ba19226f 100644
--- a/doc/development/documentation/graphql_styleguide.md
+++ b/doc/development/documentation/graphql_styleguide.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/documentation/metadata.md b/doc/development/documentation/metadata.md
index ab2f18fd221..eebd8a4fe7b 100644
--- a/doc/development/documentation/metadata.md
+++ b/doc/development/documentation/metadata.md
@@ -43,11 +43,6 @@ The following metadata is optional and is not actively maintained.
 - `searchbar`: Set to `false` to not include the search bar in the page header.
 - `toc`: Set to `false` to not include the "On this page" navigation.
 
-## Deprecated metadata
-
-The `type` metadata parameter is deprecated but still exists in documentation
-pages. You can remove the `type` metadata parameter and its values.
-
 ## Batch updates for TW metadata
 
 The [`CODEOWNERS`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/CODEOWNERS)
diff --git a/doc/development/fe_guide/dark_mode.md b/doc/development/fe_guide/dark_mode.md
index 2bdc32dc0ba..3af65edf317 100644
--- a/doc/development/fe_guide/dark_mode.md
+++ b/doc/development/fe_guide/dark_mode.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/fe_guide/design_tokens.md b/doc/development/fe_guide/design_tokens.md
index b98bded7759..1556602e298 100644
--- a/doc/development/fe_guide/design_tokens.md
+++ b/doc/development/fe_guide/design_tokens.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/fe_guide/graphql.md b/doc/development/fe_guide/graphql.md
index 4948f4a679a..9bfc68bd2ac 100644
--- a/doc/development/fe_guide/graphql.md
+++ b/doc/development/fe_guide/graphql.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/fe_guide/style/typescript.md b/doc/development/fe_guide/style/typescript.md
index 5a9c2d9eb5a..567b80489fb 100644
--- a/doc/development/fe_guide/style/typescript.md
+++ b/doc/development/fe_guide/style/typescript.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/feature_flags/controls.md b/doc/development/feature_flags/controls.md
index 6e0f0e8dbcf..8ec444d070c 100644
--- a/doc/development/feature_flags/controls.md
+++ b/doc/development/feature_flags/controls.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
diff --git a/doc/development/feature_flags/index.md b/doc/development/feature_flags/index.md
index c1a5963e97f..3c0d8597271 100644
--- a/doc/development/feature_flags/index.md
+++ b/doc/development/feature_flags/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
diff --git a/doc/development/index.md b/doc/development/index.md
index e6a07d6bfbb..b3a3729ed10 100644
--- a/doc/development/index.md
+++ b/doc/development/index.md
@@ -1,5 +1,4 @@
 ---
-type: index, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/internal_api/index.md b/doc/development/internal_api/index.md
index 6331bdb3d57..3988727b864 100644
--- a/doc/development/internal_api/index.md
+++ b/doc/development/internal_api/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Internal API
diff --git a/doc/development/internal_api/internal_api_allowed.md b/doc/development/internal_api/internal_api_allowed.md
index d5e4e8cf63d..d879542c853 100644
--- a/doc/development/internal_api/internal_api_allowed.md
+++ b/doc/development/internal_api/internal_api_allowed.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Internal allowed API
diff --git a/doc/development/internal_users.md b/doc/development/internal_users.md
index 950660be163..4af6245a64c 100644
--- a/doc/development/internal_users.md
+++ b/doc/development/internal_users.md
@@ -1,6 +1,5 @@
 ---
 description: "Internal users documentation."
-type: concepts, reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/merge_request_concepts/index.md b/doc/development/merge_request_concepts/index.md
index 8bec5e0c0b0..85a7d01c32a 100644
--- a/doc/development/merge_request_concepts/index.md
+++ b/doc/development/merge_request_concepts/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: Create
 group: Code Review
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
diff --git a/doc/development/organization/index.md b/doc/development/organization/index.md
index 3a23e50caf9..a897520dff7 100644
--- a/doc/development/organization/index.md
+++ b/doc/development/organization/index.md
@@ -1,5 +1,4 @@
 ---
-type: index, dev
 stage: Data Stores
 group: Tenant Scale
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
diff --git a/doc/development/pages/dnsmasq.md b/doc/development/pages/dnsmasq.md
index 51fa4c93cce..1506527c3f1 100644
--- a/doc/development/pages/dnsmasq.md
+++ b/doc/development/pages/dnsmasq.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: Plan
 group: Knowledge
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/pages/index.md b/doc/development/pages/index.md
index 4c2739599c7..f4710c951ed 100644
--- a/doc/development/pages/index.md
+++ b/doc/development/pages/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: Plan
 group: Knowledge
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/rails_endpoints/index.md b/doc/development/rails_endpoints/index.md
index c5a166dd4be..c9ed64c4966 100644
--- a/doc/development/rails_endpoints/index.md
+++ b/doc/development/rails_endpoints/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Rails Endpoints
diff --git a/doc/development/rubocop_development_guide.md b/doc/development/rubocop_development_guide.md
index 7a9a590bc91..e56443d5653 100644
--- a/doc/development/rubocop_development_guide.md
+++ b/doc/development/rubocop_development_guide.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
@@ -45,6 +44,9 @@ More context can go into code comments above this inline disable comment. To
 reduce verbose code comments link a resource (issue, epic, ...) to provide
 detailed context.
 
+For temporary inline disables use `rubocop:todo` and link the follow-up issue
+or epic.
+
 For example:
 
 ```ruby
@@ -53,6 +55,10 @@ module Types
   module Domain
     # rubocop:disable Graphql/AuthorizeTypes
     class SomeType < BaseObject
+      if condition # rubocop:disable Style/GuardClause
+        # more logic...
+      end
+
       object.public_send(action) # rubocop:disable GitlabSecurity/PublicSend
     end
     # rubocop:enable Graphql/AuthorizeTypes
@@ -64,6 +70,10 @@ module Types
   module Domain
     # rubocop:disable Graphql/AuthorizeTypes -- already authroized in parent entity
     class SomeType < BaseObject
+      if condition # rubocop:todo Style/GuardClause -- Cleanup via https://gitlab.com/gitlab-org/gitlab/-/issues/1234567890
+        # more logic...
+      end
+
       # At this point `action` is safe to be used in `public_send`.
       # See https://gitlab.com/gitlab-org/gitlab/-/issues/123457890.
       object.public_send(action) # rubocop:disable GitlabSecurity/PublicSend -- User input verified
diff --git a/doc/development/sec/generate_test_vulnerabilities.md b/doc/development/sec/generate_test_vulnerabilities.md
index fdc01701740..59fa0d905df 100644
--- a/doc/development/sec/generate_test_vulnerabilities.md
+++ b/doc/development/sec/generate_test_vulnerabilities.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Threat Insights
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/sec/index.md b/doc/development/sec/index.md
index b793c1d27b1..5deb153fe9b 100644
--- a/doc/development/sec/index.md
+++ b/doc/development/sec/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Static Analysis
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
-type: index, concepts, howto
 ---
 
 # Sec section development guidelines
diff --git a/doc/development/sec/security_report_ingestion_overview.md b/doc/development/sec/security_report_ingestion_overview.md
index 0408e47a1dd..de0c1861cfd 100644
--- a/doc/development/sec/security_report_ingestion_overview.md
+++ b/doc/development/sec/security_report_ingestion_overview.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
-type: concepts
 ---
 
 # Security report ingestion overview
diff --git a/doc/development/secure_coding_guidelines.md b/doc/development/secure_coding_guidelines.md
index 17cda7ca1d3..c68a1a6bcab 100644
--- a/doc/development/secure_coding_guidelines.md
+++ b/doc/development/secure_coding_guidelines.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index 5648c39e370..95f1a9804b4 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -1,5 +1,4 @@
 ---
-type: reference, dev
 stage: none
 group: unassigned
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
diff --git a/doc/development/testing_guide/testing_migrations_guide.md b/doc/development/testing_guide/testing_migrations_guide.md
index 900b7333969..56d4b8b8ccb 100644
--- a/doc/development/testing_guide/testing_migrations_guide.md
+++ b/doc/development/testing_guide/testing_migrations_guide.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
-type: reference
 ---
 
 # Testing Rails migrations at GitLab
diff --git a/doc/development/windows.md b/doc/development/windows.md
index 26fcb886332..a36e094cbcb 100644
--- a/doc/development/windows.md
+++ b/doc/development/windows.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
-type: reference, howto
 ---
 
 # Windows Development
diff --git a/doc/drawers/advanced_search_syntax.md b/doc/drawers/advanced_search_syntax.md
index 6e732bd3175..1787f47471f 100644
--- a/doc/drawers/advanced_search_syntax.md
+++ b/doc/drawers/advanced_search_syntax.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Global Search
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: drawer
 source: /doc/user/search/advanced_search.md
 ---
 
diff --git a/doc/drawers/exact_code_search_syntax.md b/doc/drawers/exact_code_search_syntax.md
index 034912571cd..d5a4a259800 100644
--- a/doc/drawers/exact_code_search_syntax.md
+++ b/doc/drawers/exact_code_search_syntax.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Global Search
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: drawer
 source: /doc/user/search/exact_code_search.md
 ---
 
diff --git a/doc/gitlab-basics/add-file.md b/doc/gitlab-basics/add-file.md
index d67e3231e81..0ba0a3fb711 100644
--- a/doc/gitlab-basics/add-file.md
+++ b/doc/gitlab-basics/add-file.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: howto
 ---
 
 # Use Git to add a file to a repository **(FREE ALL)**
diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md
index 87d462d71b1..473986bc4da 100644
--- a/doc/gitlab-basics/start-using-git.md
+++ b/doc/gitlab-basics/start-using-git.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto, tutorial
 description: "Introduction to using Git through the command line."
 ---
 
diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md
index ea7de10c12a..0d540d65c4a 100644
--- a/doc/install/azure/index.md
+++ b/doc/install/azure/index.md
@@ -3,7 +3,6 @@ stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 description: 'Learn how to spin up a pre-configured GitLab VM on Microsoft Azure.'
-type: howto
 ---
 
 # Install GitLab on Microsoft Azure **(FREE SELF)**
diff --git a/doc/install/cloud_providers.md b/doc/install/cloud_providers.md
index 36cda77143f..ab61f561ef9 100644
--- a/doc/install/cloud_providers.md
+++ b/doc/install/cloud_providers.md
@@ -3,7 +3,6 @@ stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 description: Install GitLab on a cloud provider.
-type: index
 ---
 
 # Installing GitLab on a cloud provider **(FREE SELF)**
diff --git a/doc/install/index.md b/doc/install/index.md
index 15556117b51..2962d960a12 100644
--- a/doc/install/index.md
+++ b/doc/install/index.md
@@ -3,7 +3,6 @@ stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 description: Read through the GitLab installation methods.
-type: index
 ---
 
 # Install GitLab **(FREE SELF)**
diff --git a/doc/install/install_methods.md b/doc/install/install_methods.md
index 5945e418274..3a278f0d2a8 100644
--- a/doc/install/install_methods.md
+++ b/doc/install/install_methods.md
@@ -3,7 +3,6 @@ stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 description: Read through the GitLab installation methods.
-type: index
 ---
 
 # Installation methods **(FREE SELF)**
diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md
index 4acb6e6762c..0a1a3140aa9 100644
--- a/doc/integration/advanced_search/elasticsearch.md
+++ b/doc/integration/advanced_search/elasticsearch.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Data Stores
 group: Global Search
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/integration/advanced_search/elasticsearch_troubleshooting.md b/doc/integration/advanced_search/elasticsearch_troubleshooting.md
index 8fda1519c98..fdf629ea914 100644
--- a/doc/integration/advanced_search/elasticsearch_troubleshooting.md
+++ b/doc/integration/advanced_search/elasticsearch_troubleshooting.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Data Stores
 group: Global Search
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/integration/gitpod.md b/doc/integration/gitpod.md
index 724065fd640..668d18ea8a7 100644
--- a/doc/integration/gitpod.md
+++ b/doc/integration/gitpod.md
@@ -1,5 +1,4 @@
 ---
-type: reference, how-to
 stage: Create
 group: IDE
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 277652c20a2..5d3234b5d1f 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # SAML SSO for self-managed GitLab instances **(FREE SELF)**
diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md
index 3fc98cc588c..3df0aa47279 100644
--- a/doc/integration/sourcegraph.md
+++ b/doc/integration/sourcegraph.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, how-to
 ---
 
 # Sourcegraph **(FREE ALL)**
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index bb27fcb27e0..d69aa33f23d 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -2,7 +2,6 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts
 ---
 
 # GitLab release and maintenance policy
diff --git a/doc/raketasks/list_repos.md b/doc/raketasks/list_repos.md
index b404e4dec60..ca5641f0637 100644
--- a/doc/raketasks/list_repos.md
+++ b/doc/raketasks/list_repos.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # List repository directories Rake task (deprecated) **(FREE SELF)**
 
 WARNING:
-This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/384361) in GitLab 16.4 and is planned for removal in 17.0.
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/384361) in GitLab 16.7 and is planned for removal in 17.0.
 [If migrating GitLab, use backup and restore](../administration/operations/moving_repositories.md#recommended-approach-in-all-cases)
 instead.
 
diff --git a/doc/security/crime_vulnerability.md b/doc/security/crime_vulnerability.md
index 7cf46300bc2..779155fba5c 100644
--- a/doc/security/crime_vulnerability.md
+++ b/doc/security/crime_vulnerability.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # How we manage the TLS protocol CRIME vulnerability **(FREE SELF)**
diff --git a/doc/security/hardening.md b/doc/security/hardening.md
index 45146fb0715..b60cf599eca 100644
--- a/doc/security/hardening.md
+++ b/doc/security/hardening.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/hardening_application_recommendations.md b/doc/security/hardening_application_recommendations.md
index 521e8a41b11..95993727779 100644
--- a/doc/security/hardening_application_recommendations.md
+++ b/doc/security/hardening_application_recommendations.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/hardening_cicd_recommendations.md b/doc/security/hardening_cicd_recommendations.md
index 1f72803d7a7..5167cb42f46 100644
--- a/doc/security/hardening_cicd_recommendations.md
+++ b/doc/security/hardening_cicd_recommendations.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/hardening_configuration_recommendations.md b/doc/security/hardening_configuration_recommendations.md
index 50f6f8107c6..308ea324186 100644
--- a/doc/security/hardening_configuration_recommendations.md
+++ b/doc/security/hardening_configuration_recommendations.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/hardening_general_concepts.md b/doc/security/hardening_general_concepts.md
index 22154b59441..5e955012a25 100644
--- a/doc/security/hardening_general_concepts.md
+++ b/doc/security/hardening_general_concepts.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/hardening_operating_system_recommendations.md b/doc/security/hardening_operating_system_recommendations.md
index cd228410bdd..191584d3fbf 100644
--- a/doc/security/hardening_operating_system_recommendations.md
+++ b/doc/security/hardening_operating_system_recommendations.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/index.md b/doc/security/index.md
index 6a4d2e35ee6..b111317b485 100644
--- a/doc/security/index.md
+++ b/doc/security/index.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index
 ---
 
 # Secure your installation **(FREE ALL)**
diff --git a/doc/security/information_exclusivity.md b/doc/security/information_exclusivity.md
index 9422cb73dce..f31d50fc8c4 100644
--- a/doc/security/information_exclusivity.md
+++ b/doc/security/information_exclusivity.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts
 ---
 
 # Information exclusivity **(FREE ALL)**
diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md
index 665456ed5a0..afd55d66305 100644
--- a/doc/security/password_length_limits.md
+++ b/doc/security/password_length_limits.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Custom password length limits **(FREE SELF)**
diff --git a/doc/security/password_storage.md b/doc/security/password_storage.md
index 807c59fedf4..4e9f06c13b6 100644
--- a/doc/security/password_storage.md
+++ b/doc/security/password_storage.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Password and OAuth token storage **(FREE ALL)**
diff --git a/doc/security/passwords_for_integrated_authentication_methods.md b/doc/security/passwords_for_integrated_authentication_methods.md
index b8bb7289e82..15ce17e27f7 100644
--- a/doc/security/passwords_for_integrated_authentication_methods.md
+++ b/doc/security/passwords_for_integrated_authentication_methods.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Generated passwords for users created through integrated authentication **(FREE ALL)**
diff --git a/doc/security/rate_limits.md b/doc/security/rate_limits.md
index 2f916ec34b5..e6feaca9989 100644
--- a/doc/security/rate_limits.md
+++ b/doc/security/rate_limits.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Rate limits **(FREE SELF)**
diff --git a/doc/security/reset_user_password.md b/doc/security/reset_user_password.md
index ee89412f10f..6f75a74e652 100644
--- a/doc/security/reset_user_password.md
+++ b/doc/security/reset_user_password.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Reset a user's password **(FREE SELF)**
diff --git a/doc/security/responding_to_security_incidents.md b/doc/security/responding_to_security_incidents.md
index 42103bc952e..e49903cc5a9 100644
--- a/doc/security/responding_to_security_incidents.md
+++ b/doc/security/responding_to_security_incidents.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Responding to security incidents **(FREE SELF)**
diff --git a/doc/security/ssh_keys_restrictions.md b/doc/security/ssh_keys_restrictions.md
index afc515e14f3..52032d4741b 100644
--- a/doc/security/ssh_keys_restrictions.md
+++ b/doc/security/ssh_keys_restrictions.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/token_overview.md b/doc/security/token_overview.md
index 82e16694470..0f35b4ed754 100644
--- a/doc/security/token_overview.md
+++ b/doc/security/token_overview.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # GitLab Token overview **(FREE ALL)**
diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md
index a0faad359c8..ee637498289 100644
--- a/doc/security/two_factor_authentication.md
+++ b/doc/security/two_factor_authentication.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/unlock_user.md b/doc/security/unlock_user.md
index e0f6fa783bd..e944618ed12 100644
--- a/doc/security/unlock_user.md
+++ b/doc/security/unlock_user.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Locked users **(FREE SELF)**
diff --git a/doc/security/user_email_confirmation.md b/doc/security/user_email_confirmation.md
index e2965977e5f..64c22f3b1e7 100644
--- a/doc/security/user_email_confirmation.md
+++ b/doc/security/user_email_confirmation.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/user_file_uploads.md b/doc/security/user_file_uploads.md
index 728fb785272..dd86df88306 100644
--- a/doc/security/user_file_uploads.md
+++ b/doc/security/user_file_uploads.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index 2946d93dd0d..d78ad20b041 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, reference, howto
 ---
 
 # Filtering outbound requests **(FREE SELF)**
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index b64d8df6cf8..46ba7f027da 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -2,7 +2,6 @@
 stage: Fulfillment
 group: Purchase
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # GitLab SaaS subscription **(PREMIUM SAAS)**
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 5e6baef7e09..d0e2be3be33 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -2,7 +2,6 @@
 stage: Fulfillment
 group: Purchase
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Subscribe to GitLab **(PREMIUM ALL)**
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index f50ba6fcd5a..0805a9de1b9 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -2,7 +2,6 @@
 stage: Fulfillment
 group: Purchase
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # GitLab self-managed subscription **(PREMIUM SELF)**
diff --git a/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md b/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
index dc18f863844..f36d5cfaf64 100644
--- a/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
+++ b/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Upgrading deployments for newer Auto Deploy dependencies **(FREE ALL)**
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index 78275746de5..05773ec7e92 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: concepts, howto
 description: "Introduction to Git rebase and force push, methods to resolve merge conflicts through the command line."
 ---
 
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index 0f629abb9aa..257eee026f4 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: index
 ---
 
 # Git **(FREE ALL)**
diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md
index 95c1645f4cc..51fb25b3a94 100644
--- a/doc/topics/git/lfs/index.md
+++ b/doc/topics/git/lfs/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, howto
 ---
 
 # Git Large File Storage (LFS) **(FREE ALL)**
diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
index 68cd0ae3d53..94175c88f13 100644
--- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Undo options in Git **(FREE ALL)**
diff --git a/doc/topics/git/partial_clone.md b/doc/topics/git/partial_clone.md
index add276ad49d..ca12c874eef 100644
--- a/doc/topics/git/partial_clone.md
+++ b/doc/topics/git/partial_clone.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, howto
 ---
 
 # Partial clone **(FREE ALL)**
diff --git a/doc/topics/git/troubleshooting_git.md b/doc/topics/git/troubleshooting_git.md
index dba28144019..767b94d791d 100644
--- a/doc/topics/git/troubleshooting_git.md
+++ b/doc/topics/git/troubleshooting_git.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: howto
 ---
 
 # Troubleshooting Git **(FREE ALL)**
diff --git a/doc/topics/git/useful_git_commands.md b/doc/topics/git/useful_git_commands.md
index cd01cd0d495..4e1f23f059c 100644
--- a/doc/topics/git/useful_git_commands.md
+++ b/doc/topics/git/useful_git_commands.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Frequently used Git commands **(FREE ALL)**
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 225d3484db9..99e01289c14 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -766,6 +766,23 @@ The table below lists the deprecated metrics and their respective replacements.
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### List repository directories Rake task
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.7</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/384361).
+</div>
+
+The `gitlab-rake gitlab:list_repos` Rake task does not work and will be removed in GitLab 17.0.
+If you're migrating GitLab, use
+[backup and restore](https://docs.gitlab.com/ee/administration/operations/moving_repositories.html#recommended-approach-in-all-cases)
+instead.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Maintainer role providing the ability to change Package settings using GraphQL API
 
 <div class="deprecation-notes">
diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md
index 2252323bf09..9f492f18bf6 100644
--- a/doc/user/ai_features.md
+++ b/doc/user/ai_features.md
@@ -2,7 +2,6 @@
 stage: AI-powered
 group: AI Model Validation
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # GitLab Duo
diff --git a/doc/user/analytics/issue_analytics.md b/doc/user/analytics/issue_analytics.md
index 35771a26366..775059fa11e 100644
--- a/doc/user/analytics/issue_analytics.md
+++ b/doc/user/analytics/issue_analytics.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Optimize
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/api_fuzzing/create_har_files.md b/doc/user/application_security/api_fuzzing/create_har_files.md
index b82ea30b463..1e8c6698b54 100644
--- a/doc/user/application_security/api_fuzzing/create_har_files.md
+++ b/doc/user/application_security/api_fuzzing/create_har_files.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # HTTP Archive format **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md
index ad5fde750c5..b0bf80d055d 100644
--- a/doc/user/application_security/api_fuzzing/index.md
+++ b/doc/user/application_security/api_fuzzing/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Web API Fuzz Testing **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/api_security/api_discovery/index.md b/doc/user/application_security/api_security/api_discovery/index.md
index 0d7bb2830e9..2c624e6dccb 100644
--- a/doc/user/application_security/api_security/api_discovery/index.md
+++ b/doc/user/application_security/api_security/api_discovery/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # API Discovery **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/api_security/index.md b/doc/user/application_security/api_security/index.md
index 37549d5db51..166425bd52b 100644
--- a/doc/user/application_security/api_security/index.md
+++ b/doc/user/application_security/api_security/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # API Security **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/breach_and_attack_simulation/index.md b/doc/user/application_security/breach_and_attack_simulation/index.md
index e23d65fc73e..61b9c8af59b 100644
--- a/doc/user/application_security/breach_and_attack_simulation/index.md
+++ b/doc/user/application_security/breach_and_attack_simulation/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Incubation
 info: Breach and Attack Simulation is a GitLab Incubation Engineering program. No technical writer assigned to this group.
-type: reference, howto
 ---
 
 # Breach and Attack Simulation **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md
index b2ca6819a53..1d7799a35cc 100644
--- a/doc/user/application_security/container_scanning/index.md
+++ b/doc/user/application_security/container_scanning/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Secure
 group: Composition Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/cve_id_request.md b/doc/user/application_security/cve_id_request.md
index bbe97081a55..aa45f25a158 100644
--- a/doc/user/application_security/cve_id_request.md
+++ b/doc/user/application_security/cve_id_request.md
@@ -1,5 +1,4 @@
 ---
-type: tutorial
 stage: Govern
 group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/dast/authentication.md b/doc/user/application_security/dast/authentication.md
index c245361a731..da97a941fec 100644
--- a/doc/user/application_security/dast/authentication.md
+++ b/doc/user/application_security/dast/authentication.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # DAST authentication **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dast/browser_based.md b/doc/user/application_security/dast/browser_based.md
index 207db52ed71..4c13cc9d300 100644
--- a/doc/user/application_security/dast/browser_based.md
+++ b/doc/user/application_security/dast/browser_based.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # DAST browser-based analyzer **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dast/browser_based_troubleshooting.md b/doc/user/application_security/dast/browser_based_troubleshooting.md
index 446cd0aaa92..03330c9d753 100644
--- a/doc/user/application_security/dast/browser_based_troubleshooting.md
+++ b/doc/user/application_security/dast/browser_based_troubleshooting.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Troubleshooting DAST browser-based analyzer **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dast/dast_troubleshooting.md b/doc/user/application_security/dast/dast_troubleshooting.md
index 08f819e020c..b5fbdfb59f6 100644
--- a/doc/user/application_security/dast/dast_troubleshooting.md
+++ b/doc/user/application_security/dast/dast_troubleshooting.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Troubleshooting DAST proxy-based analyzer **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 4ec693593fb..56235cbd18a 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Dynamic Application Security Testing (DAST) **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dast/proxy-based.md b/doc/user/application_security/dast/proxy-based.md
index 9e59ecc64d9..d8cfb26a488 100644
--- a/doc/user/application_security/dast/proxy-based.md
+++ b/doc/user/application_security/dast/proxy-based.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # DAST proxy-based analyzer **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dast/run_dast_offline.md b/doc/user/application_security/dast/run_dast_offline.md
index 888c94f5a23..147dad5746c 100644
--- a/doc/user/application_security/dast/run_dast_offline.md
+++ b/doc/user/application_security/dast/run_dast_offline.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Run DAST in an offline environment **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dast_api/index.md b/doc/user/application_security/dast_api/index.md
index 369e967d6c2..9bc354706f0 100644
--- a/doc/user/application_security/dast_api/index.md
+++ b/doc/user/application_security/dast_api/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Dynamic Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # DAST API analyzer **(ULTIMATE ALL)**
diff --git a/doc/user/application_security/dependency_list/index.md b/doc/user/application_security/dependency_list/index.md
index 91145b10f81..3178922c6ef 100644
--- a/doc/user/application_security/dependency_list/index.md
+++ b/doc/user/application_security/dependency_list/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Secure
 group: Composition Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/offline_deployments/index.md b/doc/user/application_security/offline_deployments/index.md
index 75763f6cb24..b818b08a66c 100644
--- a/doc/user/application_security/offline_deployments/index.md
+++ b/doc/user/application_security/offline_deployments/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Secure
 group: Static Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md
index f727b2eb3c2..423309c3535 100644
--- a/doc/user/application_security/security_dashboard/index.md
+++ b/doc/user/application_security/security_dashboard/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/terminology/index.md b/doc/user/application_security/terminology/index.md
index f09672685de..92488c7743c 100644
--- a/doc/user/application_security/terminology/index.md
+++ b/doc/user/application_security/terminology/index.md
@@ -2,7 +2,6 @@
 stage: Secure
 group: Static Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Secure and Govern glossary **(FREE ALL)**
diff --git a/doc/user/application_security/vulnerabilities/severities.md b/doc/user/application_security/vulnerabilities/severities.md
index db6b4e0f4a8..3c1f629e9a0 100644
--- a/doc/user/application_security/vulnerabilities/severities.md
+++ b/doc/user/application_security/vulnerabilities/severities.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/vulnerability_report/index.md b/doc/user/application_security/vulnerability_report/index.md
index 4ae8f239f9b..1c941eabc2b 100644
--- a/doc/user/application_security/vulnerability_report/index.md
+++ b/doc/user/application_security/vulnerability_report/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/application_security/vulnerability_report/pipeline.md b/doc/user/application_security/vulnerability_report/pipeline.md
index 8f09a377526..c9ea05df446 100644
--- a/doc/user/application_security/vulnerability_report/pipeline.md
+++ b/doc/user/application_security/vulnerability_report/pipeline.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/compliance/compliance_center/index.md b/doc/user/compliance/compliance_center/index.md
index df1883f95d9..1d7b074916e 100644
--- a/doc/user/compliance/compliance_center/index.md
+++ b/doc/user/compliance/compliance_center/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Compliance
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
@@ -188,8 +187,8 @@ To export a report of merge request compliance violations for projects in a grou
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. On the left sidebar, select **Secure > Compliance center**.
-1. Select the **Export** action in the top right corner
-1. Select **Export violations report**
+1. In the top-right corner, select **Export**.
+1. Select **Export violations report**.
 
 A report is compiled and delivered to your email inbox as an attachment.
 
@@ -235,8 +234,8 @@ To generate the Chain of Custody report:
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. On the left sidebar, select **Secure > Compliance center**.
-1. Select the **Export** action in the top right corner
-1. Select **Export chain of custody report**
+1. In the top-right corner, select **Export**.
+1. Select **Export chain of custody report**.
 
 Depending on your version of GitLab, the Chain of Custody report is either sent through email or available for download.
 
@@ -252,8 +251,8 @@ To generate a commit-specific Chain of Custody report:
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. On the left sidebar, select **Secure > Compliance center**.
-1. Select the **Export** action in the top right corner
-1. Select **Export custody report of a specific commit**
+1. In the top-right corner, select **Export**.
+1. Select **Export custody report of a specific commit**.
 1. Enter the commit SHA, and then select **Export custody report**.
 
 Depending on your version of GitLab, the Chain of Custody report is either sent through email or available for download.
@@ -359,8 +358,8 @@ To export a report of compliance frameworks on projects in a group:
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. On the left sidebar, select **Secure > Compliance center**.
-1. Select the **Export** action in the top right corner
-1. Select **Export list of project frameworks**
+1. In the top-right corner, select **Export**.
+1. Select **Export list of project frameworks**.
 
 A report is compiled and delivered to your email inbox as an attachment.
 
diff --git a/doc/user/compliance/index.md b/doc/user/compliance/index.md
index 51053c03d8c..1b964ace08c 100644
--- a/doc/user/compliance/index.md
+++ b/doc/user/compliance/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Compliance
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/compliance/license_approval_policies.md b/doc/user/compliance/license_approval_policies.md
index cf5f340c0f6..7b210a8f03f 100644
--- a/doc/user/compliance/license_approval_policies.md
+++ b/doc/user/compliance/license_approval_policies.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Security Policies
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/compliance/license_list.md b/doc/user/compliance/license_list.md
index 7ad19775509..32db42eb35d 100644
--- a/doc/user/compliance/license_list.md
+++ b/doc/user/compliance/license_list.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/compliance/license_scanning_of_cyclonedx_files/index.md b/doc/user/compliance/license_scanning_of_cyclonedx_files/index.md
index c357f0f261c..1242f75fac3 100644
--- a/doc/user/compliance/license_scanning_of_cyclonedx_files/index.md
+++ b/doc/user/compliance/license_scanning_of_cyclonedx_files/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Secure
 group: Composition Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 69e2eae3eb5..65fdafa4a42 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, howto
 ---
 
 # Comments and threads **(FREE ALL)**
diff --git a/doc/user/enterprise_user/index.md b/doc/user/enterprise_user/index.md
index 9f75989497c..72b5ddb49ac 100644
--- a/doc/user/enterprise_user/index.md
+++ b/doc/user/enterprise_user/index.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Enterprise users **(PREMIUM SAAS)**
diff --git a/doc/user/gitlab_duo_chat.md b/doc/user/gitlab_duo_chat.md
index 0f9771b8f61..21d19de6bdf 100644
--- a/doc/user/gitlab_duo_chat.md
+++ b/doc/user/gitlab_duo_chat.md
@@ -2,7 +2,6 @@
 stage: AI-powered
 group: Duo Chat
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Answer questions with GitLab Duo Chat **(ULTIMATE SAAS BETA)**
diff --git a/doc/user/group/clusters/index.md b/doc/user/group/clusters/index.md
index 5c0844dff92..5282cc17bb5 100644
--- a/doc/user/group/clusters/index.md
+++ b/doc/user/group/clusters/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/contribution_analytics/index.md b/doc/user/group/contribution_analytics/index.md
index 96cc9ce974c..33c9cdfa886 100644
--- a/doc/user/group/contribution_analytics/index.md
+++ b/doc/user/group/contribution_analytics/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Optimize
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/epics/manage_epics.md b/doc/user/group/epics/manage_epics.md
index a5cc3ad9070..922fb48dd62 100644
--- a/doc/user/group/epics/manage_epics.md
+++ b/doc/user/group/epics/manage_epics.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Plan
 group: Product Planning
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/issues_analytics/index.md b/doc/user/group/issues_analytics/index.md
index 3dc3248ab6a..731037fc13a 100644
--- a/doc/user/group/issues_analytics/index.md
+++ b/doc/user/group/issues_analytics/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Optimize
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/iterations/index.md b/doc/user/group/iterations/index.md
index c7a1a8db9b0..87ffd2c6981 100644
--- a/doc/user/group/iterations/index.md
+++ b/doc/user/group/iterations/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/planning_hierarchy/index.md b/doc/user/group/planning_hierarchy/index.md
index 17552ceaf88..7d6bae83dad 100644
--- a/doc/user/group/planning_hierarchy/index.md
+++ b/doc/user/group/planning_hierarchy/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Product Planning
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/saml_sso/example_saml_config.md b/doc/user/group/saml_sso/example_saml_config.md
index d2bd56a2666..d817cb3b2b1 100644
--- a/doc/user/group/saml_sso/example_saml_config.md
+++ b/doc/user/group/saml_sso/example_saml_config.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Example group SAML and SCIM configurations **(PREMIUM SAAS)**
diff --git a/doc/user/group/saml_sso/group_sync.md b/doc/user/group/saml_sso/group_sync.md
index 3d814e67790..9fb6eefbb0c 100644
--- a/doc/user/group/saml_sso/group_sync.md
+++ b/doc/user/group/saml_sso/group_sync.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/saml_sso/troubleshooting.md b/doc/user/group/saml_sso/troubleshooting.md
index 1e7de8143e9..c9935567be7 100644
--- a/doc/user/group/saml_sso/troubleshooting.md
+++ b/doc/user/group/saml_sso/troubleshooting.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/group/settings/group_access_tokens.md b/doc/user/group/settings/group_access_tokens.md
index 880af5786bc..33664f7894e 100644
--- a/doc/user/group/settings/group_access_tokens.md
+++ b/doc/user/group/settings/group_access_tokens.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, howto
 ---
 
 # Group access tokens **(FREE)**
diff --git a/doc/user/group/value_stream_analytics/index.md b/doc/user/group/value_stream_analytics/index.md
index 5ce6bb5dbac..7fd22bde6db 100644
--- a/doc/user/group/value_stream_analytics/index.md
+++ b/doc/user/group/value_stream_analytics/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Optimize
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/profile/account/create_accounts.md b/doc/user/profile/account/create_accounts.md
index 135928dd362..3966f7367bc 100644
--- a/doc/user/profile/account/create_accounts.md
+++ b/doc/user/profile/account/create_accounts.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md
index e653971d149..3eba995a28f 100644
--- a/doc/user/profile/account/delete_account.md
+++ b/doc/user/profile/account/delete_account.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/profile/active_sessions.md b/doc/user/profile/active_sessions.md
index 5e8eb80a1aa..0c1d4f09ba3 100644
--- a/doc/user/profile/active_sessions.md
+++ b/doc/user/profile/active_sessions.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Active sessions **(FREE ALL)**
diff --git a/doc/user/profile/comment_templates.md b/doc/user/profile/comment_templates.md
index 98fabdb0a35..7bb6c5ba157 100644
--- a/doc/user/profile/comment_templates.md
+++ b/doc/user/profile/comment_templates.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
 ---
 
 # Comment templates **(FREE ALL)**
diff --git a/doc/user/profile/contributions_calendar.md b/doc/user/profile/contributions_calendar.md
index 37b2c1a26e6..229e5ec7e4b 100644
--- a/doc/user/profile/contributions_calendar.md
+++ b/doc/user/profile/contributions_calendar.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Tenant Scale
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Contributions calendar **(FREE ALL)**
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index aa50d5c269a..98ea4e19322 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -1,5 +1,4 @@
 ---
-type: index, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md
index 7a616bc7ec9..c41c4823d58 100644
--- a/doc/user/profile/personal_access_tokens.md
+++ b/doc/user/profile/personal_access_tokens.md
@@ -1,5 +1,4 @@
 ---
-type: concepts, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 2a4f81738af..d4beab74937 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -2,7 +2,6 @@
 stage: none
 group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts, howto
 ---
 
 # Profile preferences **(FREE ALL)**
diff --git a/doc/user/profile/service_accounts.md b/doc/user/profile/service_accounts.md
index 6ca07056dfe..4a435dcccfc 100644
--- a/doc/user/profile/service_accounts.md
+++ b/doc/user/profile/service_accounts.md
@@ -1,5 +1,4 @@
 ---
-type: index, howto
 stage: Govern
 group: Authentication
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/autocomplete_characters.md b/doc/user/project/autocomplete_characters.md
index 0bec72d64e8..a8f176a5a03 100644
--- a/doc/user/project/autocomplete_characters.md
+++ b/doc/user/project/autocomplete_characters.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 description: "Autocomplete characters in Markdown fields."
 ---
 
diff --git a/doc/user/project/changelogs.md b/doc/user/project/changelogs.md
index 13132e44f5d..2c7738127ac 100644
--- a/doc/user/project/changelogs.md
+++ b/doc/user/project/changelogs.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, api
 ---
 
 # Changelogs **(FREE ALL)**
diff --git a/doc/user/project/code_intelligence.md b/doc/user/project/code_intelligence.md
index 0df0ef977c0..658443b9c47 100644
--- a/doc/user/project/code_intelligence.md
+++ b/doc/user/project/code_intelligence.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Code Intelligence **(FREE ALL)**
diff --git a/doc/user/project/deploy_boards.md b/doc/user/project/deploy_boards.md
index 91a3d71642d..fe294b20df6 100644
--- a/doc/user/project/deploy_boards.md
+++ b/doc/user/project/deploy_boards.md
@@ -2,7 +2,6 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto, reference
 ---
 
 # Deploy boards (deprecated) **(FREE ALL)**
diff --git a/doc/user/project/git_attributes.md b/doc/user/project/git_attributes.md
index 5e67706708d..f2280f68f1a 100644
--- a/doc/user/project/git_attributes.md
+++ b/doc/user/project/git_attributes.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Git attributes **(FREE ALL)**
diff --git a/doc/user/project/highlighting.md b/doc/user/project/highlighting.md
index ba7d7d39e84..47227772337 100644
--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Syntax Highlighting **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/approvals/index.md b/doc/user/project/merge_requests/approvals/index.md
index 614ecb45cb5..4dc35db8e3d 100644
--- a/doc/user/project/merge_requests/approvals/index.md
+++ b/doc/user/project/merge_requests/approvals/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, concepts
 ---
 
 # Merge request approvals **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/authorization_for_merge_requests.md b/doc/user/project/merge_requests/authorization_for_merge_requests.md
index 75c9083332a..81adc6a3b7f 100644
--- a/doc/user/project/merge_requests/authorization_for_merge_requests.md
+++ b/doc/user/project/merge_requests/authorization_for_merge_requests.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: concepts
 ---
 
 # Merge request workflows **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md
index 36283e338a6..dc3aa991976 100644
--- a/doc/user/project/merge_requests/changes.md
+++ b/doc/user/project/merge_requests/changes.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Changes in merge requests **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/cherry_pick_changes.md b/doc/user/project/merge_requests/cherry_pick_changes.md
index af76aa100c1..64b2e8d3804 100644
--- a/doc/user/project/merge_requests/cherry_pick_changes.md
+++ b/doc/user/project/merge_requests/cherry_pick_changes.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, concepts
 ---
 
 # Cherry-pick changes **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/commit_templates.md b/doc/user/project/merge_requests/commit_templates.md
index e133f2212a5..e745212c074 100644
--- a/doc/user/project/merge_requests/commit_templates.md
+++ b/doc/user/project/merge_requests/commit_templates.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 ---
 
 # Commit message templates **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/commits.md b/doc/user/project/merge_requests/commits.md
index 279a196b246..d5105ec8170 100644
--- a/doc/user/project/merge_requests/commits.md
+++ b/doc/user/project/merge_requests/commits.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Merge request commits **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/conflicts.md b/doc/user/project/merge_requests/conflicts.md
index e132ddfb729..0ebf1c8ed9e 100644
--- a/doc/user/project/merge_requests/conflicts.md
+++ b/doc/user/project/merge_requests/conflicts.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, concepts
 ---
 
 # Merge conflicts **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/dependencies.md b/doc/user/project/merge_requests/dependencies.md
index 50e1f0fe75e..ebc7aab163c 100644
--- a/doc/user/project/merge_requests/dependencies.md
+++ b/doc/user/project/merge_requests/dependencies.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, concepts
 ---
 
 # Merge request dependencies **(PREMIUM ALL)**
diff --git a/doc/user/project/merge_requests/drafts.md b/doc/user/project/merge_requests/drafts.md
index f0f6904bc85..94c7598c0a2 100644
--- a/doc/user/project/merge_requests/drafts.md
+++ b/doc/user/project/merge_requests/drafts.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, concepts
 ---
 
 # Draft merge requests **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index ad60075b6f1..03a60cf691d 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Merge requests **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
index 1c287825fc1..c6cf2840694 100644
--- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
+++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, concepts
 ---
 
 # Auto-merge **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/methods/index.md b/doc/user/project/merge_requests/methods/index.md
index a0372f895df..8acf380c6f6 100644
--- a/doc/user/project/merge_requests/methods/index.md
+++ b/doc/user/project/merge_requests/methods/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, concepts
 ---
 
 # Merge methods **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/reviews/data_usage.md b/doc/user/project/merge_requests/reviews/data_usage.md
index b32c527ab75..db23a8cb183 100644
--- a/doc/user/project/merge_requests/reviews/data_usage.md
+++ b/doc/user/project/merge_requests/reviews/data_usage.md
@@ -2,7 +2,6 @@
 stage: AI-powered
 group: AI Model Validation
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Suggested Reviewers Data Usage **(ULTIMATE SAAS)**
diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md
index cfe8803b665..b8d30084cbc 100644
--- a/doc/user/project/merge_requests/reviews/index.md
+++ b/doc/user/project/merge_requests/reviews/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Merge request reviews **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/reviews/suggestions.md b/doc/user/project/merge_requests/reviews/suggestions.md
index bc41c9672c2..7fc006473d7 100644
--- a/doc/user/project/merge_requests/reviews/suggestions.md
+++ b/doc/user/project/merge_requests/reviews/suggestions.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Suggest changes **(FREE ALL)**
diff --git a/doc/user/project/merge_requests/status_checks.md b/doc/user/project/merge_requests/status_checks.md
index 5f50faeaeb0..fbcf7418df1 100644
--- a/doc/user/project/merge_requests/status_checks.md
+++ b/doc/user/project/merge_requests/status_checks.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Compliance
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, concepts
 ---
 
 # External status checks **(ULTIMATE ALL)**
diff --git a/doc/user/project/merge_requests/widgets.md b/doc/user/project/merge_requests/widgets.md
index da766b685a3..c5f2782a7b1 100644
--- a/doc/user/project/merge_requests/widgets.md
+++ b/doc/user/project/merge_requests/widgets.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Review
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Merge request widgets **(FREE ALL)**
diff --git a/doc/user/project/milestones/burndown_and_burnup_charts.md b/doc/user/project/milestones/burndown_and_burnup_charts.md
index 65cc9477c49..ae5f4b258f1 100644
--- a/doc/user/project/milestones/burndown_and_burnup_charts.md
+++ b/doc/user/project/milestones/burndown_and_burnup_charts.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md
index 904a68e5329..fa1051bf2e5 100644
--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
@@ -1,5 +1,4 @@
 ---
-type: index, reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md
index 4d8675b104d..9278136b776 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md
@@ -1,5 +1,4 @@
 ---
-type: concepts
 stage: Plan
 group: Knowledge
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
index 3d9fe4b04e9..2b04fde5e4f 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 description: "Automatic Let's Encrypt SSL certificates for GitLab Pages."
 stage: Plan
 group: Knowledge
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md
index f42fdf4fc40..41b31fdd191 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md
@@ -1,5 +1,4 @@
 ---
-type: concepts
 stage: Plan
 group: Knowledge
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/pages/getting_started/pages_ci_cd_template.md b/doc/user/project/pages/getting_started/pages_ci_cd_template.md
index 90fc1a72eb3..818db90972d 100644
--- a/doc/user/project/pages/getting_started/pages_ci_cd_template.md
+++ b/doc/user/project/pages/getting_started/pages_ci_cd_template.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Plan
 group: Knowledge
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/pages/getting_started/pages_forked_sample_project.md b/doc/user/project/pages/getting_started/pages_forked_sample_project.md
index e3b3b99b8e1..6c1ed2fcfd5 100644
--- a/doc/user/project/pages/getting_started/pages_forked_sample_project.md
+++ b/doc/user/project/pages/getting_started/pages_forked_sample_project.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Plan
 group: Knowledge
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index 16967a3a46e..82bdf0c5d24 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/repository/branches/default.md b/doc/user/project/repository/branches/default.md
index 42f58e9d171..6bf674e5470 100644
--- a/doc/user/project/repository/branches/default.md
+++ b/doc/user/project/repository/branches/default.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: concepts, howto
 ---
 
 # Default branch **(FREE ALL)**
diff --git a/doc/user/project/repository/code_suggestions/index.md b/doc/user/project/repository/code_suggestions/index.md
index e1edd49c3d0..f7a8d9cac8f 100644
--- a/doc/user/project/repository/code_suggestions/index.md
+++ b/doc/user/project/repository/code_suggestions/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Creation
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Code Suggestions **(FREE ALL BETA)**
diff --git a/doc/user/project/repository/code_suggestions/saas.md b/doc/user/project/repository/code_suggestions/saas.md
index ac64aba4335..61036009f10 100644
--- a/doc/user/project/repository/code_suggestions/saas.md
+++ b/doc/user/project/repository/code_suggestions/saas.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Creation
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Code Suggestions on GitLab SaaS **(FREE SAAS BETA)**
diff --git a/doc/user/project/repository/code_suggestions/self_managed.md b/doc/user/project/repository/code_suggestions/self_managed.md
index 0db9644c3a5..2e06191a002 100644
--- a/doc/user/project/repository/code_suggestions/self_managed.md
+++ b/doc/user/project/repository/code_suggestions/self_managed.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Creation
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Code Suggestions on self-managed GitLab **(SELF BETA)**
diff --git a/doc/user/project/repository/code_suggestions/troubleshooting.md b/doc/user/project/repository/code_suggestions/troubleshooting.md
index 86400ea8860..92c5a16b62d 100644
--- a/doc/user/project/repository/code_suggestions/troubleshooting.md
+++ b/doc/user/project/repository/code_suggestions/troubleshooting.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Code Creation
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Troubleshooting Code Suggestions **(FREE ALL BETA)**
diff --git a/doc/user/project/repository/csv.md b/doc/user/project/repository/csv.md
index fcf8d538431..b409fb2b7c2 100644
--- a/doc/user/project/repository/csv.md
+++ b/doc/user/project/repository/csv.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # CSV files **(FREE ALL)**
diff --git a/doc/user/project/repository/geojson.md b/doc/user/project/repository/geojson.md
index eb66a667deb..d935c3c7c20 100644
--- a/doc/user/project/repository/geojson.md
+++ b/doc/user/project/repository/geojson.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # GeoJSON files **(FREE ALL)**
diff --git a/doc/user/project/repository/git_blame.md b/doc/user/project/repository/git_blame.md
index a2d13c2cba6..7b1e5ddfff5 100644
--- a/doc/user/project/repository/git_blame.md
+++ b/doc/user/project/repository/git_blame.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 description: "Documentation on Git file blame."
 ---
 
diff --git a/doc/user/project/repository/git_history.md b/doc/user/project/repository/git_history.md
index db50e6d185e..9ca42177dff 100644
--- a/doc/user/project/repository/git_history.md
+++ b/doc/user/project/repository/git_history.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference, howto
 description: "Documentation on Git file history."
 ---
 
diff --git a/doc/user/project/repository/jupyter_notebooks/index.md b/doc/user/project/repository/jupyter_notebooks/index.md
index 2a1fc0cddf8..64d5f8ee1e5 100644
--- a/doc/user/project/repository/jupyter_notebooks/index.md
+++ b/doc/user/project/repository/jupyter_notebooks/index.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 # Jupyter Notebook files **(FREE ALL)**
 
diff --git a/doc/user/project/requirements/index.md b/doc/user/project/requirements/index.md
index b730f6b4cd8..8867f7bfbf4 100644
--- a/doc/user/project/requirements/index.md
+++ b/doc/user/project/requirements/index.md
@@ -1,5 +1,4 @@
 ---
-type: reference, howto
 stage: Plan
 group: Product Planning
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/project/settings/migrate_projects.md b/doc/user/project/settings/migrate_projects.md
index 708a2ef5f3b..78520949700 100644
--- a/doc/user/project/settings/migrate_projects.md
+++ b/doc/user/project/settings/migrate_projects.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Tenant Scale
 info: 'To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments'
-type: reference, index, howto
 ---
 
 # Migrate projects **(FREE ALL)**
diff --git a/doc/user/project/settings/project_access_tokens.md b/doc/user/project/settings/project_access_tokens.md
index 4cdb6dbdaac..36bafe26da2 100644
--- a/doc/user/project/settings/project_access_tokens.md
+++ b/doc/user/project/settings/project_access_tokens.md
@@ -2,7 +2,6 @@
 stage: Govern
 group: Authentication
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference, howto
 ---
 
 # Project access tokens
diff --git a/doc/user/project/settings/project_features_permissions.md b/doc/user/project/settings/project_features_permissions.md
index 695733b078c..2e0a9529dfc 100644
--- a/doc/user/project/settings/project_features_permissions.md
+++ b/doc/user/project/settings/project_features_permissions.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Tenant Scale
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Project features and permissions **(FREE ALL)**
diff --git a/doc/user/project/time_tracking.md b/doc/user/project/time_tracking.md
index f9a11a51c98..5846815da50 100644
--- a/doc/user/project/time_tracking.md
+++ b/doc/user/project/time_tracking.md
@@ -1,5 +1,4 @@
 ---
-type: reference
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/public_access.md b/doc/user/public_access.md
index f2629cdc824..854d8a924f8 100644
--- a/doc/user/public_access.md
+++ b/doc/user/public_access.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Tenant Scale
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Project and group visibility **(FREE ALL)**
diff --git a/doc/user/rich_text_editor.md b/doc/user/rich_text_editor.md
index fe3ac56b79c..4aad6637bed 100644
--- a/doc/user/rich_text_editor.md
+++ b/doc/user/rich_text_editor.md
@@ -2,7 +2,6 @@
 stage: Plan
 group: Knowledge
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: index, reference
 ---
 
 # Rich text editor **(FREE ALL)**
diff --git a/doc/user/search/advanced_search.md b/doc/user/search/advanced_search.md
index 0fc69503555..aefe6b1b27c 100644
--- a/doc/user/search/advanced_search.md
+++ b/doc/user/search/advanced_search.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Global Search
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Advanced search **(PREMIUM ALL)**
diff --git a/doc/user/search/command_palette.md b/doc/user/search/command_palette.md
index 0f42e727eda..f117578141c 100644
--- a/doc/user/search/command_palette.md
+++ b/doc/user/search/command_palette.md
@@ -2,7 +2,6 @@
 stage: Manage
 group: Foundations
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Command palette **(FREE ALL)**
diff --git a/doc/user/search/exact_code_search.md b/doc/user/search/exact_code_search.md
index ff8460de2c5..ca15c63fae3 100644
--- a/doc/user/search/exact_code_search.md
+++ b/doc/user/search/exact_code_search.md
@@ -2,7 +2,6 @@
 stage: Data Stores
 group: Global Search
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Exact Code Search **(PREMIUM ALL)**
diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md
index 566af81d31b..20edb22ebd2 100644
--- a/doc/user/shortcuts.md
+++ b/doc/user/shortcuts.md
@@ -2,7 +2,6 @@
 stage: Manage
 group: Foundations
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
 ---
 
 # GitLab keyboard shortcuts **(FREE ALL)**
diff --git a/doc/user/snippets.md b/doc/user/snippets.md
index fd4e044d782..09d161f78f2 100644
--- a/doc/user/snippets.md
+++ b/doc/user/snippets.md
@@ -2,7 +2,6 @@
 stage: Create
 group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
-type: reference
 ---
 
 # Snippets **(FREE ALL)**
diff --git a/doc/user/storage_management_automation.md b/doc/user/storage_management_automation.md
index caf6d4e3aac..ba21199e35b 100644
--- a/doc/user/storage_management_automation.md
+++ b/doc/user/storage_management_automation.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Fulfillment
 group: Utilization
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/doc/user/usage_quotas.md b/doc/user/usage_quotas.md
index b07a85077dd..3f43eb5214f 100644
--- a/doc/user/usage_quotas.md
+++ b/doc/user/usage_quotas.md
@@ -1,5 +1,4 @@
 ---
-type: howto
 stage: Fulfillment
 group: Utilization
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
diff --git a/lib/api/milestone_responses.rb b/lib/api/milestone_responses.rb
index fb71cb0e791..85493dfc198 100644
--- a/lib/api/milestone_responses.rb
+++ b/lib/api/milestone_responses.rb
@@ -18,10 +18,11 @@ module API
           optional :iids, type: Array[Integer], coerce_with: ::API::Validations::Types::CommaSeparatedToIntegerArray.coerce, desc: 'The IIDs of the milestones'
           optional :title, type: String, desc: 'The title of the milestones'
           optional :search, type: String, desc: 'The search criteria for the title or description of the milestone'
-          optional :include_parent_milestones, type: Grape::API::Boolean, default: false,
-                                               desc: 'Include group milestones from parent and its ancestors'
+          optional :include_parent_milestones, type: Grape::API::Boolean, desc: 'Deprecated: see `include_ancestors`'
+          optional :include_ancestors, type: Grape::API::Boolean, desc: 'Include milestones from all parent groups'
           optional :updated_before, type: DateTime, desc: 'Return milestones updated before the specified datetime. Format: ISO 8601 YYYY-MM-DDTHH:MM:SSZ'
           optional :updated_after, type: DateTime, desc: 'Return milestones updated after the specified datetime. Format: ISO 8601 YYYY-MM-DDTHH:MM:SSZ'
+          mutually_exclusive :include_ancestors, :include_parent_milestones
           use :pagination
         end
 
@@ -35,6 +36,13 @@ module API
         end
 
         def list_milestones_for(parent)
+          if params.include?(:include_parent_milestones)
+            params[:include_ancestors] = params.delete(:include_parent_milestones)
+          else
+            # include_ancestors should default to false
+            params[:include_ancestors] ||= false
+          end
+
           milestones = MilestonesFinder.new(
             params.merge(parent_finder_params(parent))
           ).execute
@@ -82,7 +90,7 @@ module API
         end
 
         def parent_finder_params(parent)
-          include_parent = params[:include_parent_milestones].present?
+          include_parent = params[:include_ancestors].present?
 
           if parent.is_a?(Project)
             { project_ids: parent.id, group_ids: (include_parent ? project_group_ids(parent) : nil) }
diff --git a/lib/gitlab/nav/top_nav_menu_builder.rb b/lib/gitlab/nav/top_nav_menu_builder.rb
deleted file mode 100644
index dca3432a6a1..00000000000
--- a/lib/gitlab/nav/top_nav_menu_builder.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Nav
-    class TopNavMenuBuilder
-      def initialize
-        @primary = []
-        @secondary = []
-        @last_header_added = nil
-      end
-
-      def add_primary_menu_item(header: nil, **args)
-        if header && (header != @last_header_added)
-          add_menu_header(dest: @primary, title: header)
-          @last_header_added = header
-        end
-
-        add_menu_item(dest: @primary, **args)
-      end
-
-      def add_secondary_menu_item(**args)
-        add_menu_item(dest: @secondary, **args)
-      end
-
-      def build
-        {
-          primary: @primary,
-          secondary: @secondary
-        }
-      end
-
-      private
-
-      def add_menu_item(dest:, **args)
-        item = ::Gitlab::Nav::TopNavMenuItem.build(**args)
-
-        dest.push(item)
-      end
-
-      def add_menu_header(dest:, **args)
-        header = ::Gitlab::Nav::TopNavMenuHeader.build(**args)
-
-        dest.push(header)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/nav/top_nav_menu_header.rb b/lib/gitlab/nav/top_nav_menu_header.rb
deleted file mode 100644
index 520091dbd97..00000000000
--- a/lib/gitlab/nav/top_nav_menu_header.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Nav
-    class TopNavMenuHeader
-      def self.build(title:)
-        {
-          type: :header,
-          title: title
-        }
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/nav/top_nav_view_model_builder.rb b/lib/gitlab/nav/top_nav_view_model_builder.rb
deleted file mode 100644
index 10b841f777e..00000000000
--- a/lib/gitlab/nav/top_nav_view_model_builder.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Nav
-    class TopNavViewModelBuilder
-      def initialize
-        @menu_builder = ::Gitlab::Nav::TopNavMenuBuilder.new
-        @views = {}
-        @shortcuts = []
-      end
-
-      # Using delegate hides the stacktrace for some errors, so we choose to be explicit.
-      # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62047#note_579031091
-      def add_primary_menu_item(...)
-        @menu_builder.add_primary_menu_item(...)
-      end
-
-      def add_secondary_menu_item(...)
-        @menu_builder.add_secondary_menu_item(...)
-      end
-
-      def add_shortcut(**args)
-        item = ::Gitlab::Nav::TopNavMenuItem.build(**args)
-
-        @shortcuts.push(item)
-      end
-
-      def add_primary_menu_item_with_shortcut(shortcut_class:, shortcut_href: nil, **args)
-        add_primary_menu_item(**args)
-        add_shortcut(
-          id: "#{args.fetch(:id)}-shortcut",
-          title: args.fetch(:title),
-          href: shortcut_href || args.fetch(:href),
-          css_class: shortcut_class
-        )
-      end
-
-      def add_view(name, props)
-        @views[name] = props
-      end
-
-      def build
-        menu = @menu_builder.build
-
-        menu.merge({
-          views: @views,
-          shortcuts: @shortcuts,
-          menuTooltip: _('Main menu')
-        }.compact)
-      end
-    end
-  end
-end
diff --git a/lib/tasks/gitlab/list_repos.rake b/lib/tasks/gitlab/list_repos.rake
index c0929466b7c..5a83fd5e2fd 100644
--- a/lib/tasks/gitlab/list_repos.rake
+++ b/lib/tasks/gitlab/list_repos.rake
@@ -2,7 +2,7 @@
 
 namespace :gitlab do
   task list_repos: :environment do
-    warn "The Rake task gitlab:list_repos is deprecated in 16.4 and will be removed in 17.0: " \
+    warn "The Rake task gitlab:list_repos is deprecated in 16.7 and will be removed in 17.0: " \
          "https://gitlab.com/gitlab-org/gitlab/-/issues/384361"
 
     scope = Project
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e87f909c984..ba797fc81aa 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3182,9 +3182,6 @@ msgstr ""
 msgid "Adjust how frequently the GitLab UI polls for updates."
 msgstr ""
 
-msgid "Admin"
-msgstr ""
-
 msgid "Admin Area"
 msgstr ""
 
@@ -22657,9 +22654,6 @@ msgstr ""
 msgid "Go to previous unresolved thread"
 msgstr ""
 
-msgid "Go to primary site"
-msgstr ""
-
 msgid "Go to project"
 msgstr ""
 
@@ -28351,9 +28345,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-msgid "Leave admin mode"
-msgstr ""
-
 msgid "Leave edit mode? All unsaved changes will be lost."
 msgstr ""
 
@@ -28950,9 +28941,6 @@ msgstr ""
 msgid "Mailgun events"
 msgstr ""
 
-msgid "Main menu"
-msgstr ""
-
 msgid "Maintainer"
 msgstr ""
 
@@ -50793,15 +50781,6 @@ msgstr ""
 msgid "Tool"
 msgstr ""
 
-msgid "TopNav|Explore"
-msgstr ""
-
-msgid "TopNav|Switch to"
-msgstr ""
-
-msgid "TopNav|Your dashboards"
-msgstr ""
-
 msgid "Topic %{source_topic} was successfully merged into topic %{target_topic}."
 msgstr ""
 
@@ -53272,15 +53251,9 @@ msgstr ""
 msgid "View all environments."
 msgstr ""
 
-msgid "View all groups"
-msgstr ""
-
 msgid "View all issues"
 msgstr ""
 
-msgid "View all projects"
-msgstr ""
-
 msgid "View blame"
 msgstr ""
 
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index cd4de36a8b2..6890f490617 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -43,13 +43,6 @@ module QA
           element :menu_item_link
         end
 
-        view 'app/helpers/nav/top_nav_helper.rb' do
-          element :admin_area_link
-          element :projects_dropdown
-          element :groups_dropdown
-          element :menu_item_link
-        end
-
         view 'app/views/layouts/header/_new_dropdown.html.haml' do
           element 'new-menu-toggle'
         end
diff --git a/spec/features/projects/jobs/permissions_spec.rb b/spec/features/projects/jobs/permissions_spec.rb
index 73635480b95..7759875c2a5 100644
--- a/spec/features/projects/jobs/permissions_spec.rb
+++ b/spec/features/projects/jobs/permissions_spec.rb
@@ -89,7 +89,10 @@ RSpec.describe 'Project Jobs Permissions', feature_category: :groups_and_project
         it_behaves_like 'recent job page details responds with status', 200 do
           it 'renders job details', :js do
             expect(page).to have_content(job.name)
-            expect(page).to have_css '.log-line'
+
+            within_testid('job-log-content') do
+              expect(page).to have_content('Job succeeded')
+            end
           end
         end
 
diff --git a/spec/finders/milestones_finder_spec.rb b/spec/finders/milestones_finder_spec.rb
index 118679a4911..80819a5760c 100644
--- a/spec/finders/milestones_finder_spec.rb
+++ b/spec/finders/milestones_finder_spec.rb
@@ -182,9 +182,9 @@ RSpec.describe MilestonesFinder do
         expect(result).to contain_exactly(milestone_2, milestone_3, milestone_4)
       end
 
-      context 'when include_parent_milestones is true' do
+      context 'when include_ancestors is true' do
         it 'ignores the iid filter' do
-          params[:include_parent_milestones] = true
+          params[:include_ancestors] = true
 
           expect(result).to contain_exactly(milestone_1, milestone_2, milestone_3, milestone_4)
         end
diff --git a/spec/frontend/ci/catalog/components/pages/ci_resources_page_spec.js b/spec/frontend/ci/catalog/components/pages/ci_resources_page_spec.js
index 80d3d2cea26..e6fbd63f307 100644
--- a/spec/frontend/ci/catalog/components/pages/ci_resources_page_spec.js
+++ b/spec/frontend/ci/catalog/components/pages/ci_resources_page_spec.js
@@ -11,7 +11,8 @@ import CatalogSearch from '~/ci/catalog/components/list/catalog_search.vue';
 import CiResourcesList from '~/ci/catalog/components/list/ci_resources_list.vue';
 import CatalogListSkeletonLoader from '~/ci/catalog/components/list/catalog_list_skeleton_loader.vue';
 import EmptyState from '~/ci/catalog/components/list/empty_state.vue';
-import { cacheConfig } from '~/ci/catalog/graphql/settings';
+import { cacheConfig, resolvers } from '~/ci/catalog/graphql/settings';
+import typeDefs from '~/ci/catalog/graphql/typedefs.graphql';
 import ciResourcesPage from '~/ci/catalog/components/pages/ci_resources_page.vue';
 
 import getCatalogResources from '~/ci/catalog/graphql/queries/get_ci_catalog_resources.query.graphql';
@@ -29,7 +30,7 @@ describe('CiResourcesPage', () => {
 
   const createComponent = () => {
     const handlers = [[getCatalogResources, catalogResourcesResponse]];
-    const mockApollo = createMockApollo(handlers, {}, cacheConfig);
+    const mockApollo = createMockApollo(handlers, resolvers, { cacheConfig, typeDefs });
 
     wrapper = shallowMountExtended(ciResourcesPage, {
       apolloProvider: mockApollo,
@@ -217,7 +218,7 @@ describe('CiResourcesPage', () => {
   });
 
   describe('pages count', () => {
-    describe('when the fetchMore call suceeds', () => {
+    describe('when the fetchMore call succeeds', () => {
       beforeEach(async () => {
         catalogResourcesResponse.mockResolvedValue(catalogResponseBody);
 
diff --git a/spec/frontend/ci/job_details/components/log/log_spec.js b/spec/frontend/ci/job_details/components/log/log_spec.js
index a791732ec9b..8cc28fe4045 100644
--- a/spec/frontend/ci/job_details/components/log/log_spec.js
+++ b/spec/frontend/ci/job_details/components/log/log_spec.js
@@ -51,8 +51,8 @@ describe('Job Log', () => {
   });
 
   const findLineNumbers = () => wrapper.findAllComponents(LineNumber).wrappers.map((w) => w.text());
-  const findCollapsibleLine = () => wrapper.findComponent(LogLineHeader);
-  const findAllCollapsibleLines = () => wrapper.findAllComponents(LogLineHeader);
+  const findLineHeader = () => wrapper.findComponent(LogLineHeader);
+  const findAllLineHeaders = () => wrapper.findAllComponents(LogLineHeader);
 
   describe('line numbers', () => {
     beforeEach(() => {
@@ -74,18 +74,16 @@ describe('Job Log', () => {
     });
 
     it('renders a clickable header section', () => {
-      expect(findCollapsibleLine().attributes('role')).toBe('button');
+      expect(findLineHeader().attributes('role')).toBe('button');
     });
 
     it('renders an icon with the open state', () => {
-      expect(findCollapsibleLine().find('[data-testid="chevron-lg-down-icon"]').exists()).toBe(
-        true,
-      );
+      expect(findLineHeader().find('[data-testid="chevron-lg-down-icon"]').exists()).toBe(true);
     });
 
     describe('on click header section', () => {
       it('calls toggleCollapsibleLine', () => {
-        findCollapsibleLine().trigger('click');
+        findLineHeader().trigger('click');
 
         expect(toggleCollapsibleLineMock).toHaveBeenCalled();
       });
@@ -93,16 +91,16 @@ describe('Job Log', () => {
 
     describe('duration', () => {
       it('shows duration', () => {
-        expect(findCollapsibleLine().props('duration')).toBe('00:00');
-        expect(findCollapsibleLine().props('hideDuration')).toBe(false);
+        expect(findLineHeader().props('duration')).toBe('00:00');
+        expect(findLineHeader().props('hideDuration')).toBe(false);
       });
 
       it('hides duration', () => {
         state.jobLogSections['resolve-secrets'].hideDuration = true;
         createComponent();
 
-        expect(findCollapsibleLine().props('duration')).toBe('00:00');
-        expect(findCollapsibleLine().props('hideDuration')).toBe(true);
+        expect(findLineHeader().props('duration')).toBe('00:00');
+        expect(findLineHeader().props('hideDuration')).toBe(true);
       });
     });
 
@@ -187,8 +185,8 @@ describe('Job Log', () => {
 
         createComponent({ searchResults: mockSearchResults });
 
-        expect(findAllCollapsibleLines().at(0).props('isHighlighted')).toBe(true);
-        expect(findAllCollapsibleLines().at(1).props('isHighlighted')).toBe(false);
+        expect(findAllLineHeaders().at(0).props('isHighlighted')).toBe(true);
+        expect(findAllLineHeaders().at(1).props('isHighlighted')).toBe(false);
       });
     });
   });
diff --git a/spec/graphql/types/work_items/widget_definition_interface_spec.rb b/spec/graphql/types/work_items/widget_definition_interface_spec.rb
index 6f1fd0cc572..59320a75eba 100644
--- a/spec/graphql/types/work_items/widget_definition_interface_spec.rb
+++ b/spec/graphql/types/work_items/widget_definition_interface_spec.rb
@@ -20,6 +20,12 @@ RSpec.describe Types::WorkItems::WidgetDefinitionInterface, feature_category: :t
       it { is_expected.to eq(Types::WorkItems::WidgetDefinitions::AssigneesType) }
     end
 
+    context 'for hierarchy widget' do
+      let(:object) { WorkItems::Widgets::Hierarchy }
+
+      it { is_expected.to eq(Types::WorkItems::WidgetDefinitions::HierarchyType) }
+    end
+
     context 'for other widgets' do
       let(:object) { WorkItems::Widgets::Description }
 
diff --git a/spec/helpers/dashboard_helper_spec.rb b/spec/helpers/dashboard_helper_spec.rb
index 8a76771be0a..92a1ea87f86 100644
--- a/spec/helpers/dashboard_helper_spec.rb
+++ b/spec/helpers/dashboard_helper_spec.rb
@@ -10,20 +10,6 @@ RSpec.describe DashboardHelper do
     allow(helper).to receive(:can?) { true }
   end
 
-  describe '#dashboard_nav_links' do
-    it 'has all the expected links by default' do
-      menu_items = [:projects, :groups, :activity, :milestones, :snippets]
-
-      expect(helper.dashboard_nav_links).to include(*menu_items)
-    end
-
-    it 'does not contain cross project elements when the user cannot read cross project' do
-      expect(helper).to receive(:can?).with(user, :read_cross_project) { false }
-
-      expect(helper.dashboard_nav_links).not_to include(:activity, :milestones)
-    end
-  end
-
   describe '#feature_entry' do
     shared_examples "a feature is enabled" do
       it { is_expected.to include('<p aria-label="Demo: status on">') }
diff --git a/spec/helpers/explore_helper_spec.rb b/spec/helpers/explore_helper_spec.rb
index 68c5289a85f..22884c60740 100644
--- a/spec/helpers/explore_helper_spec.rb
+++ b/spec/helpers/explore_helper_spec.rb
@@ -10,14 +10,6 @@ RSpec.describe ExploreHelper do
     allow(helper).to receive(:can?) { true }
   end
 
-  describe '#explore_nav_links' do
-    it 'has all the expected links by default' do
-      menu_items = [:projects, :groups, :topics, :snippets]
-
-      expect(helper.explore_nav_links).to contain_exactly(*menu_items)
-    end
-  end
-
   describe '#public_visibility_restricted?' do
     it 'delegates to Gitlab::VisibilityLevel' do
       expect(Gitlab::VisibilityLevel).to receive(:public_visibility_restricted?).and_call_original
diff --git a/spec/helpers/nav/top_nav_helper_spec.rb b/spec/helpers/nav/top_nav_helper_spec.rb
deleted file mode 100644
index 6ffc2cbf694..00000000000
--- a/spec/helpers/nav/top_nav_helper_spec.rb
+++ /dev/null
@@ -1,487 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Nav::TopNavHelper do
-  let_it_be(:user) { build_stubbed(:user) }
-  let_it_be(:admin) { build_stubbed(:user, :admin) }
-  let_it_be(:external_user) { build_stubbed(:user, :external, can_create_group: false) }
-
-  let(:current_user) { nil }
-
-  before do
-    stub_application_setting(snowplow_enabled: true)
-    allow(helper).to receive(:current_user) { current_user }
-  end
-
-  describe '#top_nav_view_model' do
-    let(:current_project) { nil }
-    let(:current_group) { nil }
-    let(:with_current_settings_admin_mode) { false }
-    let(:with_header_link_admin_mode) { false }
-    let(:with_projects) { false }
-    let(:with_groups) { false }
-    let(:with_milestones) { false }
-    let(:with_snippets) { false }
-    let(:with_activity) { false }
-
-    let(:subject) { helper.top_nav_view_model(project: current_project, group: current_group) }
-
-    let(:menu_tooltip) { 'Main menu' }
-
-    before do
-      allow(Gitlab::CurrentSettings).to receive(:admin_mode) { with_current_settings_admin_mode }
-      allow(helper).to receive(:header_link?).with(:admin_mode) { with_header_link_admin_mode }
-
-      # Defaulting all `dashboard_nav_link?` calls to false ensures the EE-specific behavior
-      # is not enabled in this CE spec
-      allow(helper).to receive(:dashboard_nav_link?).with(anything) { false }
-
-      allow(helper).to receive(:dashboard_nav_link?).with(:projects) { with_projects }
-      allow(helper).to receive(:dashboard_nav_link?).with(:groups) { with_groups }
-      allow(helper).to receive(:dashboard_nav_link?).with(:milestones) { with_milestones }
-      allow(helper).to receive(:dashboard_nav_link?).with(:snippets) { with_snippets }
-      allow(helper).to receive(:dashboard_nav_link?).with(:activity) { with_activity }
-    end
-
-    it 'has :menuTooltip' do
-      expect(subject[:menuTooltip]).to eq(menu_tooltip)
-    end
-
-    context 'when current_user is nil (anonymous)' do
-      it 'has expected :primary' do
-        expected_header = ::Gitlab::Nav::TopNavMenuHeader.build(
-          title: 'Explore'
-        )
-        expected_primary = [
-          { href: '/explore', icon: 'project', id: 'project', title: 'Projects' },
-          { href: '/explore/groups', icon: 'group', id: 'groups', title: 'Groups' },
-          { href: '/explore/projects/topics', icon: 'labels', id: 'topics', title: 'Topics' },
-          { href: '/explore/snippets', icon: 'snippet', id: 'snippets', title: 'Snippets' }
-        ].map do |item|
-          ::Gitlab::Nav::TopNavMenuItem.build(**item)
-        end
-
-        expect(subject[:primary]).to eq([expected_header, *expected_primary])
-      end
-
-      it 'has expected :shortcuts' do
-        expected_shortcuts = [
-          {
-            href: '/explore',
-            id: 'project-shortcut',
-            title: 'Projects',
-            css_class: 'dashboard-shortcuts-projects'
-          },
-          {
-            href: '/explore/groups',
-            id: 'groups-shortcut',
-            title: 'Groups',
-            css_class: 'dashboard-shortcuts-groups'
-          },
-          {
-            href: '/explore/projects/topics',
-            id: 'topics-shortcut',
-            title: 'Topics',
-            css_class: 'dashboard-shortcuts-topics'
-          },
-          {
-            href: '/explore/snippets',
-            id: 'snippets-shortcut',
-            title: 'Snippets',
-            css_class: 'dashboard-shortcuts-snippets'
-          }
-        ].map do |item|
-          ::Gitlab::Nav::TopNavMenuItem.build(**item)
-        end
-
-        expect(subject[:shortcuts]).to eq(expected_shortcuts)
-      end
-
-      context 'with current nav as project' do
-        before do
-          helper.nav('project')
-        end
-
-        it 'has expected :active' do
-          expect(subject[:primary].detect { |entry| entry[:id] == 'project' }[:active]).to eq(true)
-        end
-      end
-    end
-
-    context 'when current_user is non-admin' do
-      let(:current_user) { user }
-
-      it 'has no menu items or views by default' do
-        expect(subject).to eq({ menuTooltip: menu_tooltip,
-                                primary: [],
-                                secondary: [],
-                                shortcuts: [],
-                                views: {} })
-      end
-
-      context 'with projects' do
-        let(:with_projects) { true }
-        let(:projects_view) { subject[:views][:projects] }
-
-        it 'has expected :primary' do
-          expected_header = ::Gitlab::Nav::TopNavMenuHeader.build(
-            title: 'Switch to'
-          )
-          expected_primary = ::Gitlab::Nav::TopNavMenuItem.build(
-            data: {
-              track_action: 'click_dropdown',
-              track_label: 'projects_dropdown',
-              track_property: 'navigation_top',
-              testid: 'projects_dropdown'
-            },
-            icon: 'project',
-            id: 'project',
-            title: 'Projects',
-            view: 'projects'
-          )
-          expect(subject[:primary]).to eq([expected_header, expected_primary])
-        end
-
-        it 'has expected :shortcuts' do
-          expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
-            id: 'project-shortcut',
-            title: 'Projects',
-            href: '/dashboard/projects',
-            css_class: 'dashboard-shortcuts-projects'
-          )
-          expect(subject[:shortcuts]).to eq([expected_shortcuts])
-        end
-
-        context 'projects' do
-          it 'has expected :currentUserName' do
-            expect(projects_view[:currentUserName]).to eq(current_user.username)
-          end
-
-          it 'has expected :namespace' do
-            expect(projects_view[:namespace]).to eq('projects')
-          end
-
-          it 'has expected :linksPrimary' do
-            expected_links_primary = [
-              ::Gitlab::Nav::TopNavMenuItem.build(
-                data: {
-                  testid: 'menu_item_link',
-                  qa_title: 'View all projects',
-                  **menu_data_tracking_attrs('view_all_projects')
-                },
-                href: '/dashboard/projects',
-                id: 'your',
-                title: 'View all projects'
-              )
-            ]
-            expect(projects_view[:linksPrimary]).to eq(expected_links_primary)
-          end
-
-          it 'does not have any :linksSecondary' do
-            expect(projects_view[:linksSecondary]).to eq([])
-          end
-
-          context 'with current nav as project' do
-            before do
-              helper.nav('project')
-            end
-
-            it 'has expected :active' do
-              expect(subject[:primary].detect { |entry| entry[:id] == 'project' }[:active]).to eq(true)
-            end
-          end
-
-          context 'with persisted project' do
-            let_it_be(:project) { build_stubbed(:project) }
-
-            let(:current_project) { project }
-            let(:avatar_url) { 'project_avatar_url' }
-
-            before do
-              allow(project).to receive(:persisted?) { true }
-              allow(project).to receive(:avatar_url) { avatar_url }
-            end
-
-            it 'has project as :container' do
-              expected_container = {
-                avatarUrl: avatar_url,
-                id: project.id,
-                name: project.name,
-                namespace: project.full_name,
-                webUrl: project_path(project)
-              }
-
-              expect(projects_view[:currentItem]).to eq(expected_container)
-            end
-          end
-        end
-      end
-
-      context 'with groups' do
-        let(:with_groups) { true }
-        let(:groups_view) { subject[:views][:groups] }
-
-        it 'has expected :primary' do
-          expected_header = ::Gitlab::Nav::TopNavMenuHeader.build(
-            title: 'Switch to'
-          )
-          expected_primary = ::Gitlab::Nav::TopNavMenuItem.build(
-            data: {
-              track_action: 'click_dropdown',
-              track_label: 'groups_dropdown',
-              track_property: 'navigation_top',
-              testid: 'groups_dropdown'
-            },
-            icon: 'group',
-            id: 'groups',
-            title: 'Groups',
-            view: 'groups'
-          )
-          expect(subject[:primary]).to eq([expected_header, expected_primary])
-        end
-
-        it 'has expected :shortcuts' do
-          expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
-            id: 'groups-shortcut',
-            title: 'Groups',
-            href: '/dashboard/groups',
-            css_class: 'dashboard-shortcuts-groups'
-          )
-          expect(subject[:shortcuts]).to eq([expected_shortcuts])
-        end
-
-        context 'groups' do
-          it 'has expected :currentUserName' do
-            expect(groups_view[:currentUserName]).to eq(current_user.username)
-          end
-
-          it 'has expected :namespace' do
-            expect(groups_view[:namespace]).to eq('groups')
-          end
-
-          it 'has expected :linksPrimary' do
-            expected_links_primary = [
-              ::Gitlab::Nav::TopNavMenuItem.build(
-                data: {
-                  testid: 'menu_item_link',
-                  qa_title: 'View all groups',
-                  **menu_data_tracking_attrs('view_all_groups')
-                },
-                href: '/dashboard/groups',
-                id: 'your',
-                title: 'View all groups'
-              )
-            ]
-            expect(groups_view[:linksPrimary]).to eq(expected_links_primary)
-          end
-
-          it 'does not have any :linksSecondary' do
-            expect(groups_view[:linksSecondary]).to eq([])
-          end
-
-          context 'with external user' do
-            let(:current_user) { external_user }
-
-            it 'does not have create group link' do
-              expect(groups_view[:linksSecondary]).to eq([])
-            end
-          end
-
-          context 'with current nav as group' do
-            before do
-              helper.nav('group')
-            end
-
-            it 'has expected :active' do
-              expect(subject[:primary].detect { |entry| entry[:id] == 'groups' }[:active]).to eq(true)
-            end
-          end
-
-          context 'with persisted group' do
-            let_it_be(:group) { build_stubbed(:group) }
-
-            let(:current_group) { group }
-            let(:avatar_url) { 'group_avatar_url' }
-
-            before do
-              allow(group).to receive(:persisted?) { true }
-              allow(group).to receive(:avatar_url) { avatar_url }
-            end
-
-            it 'has expected :container' do
-              expected_container = {
-                avatarUrl: avatar_url,
-                id: group.id,
-                name: group.name,
-                namespace: group.full_name,
-                webUrl: group_path(group)
-              }
-
-              expect(groups_view[:currentItem]).to eq(expected_container)
-            end
-          end
-        end
-      end
-
-      context 'with milestones' do
-        let(:with_milestones) { true }
-
-        it 'has expected :shortcuts' do
-          expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
-            id: 'milestones-shortcut',
-            title: 'Milestones',
-            href: '/dashboard/milestones',
-            css_class: 'dashboard-shortcuts-milestones'
-          )
-          expect(subject[:shortcuts]).to eq([expected_shortcuts])
-        end
-      end
-
-      context 'with snippets' do
-        let(:with_snippets) { true }
-
-        it 'has expected :shortcuts' do
-          expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
-            id: 'snippets-shortcut',
-            title: 'Snippets',
-            href: '/dashboard/snippets',
-            css_class: 'dashboard-shortcuts-snippets'
-          )
-          expect(subject[:shortcuts]).to eq([expected_shortcuts])
-        end
-      end
-
-      context 'with activity' do
-        let(:with_activity) { true }
-
-        it 'has expected :shortcuts' do
-          expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
-            id: 'activity-shortcut',
-            title: 'Activity',
-            href: '/dashboard/activity',
-            css_class: 'dashboard-shortcuts-activity'
-          )
-          expect(subject[:shortcuts]).to eq([expected_shortcuts])
-        end
-      end
-    end
-
-    context 'when current_user is admin' do
-      let_it_be(:current_user) { admin }
-
-      let(:with_current_settings_admin_mode) { true }
-
-      it 'has admin as first :secondary item' do
-        expected_admin_item = ::Gitlab::Nav::TopNavMenuItem.build(
-          data: {
-            qa_selector: 'admin_area_link',
-            **menu_data_tracking_attrs('admin')
-          },
-          id: 'admin',
-          title: 'Admin',
-          icon: 'admin',
-          href: '/admin'
-        )
-
-        expect(subject[:secondary].first).to eq(expected_admin_item)
-      end
-
-      context 'with header link admin_mode true' do
-        let(:with_header_link_admin_mode) { true }
-
-        it 'has leave_admin_mode as last :secondary item' do
-          expected_leave_admin_mode_item = ::Gitlab::Nav::TopNavMenuItem.build(
-            id: 'leave_admin_mode',
-            title: 'Leave admin mode',
-            icon: 'lock-open',
-            href: '/admin/session/destroy',
-            data: { method: 'post', **menu_data_tracking_attrs('leave_admin_mode') }
-          )
-          expect(subject[:secondary].last).to eq(expected_leave_admin_mode_item)
-        end
-      end
-
-      context 'with header link admin_mode false' do
-        let(:with_header_link_admin_mode) { false }
-
-        it 'has enter_admin_mode as last :secondary item' do
-          expected_enter_admin_mode_item = ::Gitlab::Nav::TopNavMenuItem.build(
-            data: {
-              testid: 'menu_item_link',
-              qa_title: 'Enter admin mode',
-              **menu_data_tracking_attrs('enter_admin_mode')
-            },
-            id: 'enter_admin_mode',
-            title: 'Enter admin mode',
-            icon: 'lock',
-            href: '/admin/session/new'
-          )
-          expect(subject[:secondary].last).to eq(expected_enter_admin_mode_item)
-        end
-      end
-    end
-  end
-
-  describe '#top_nav_responsive_view_model' do
-    let_it_be(:project) { create(:project) }
-    let_it_be(:group) { create(:group) }
-
-    let(:with_search) { false }
-    let(:with_new_view_model) { nil }
-
-    let(:subject) { helper.top_nav_responsive_view_model(project: project, group: group) }
-
-    before do
-      allow(helper).to receive(:header_link?).with(:search) { with_search }
-      allow(helper).to receive(:new_dropdown_view_model).with(project: project, group: group) { with_new_view_model }
-    end
-
-    it 'has nil new subview' do
-      expect(subject[:views][:new]).to be_nil
-    end
-
-    it 'has nil search subview' do
-      expect(subject[:views][:search]).to be_nil
-    end
-
-    context 'with search' do
-      let(:with_search) { true }
-
-      it 'has search subview' do
-        expect(subject[:views][:search]).to eq(
-          ::Gitlab::Nav::TopNavMenuItem.build(
-            id: 'search',
-            title: 'Search',
-            icon: 'search',
-            href: search_path
-          )
-        )
-      end
-    end
-
-    context 'with new' do
-      let(:with_new_view_model) { { menu_sections: [{ id: 'test-new-view-model' }] } }
-
-      it 'has new subview' do
-        expect(subject[:views][:new]).to eq(with_new_view_model)
-      end
-    end
-
-    context 'with new and no menu_sections' do
-      let(:with_new_view_model) { { menu_sections: [] } }
-
-      it 'has new subview' do
-        expect(subject[:views][:new]).to be_nil
-      end
-    end
-  end
-
-  def menu_data_tracking_attrs(label)
-    {
-      track_label: "menu_#{label}",
-      track_action: 'click_dropdown',
-      track_property: 'navigation_top'
-    }
-  end
-end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index d210b304242..c91efadbf98 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -76,6 +76,8 @@ work_item_type:
 - work_items
 - widget_definitions
 - enabled_widget_definitions
+- child_restrictions
+- allowed_child_types_by_name
 events:
 - author
 - project
diff --git a/spec/lib/gitlab/nav/top_nav_menu_header_spec.rb b/spec/lib/gitlab/nav/top_nav_menu_header_spec.rb
deleted file mode 100644
index d9da3ba1e46..00000000000
--- a/spec/lib/gitlab/nav/top_nav_menu_header_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'fast_spec_helper'
-
-RSpec.describe ::Gitlab::Nav::TopNavMenuHeader do
-  describe '.build' do
-    it 'builds a hash from with the given header' do
-      title = 'Test Header'
-      expected = {
-        title: title,
-        type: :header
-      }
-      expect(described_class.build(title: title)).to eq(expected)
-    end
-  end
-end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index e458a086bcc..53c2373c08b 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -3081,23 +3081,6 @@ RSpec.describe Project, factory_default: :keep, feature_category: :groups_and_pr
 
           expect(project.repository).not_to eq(previous_repository)
         end
-
-        context 'when "replicate_object_pool_on_move" FF is disabled' do
-          before do
-            stub_feature_flags(replicate_object_pool_on_move: false)
-          end
-
-          it 'does not update  a memoized repository value' do
-            previous_repository = project.repository
-
-            allow(project).to receive(:disk_path).and_return('fancy/new/path')
-            allow(project).to receive(:repository_storage).and_return('foo')
-
-            project.track_project_repository
-
-            expect(project.repository).to eq(previous_repository)
-          end
-        end
       end
     end
 
@@ -6950,14 +6933,6 @@ RSpec.describe Project, factory_default: :keep, feature_category: :groups_and_pr
       expect { swap_pool_repository! }.to change { project.reload.pool_repository }.from(pool1).to(pool2)
     end
 
-    context 'when feature flag replicate_object_pool_on_move is disabled' do
-      before do
-        stub_feature_flags(replicate_object_pool_on_move: false)
-      end
-
-      it_behaves_like 'no pool repository swap'
-    end
-
     context 'when repository does not exist' do
       let(:project) { build(:project) }
 
@@ -7052,18 +7027,6 @@ RSpec.describe Project, factory_default: :keep, feature_category: :groups_and_pr
 
         subject
       end
-
-      context 'when feature flag replicate_object_pool_on_move is disabled' do
-        before do
-          stub_feature_flags(replicate_object_pool_on_move: false)
-        end
-
-        it 'links pool repository to project repository' do
-          expect(pool).to receive(:link_repository).with(project.repository)
-
-          subject
-        end
-      end
     end
   end
 
diff --git a/spec/models/work_items/type_spec.rb b/spec/models/work_items/type_spec.rb
index 7f836ce4e90..135b7b97ce9 100644
--- a/spec/models/work_items/type_spec.rb
+++ b/spec/models/work_items/type_spec.rb
@@ -24,6 +24,43 @@ RSpec.describe WorkItems::Type, feature_category: :team_planning do
 
       expect(type.enabled_widget_definitions).to match_array([widget1])
     end
+
+    it 'has many `child_restrictions`' do
+      is_expected.to have_many(:child_restrictions)
+        .class_name('WorkItems::HierarchyRestriction')
+        .with_foreign_key('parent_type_id')
+    end
+
+    describe 'allowed_child_types_by_name' do
+      it 'defines association' do
+        is_expected.to have_many(:allowed_child_types_by_name)
+          .through(:child_restrictions)
+          .class_name('::WorkItems::Type')
+          .with_foreign_key(:child_type_id)
+      end
+
+      it 'sorts by name ascending' do
+        expected_type_names = %w[Atype Ztype gtype]
+        parent_type = create(:work_item_type)
+
+        expected_type_names.shuffle.each do |name|
+          create(:hierarchy_restriction, parent_type: parent_type, child_type: create(:work_item_type, name: name))
+        end
+
+        expect(parent_type.allowed_child_types_by_name.pluck(:name)).to match_array(expected_type_names)
+      end
+    end
+  end
+
+  describe 'callbacks' do
+    describe 'after_save' do
+      subject(:work_item_type) { build(:work_item_type) }
+
+      it 'calls #clear_reactive_cache!' do
+        is_expected.to receive(:clear_reactive_cache!)
+        work_item_type.save!(name: 'foo')
+      end
+    end
   end
 
   describe 'scopes' do
@@ -166,4 +203,48 @@ RSpec.describe WorkItems::Type, feature_category: :team_planning do
       end
     end
   end
+
+  describe '#allowed_child_types' do
+    let_it_be(:work_item_type) { create(:work_item_type) }
+    let_it_be(:child_type) { create(:work_item_type) }
+    let_it_be(:restriction) { create(:hierarchy_restriction, parent_type: work_item_type, child_type: child_type) }
+
+    subject { work_item_type.allowed_child_types(cache: cached) }
+
+    context 'when cache is true' do
+      let(:cached) { true }
+
+      before do
+        allow(work_item_type).to receive(:with_reactive_cache).and_call_original
+      end
+
+      it 'returns the cached data' do
+        expect(work_item_type).to receive(:with_reactive_cache)
+        expect(Rails.cache).to receive(:exist?).with("work_items_type:#{work_item_type.id}:alive")
+        is_expected.to eq([child_type])
+      end
+    end
+
+    context 'when cache is false' do
+      let(:cached) { false }
+
+      it 'returns queried data' do
+        expect(work_item_type).not_to receive(:with_reactive_cache)
+        is_expected.to eq([child_type])
+      end
+    end
+  end
+
+  describe '#calculate_reactive_cache' do
+    let(:work_item_type) { build(:work_item_type) }
+
+    subject { work_item_type.calculate_reactive_cache }
+
+    it 'returns cache data for allowed child types' do
+      child_types = create_list(:work_item_type, 2)
+      expect(work_item_type).to receive(:allowed_child_types_by_name).and_return(child_types)
+
+      is_expected.to eq(child_types)
+    end
+  end
 end
diff --git a/spec/requests/api/group_milestones_spec.rb b/spec/requests/api/group_milestones_spec.rb
index 2f05b0fcf21..2b17ce1d40f 100644
--- a/spec/requests/api/group_milestones_spec.rb
+++ b/spec/requests/api/group_milestones_spec.rb
@@ -37,8 +37,8 @@ RSpec.describe API::GroupMilestones, feature_category: :team_planning do
       group.update!(parent: ancestor_group)
     end
 
-    context 'when include_parent_milestones is true' do
-      let(:params) { { include_parent_milestones: true } }
+    context 'when include_ancestors is true' do
+      let(:params) { { include_ancestors: true } }
 
       context 'when user has access to ancestor groups' do
         let(:milestones) { [ancestor_group_milestone, milestone, closed_milestone] }
@@ -50,14 +50,30 @@ RSpec.describe API::GroupMilestones, feature_category: :team_planning do
 
         it_behaves_like 'listing all milestones'
 
+        context 'when deprecated include_parent_milestones is true' do
+          let(:params) { { include_parent_milestones: true } }
+
+          it_behaves_like 'listing all milestones'
+        end
+
+        context 'when both include_parent_milestones and include_ancestors are specified' do
+          let(:params) { { include_ancestors: true, include_parent_milestones: true } }
+
+          it 'returns 400' do
+            get api(route, user), params: params
+
+            expect(response).to have_gitlab_http_status(:bad_request)
+          end
+        end
+
         context 'when iids param is present' do
-          let(:params) { { include_parent_milestones: true, iids: [milestone.iid] } }
+          let(:params) { { include_ancestors: true, iids: [milestone.iid] } }
 
           it_behaves_like 'listing all milestones'
         end
 
         context 'when updated_before param is present' do
-          let(:params) { { updated_before: 1.day.ago.iso8601, include_parent_milestones: true } }
+          let(:params) { { updated_before: 1.day.ago.iso8601, include_ancestors: true } }
 
           it_behaves_like 'listing all milestones' do
             let(:milestones) { [ancestor_group_milestone, milestone] }
@@ -65,7 +81,7 @@ RSpec.describe API::GroupMilestones, feature_category: :team_planning do
         end
 
         context 'when updated_after param is present' do
-          let(:params) { { updated_after: 1.day.ago.iso8601, include_parent_milestones: true } }
+          let(:params) { { updated_after: 1.day.ago.iso8601, include_ancestors: true } }
 
           it_behaves_like 'listing all milestones' do
             let(:milestones) { [closed_milestone] }
diff --git a/spec/requests/api/project_milestones_spec.rb b/spec/requests/api/project_milestones_spec.rb
index 978ac28ef73..e4b579b96cc 100644
--- a/spec/requests/api/project_milestones_spec.rb
+++ b/spec/requests/api/project_milestones_spec.rb
@@ -40,11 +40,27 @@ RSpec.describe API::ProjectMilestones, feature_category: :team_planning do
 
       it_behaves_like 'listing all milestones'
 
-      context 'when include_parent_milestones is true' do
+      context 'when include_ancestors is true' do
+        let(:params) { { include_ancestors: true } }
+
+        it_behaves_like 'listing all milestones'
+      end
+
+      context 'when deprecated include_parent_milestones is true' do
         let(:params) { { include_parent_milestones: true } }
 
         it_behaves_like 'listing all milestones'
       end
+
+      context 'when both include_parent_milestones and include_ancestors are specified' do
+        let(:params) { { include_ancestors: true, include_parent_milestones: true } }
+
+        it 'returns 400' do
+          get api(route, user), params: params
+
+          expect(response).to have_gitlab_http_status(:bad_request)
+        end
+      end
     end
 
     context 'when project parent is a group' do
@@ -52,14 +68,14 @@ RSpec.describe API::ProjectMilestones, feature_category: :team_planning do
         project.update!(namespace: group)
       end
 
-      context 'when include_parent_milestones is true' do
-        let(:params) { { include_parent_milestones: true } }
+      context 'when include_ancestors is true' do
+        let(:params) { { include_ancestors: true } }
         let(:milestones) { [group_milestone, ancestor_group_milestone, milestone, closed_milestone] }
 
         it_behaves_like 'listing all milestones'
 
         context 'when iids param is present' do
-          let(:params) { { include_parent_milestones: true, iids: [group_milestone.iid] } }
+          let(:params) { { include_ancestors: true, iids: [group_milestone.iid] } }
 
           it_behaves_like 'listing all milestones'
         end
@@ -75,7 +91,7 @@ RSpec.describe API::ProjectMilestones, feature_category: :team_planning do
         end
 
         context 'when updated_before param is present' do
-          let(:params) { { updated_before: 12.hours.ago.iso8601, include_parent_milestones: true } }
+          let(:params) { { updated_before: 12.hours.ago.iso8601, include_ancestors: true } }
 
           it_behaves_like 'listing all milestones' do
             let(:milestones) { [group_milestone, ancestor_group_milestone, milestone] }
@@ -83,7 +99,7 @@ RSpec.describe API::ProjectMilestones, feature_category: :team_planning do
         end
 
         context 'when updated_after param is present' do
-          let(:params) { { updated_after: 2.days.ago.iso8601, include_parent_milestones: true } }
+          let(:params) { { updated_after: 2.days.ago.iso8601, include_ancestors: true } }
 
           it_behaves_like 'listing all milestones' do
             let(:milestones) { [ancestor_group_milestone, closed_milestone] }
diff --git a/spec/requests/projects/tags_controller_spec.rb b/spec/requests/projects/tags_controller_spec.rb
index c0b0b1728c2..97cc3a5a0df 100644
--- a/spec/requests/projects/tags_controller_spec.rb
+++ b/spec/requests/projects/tags_controller_spec.rb
@@ -24,4 +24,23 @@ RSpec.describe Projects::TagsController, feature_category: :source_code_manageme
       end
     end
   end
+
+  describe '#show' do
+    let_it_be(:project) { create(:project, :repository, :public) }
+    let_it_be(:user) { create(:user) }
+
+    before do
+      sign_in(user)
+    end
+
+    context 'with x509 signature' do
+      let(:tag_name) { 'v1.1.1' }
+
+      it 'displays a signature badge' do
+        get project_tags_path(project, id: tag_name)
+
+        expect(response.body).to include('Unverified')
+      end
+    end
+  end
 end
diff --git a/spec/services/projects/update_repository_storage_service_spec.rb b/spec/services/projects/update_repository_storage_service_spec.rb
index 95aba9040c1..de7e6ae9a40 100644
--- a/spec/services/projects/update_repository_storage_service_spec.rb
+++ b/spec/services/projects/update_repository_storage_service_spec.rb
@@ -215,29 +215,6 @@ RSpec.describe Projects::UpdateRepositoryStorageService, feature_category: :sour
             expect(object_pool_double).to have_received(:link).with(project.repository.raw)
           end
 
-          context 'when feature flag replicate_object_pool_on_move is disabled' do
-            before do
-              stub_feature_flags(replicate_object_pool_on_move: false)
-            end
-
-            it 'just moves the repository without the object pool' do
-              result = subject.execute
-              expect(result).to be_success
-
-              project.reload.cleanup
-
-              new_pool_repository = project.pool_repository
-
-              expect(new_pool_repository).to eq(pool_repository)
-              expect(new_pool_repository.shard).to eq(shard_default)
-              expect(new_pool_repository.state).to eq('ready')
-              expect(new_pool_repository.source_project).to eq(project)
-
-              expect(object_pool_repository_double).not_to have_received(:replicate)
-              expect(object_pool_double).not_to have_received(:link)
-            end
-          end
-
           context 'when new shard has a repository pool' do
             let!(:new_pool_repository) { create(:pool_repository, :ready, shard: shard_to, source_project: project) }
 
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index d3b93c67a0a..88bad8344c6 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -4846,7 +4846,6 @@
 - './spec/helpers/merge_requests_helper_spec.rb'
 - './spec/helpers/namespaces_helper_spec.rb'
 - './spec/helpers/nav/new_dropdown_helper_spec.rb'
-- './spec/helpers/nav/top_nav_helper_spec.rb'
 - './spec/helpers/notes_helper_spec.rb'
 - './spec/helpers/notifications_helper_spec.rb'
 - './spec/helpers/notify_helper_spec.rb'
diff --git a/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb b/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb
index 4883b95ad76..3a062d77b4f 100644
--- a/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb
+++ b/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb
@@ -11,6 +11,11 @@ RSpec.shared_context 'with work item types request context' do
         ... on WorkItemWidgetDefinitionAssignees {
           canInviteMembers
         }
+        ... on WorkItemWidgetDefinitionHierarchy {
+          allowedChildTypes {
+            nodes { id name }
+          }
+        }
       }
     GRAPHQL
   end
@@ -25,9 +30,9 @@ RSpec.shared_context 'with work item types request context' do
     }
   end
 
-  def expected_work_item_type_response(type = nil)
+  def expected_work_item_type_response(work_item_type = nil)
     base_scope = WorkItems::Type.default
-    base_scope = base_scope.id_in(type.id) if type
+    base_scope = base_scope.id_in(work_item_type.id) if work_item_type
 
     base_scope.map do |type|
       hash_including(
@@ -39,12 +44,21 @@ RSpec.shared_context 'with work item types request context' do
     end
   end
 
-  def widgets_for(type)
-    type.widgets.map do |widget|
+  def widgets_for(work_item_type)
+    work_item_type.widgets.map do |widget|
       base_attributes = { 'type' => widget.type.to_s.upcase }
+      next hierarchy_widget_attributes(work_item_type, base_attributes) if widget == WorkItems::Widgets::Hierarchy
       next base_attributes unless widget_attributes[widget.type]
 
       base_attributes.merge(widget_attributes[widget.type])
     end
   end
+
+  def hierarchy_widget_attributes(work_item_type, base_attributes)
+    fields = work_item_type.allowed_child_types_by_name.map do |child_type|
+      { "id" => child_type.to_global_id.to_s, "name" => child_type.name }
+    end
+
+    base_attributes.merge({ 'allowedChildTypes' => { 'nodes' => fields } })
+  end
 end