diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index ef2e1e1d45e..0a095eeb639 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -737,7 +737,6 @@ RSpec/ContextWording:
     - 'ee/spec/services/geo/repository_sync_service_spec.rb'
     - 'ee/spec/services/geo/repository_verification_reset_spec.rb'
     - 'ee/spec/services/geo/wiki_sync_service_spec.rb'
-    - 'ee/spec/services/gitlab_subscriptions/create_hand_raise_lead_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/create_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/preview_billable_user_change_service_spec.rb'
     - 'ee/spec/services/group_saml/group_managed_accounts/transfer_membership_service_spec.rb'
diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml
index b0369d5180d..b48ded6b070 100644
--- a/.rubocop_todo/rspec/expect_in_hook.yml
+++ b/.rubocop_todo/rspec/expect_in_hook.yml
@@ -69,7 +69,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/services/geo/blob_download_service_spec.rb'
     - 'ee/spec/services/geo/project_housekeeping_service_spec.rb'
     - 'ee/spec/services/geo/registry_consistency_service_spec.rb'
-    - 'ee/spec/services/gitlab_subscriptions/create_hand_raise_lead_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/fetch_subscription_plans_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/plan_upgrade_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service_spec.rb'
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 81dbb50a09e..e89fa01f7b8 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-56ab62b8e3cf853560e2417fe239219c51f0b228
+3c844703332ab78c394328a9eb0250aac4e9eb93
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index b12d71462b9..08306312c2e 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -625,6 +625,7 @@ export default {
               <template #default="{ item, index, active }">
                 <dynamic-scroller-item :item="item" :active="active" :class="{ active }">
                   <diff-file
+                    v-if="active"
                     :file="item"
                     :reviewed="fileReviews[item.id]"
                     :is-first-file="index === 0"
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index cca4cf68f5e..95646324078 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -86,7 +86,6 @@ export const handleLocationHash = () => {
   const performanceBar = document.querySelector('#js-peek');
   const topPadding = 8;
   const diffFileHeader = document.querySelector('.js-file-title');
-  const versionMenusContainer = document.querySelector('.mr-version-menus-container');
   const fixedIssuableTitle = document.querySelector('.issue-sticky-header');
 
   let adjustment = 0;
@@ -97,7 +96,6 @@ export const handleLocationHash = () => {
   adjustment -= getElementOffsetHeight(fixedTopBar);
   adjustment -= getElementOffsetHeight(performanceBar);
   adjustment -= getElementOffsetHeight(diffFileHeader);
-  adjustment -= getElementOffsetHeight(versionMenusContainer);
 
   if (isInIssuePage()) {
     adjustment -= getElementOffsetHeight(fixedIssuableTitle);
diff --git a/app/assets/javascripts/pages/projects/tracing/index/index.js b/app/assets/javascripts/pages/projects/tracing/index/index.js
deleted file mode 100644
index 64ca303f8ba..00000000000
--- a/app/assets/javascripts/pages/projects/tracing/index/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { initSimpleApp } from '~/helpers/init_simple_app_helper';
-import ListIndex from '~/tracing/list_index.vue';
-
-initSimpleApp('#js-tracing', ListIndex);
diff --git a/app/assets/javascripts/pages/projects/tracing/show/index.js b/app/assets/javascripts/pages/projects/tracing/show/index.js
deleted file mode 100644
index 107c004aa5f..00000000000
--- a/app/assets/javascripts/pages/projects/tracing/show/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { initSimpleApp } from '~/helpers/init_simple_app_helper';
-import DetailsIndex from '~/tracing/details_index.vue';
-
-initSimpleApp('#js-tracing-details', DetailsIndex);
diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue
index 8ec39ae5e22..a1d48a86111 100644
--- a/app/assets/javascripts/repository/components/blob_content_viewer.vue
+++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue
@@ -87,32 +87,16 @@ export default {
         return queryVariables;
       },
       result({ data }) {
-        const blob = data.project?.repository?.blobs?.nodes[0] || {};
-        this.initHighlightWorker(blob);
+        const repository = data.project?.repository || {};
+        this.blobInfo = repository.blobs?.nodes[0] || {};
+        this.isEmptyRepository = repository.empty;
 
-        const urlHash = getLocationHash();
-        const plain = this.$route?.query?.plain;
+        const usePlain = this.$route?.query?.plain === '1'; // When the 'plain' URL param is present, its value determines which viewer to render
+        const urlHash = getLocationHash(); // If there is a code line hash in the URL we render with the simple viewer
+        const useSimpleViewer = usePlain || urlHash?.startsWith('L') || !this.hasRichViewer;
 
-        // When the 'plain' URL param is present, its value determines which viewer to render:
-        // - when 0 and the rich viewer is available we render with it
-        // - otherwise we render the simple viewer
-        if (plain !== undefined) {
-          if (plain === '0' && this.hasRichViewer) {
-            this.switchViewer(RICH_BLOB_VIEWER);
-          } else {
-            this.switchViewer(SIMPLE_BLOB_VIEWER);
-          }
-          return;
-        }
-
-        // If there is a code line hash in the URL we render with the simple viewer
-        if (urlHash && urlHash.startsWith('L')) {
-          this.switchViewer(SIMPLE_BLOB_VIEWER);
-          return;
-        }
-
-        // By default, if present, use the rich viewer to render
-        this.switchViewer(this.hasRichViewer ? RICH_BLOB_VIEWER : SIMPLE_BLOB_VIEWER);
+        this.initHighlightWorker(this.blobInfo);
+        this.switchViewer(useSimpleViewer ? SIMPLE_BLOB_VIEWER : RICH_BLOB_VIEWER); // By default, if present, use the rich viewer to render
       },
       error() {
         this.displayError();
@@ -120,9 +104,7 @@ export default {
     },
   },
   provide() {
-    return {
-      blobHash: uniqueId(),
-    };
+    return { blobHash: uniqueId() };
   },
   props: {
     path: {
@@ -154,6 +136,8 @@ export default {
       useFallback: false,
       pathLocks: DEFAULT_BLOB_INFO.pathLocks,
       userPermissions: DEFAULT_BLOB_INFO.userPermissions,
+      blobInfo: {},
+      isEmptyRepository: false,
     };
   },
   computed: {
@@ -166,11 +150,6 @@ export default {
     isBinaryFileType() {
       return this.isBinary || this.blobInfo.simpleViewer?.fileType !== TEXT_FILE_TYPE;
     },
-    blobInfo() {
-      const nodes = this.project?.repository?.blobs?.nodes || [];
-
-      return nodes[0] || {};
-    },
     currentRef() {
       return this.originalBranch || this.ref;
     },
@@ -245,16 +224,11 @@ export default {
   },
   watch: {
     // Watch the URL 'plain' query value to know if the viewer needs changing.
-    // This is the case when the user switches the viewer and then goes back
-    // through the hystory.
+    // This is the case when the user switches the viewer and then goes back through the history
     '$route.query.plain': {
       handler(plainValue) {
-        this.switchViewer(
-          this.hasRichViewer && (plainValue === undefined || plainValue === '0')
-            ? RICH_BLOB_VIEWER
-            : SIMPLE_BLOB_VIEWER,
-          plainValue !== undefined,
-        );
+        const useSimpleViewer = plainValue === '1' || !this.hasRichViewer;
+        this.switchViewer(useSimpleViewer ? SIMPLE_BLOB_VIEWER : RICH_BLOB_VIEWER);
       },
     },
   },
@@ -313,21 +287,11 @@ export default {
         this.loadLegacyViewer();
       }
     },
-    updateRouteQuery() {
-      const plain = this.activeViewerType === SIMPLE_BLOB_VIEWER ? '1' : '0';
-
-      if (this.$route?.query?.plain === plain) {
-        return;
-      }
-
-      this.$router.push({
-        path: this.$route.path,
-        query: { ...this.$route.query, plain },
-      });
-    },
     handleViewerChanged(newViewer) {
       this.switchViewer(newViewer);
-      this.updateRouteQuery();
+      const plain = newViewer === SIMPLE_BLOB_VIEWER ? '1' : '0';
+      if (this.$route?.query?.plain === plain) return;
+      this.$router.push({ path: this.$route.path, query: { ...this.$route.query, plain } });
     },
     editBlob(target) {
       if (this.showForkSuggestion) {
@@ -393,7 +357,7 @@ export default {
             :delete-path="blobInfo.webPath"
             :can-push-code="userPermissions.pushCode"
             :can-push-to-branch="blobInfo.canCurrentUserPushToBranch"
-            :empty-repo="project.repository.empty"
+            :empty-repo="isEmptyRepository"
             :project-path="projectPath"
             :is-locked="Boolean(pathLockedByUser)"
             :can-lock="canLock"
diff --git a/app/assets/javascripts/tracing/components/trace_utils.js b/app/assets/javascripts/tracing/components/trace_utils.js
deleted file mode 100644
index 17d0c3980c9..00000000000
--- a/app/assets/javascripts/tracing/components/trace_utils.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { s__, sprintf } from '~/locale';
-
-// See https://design.gitlab.com/data-visualization/color/#categorical-data
-const SPAN_COLOR_WEIGHT = ['500', '600', '700', '800', '900', '950'];
-const SPAN_COLOR_PALETTE = ['blue', 'orange', 'aqua', 'green', 'magenta'];
-
-export function durationNanoToMs(durationNano) {
-  return Math.round(durationNano / 1000);
-}
-
-export function formatDurationMs(durationMs) {
-  return sprintf(s__('Tracing|%{ms} ms'), { ms: durationMs });
-}
-
-export function formatTraceDuration(durationNano) {
-  return formatDurationMs(durationNanoToMs(durationNano));
-}
-
-function createPalette() {
-  const palette = [];
-  SPAN_COLOR_WEIGHT.forEach((w) => {
-    SPAN_COLOR_PALETTE.forEach((c) => {
-      palette.push(`${c}-${w}`);
-    });
-  });
-  return palette;
-}
-
-export function assignColorToServices(trace) {
-  const services = Array.from(new Set(trace.spans.map((s) => s.service_name)));
-
-  const palette = createPalette();
-
-  const serviceToColor = {};
-  services.forEach((s, i) => {
-    serviceToColor[s] = palette[i % palette.length];
-  });
-
-  return serviceToColor;
-}
-
-const timestampToMs = (ts) => new Date(ts).getTime();
-
-export function mapTraceToTreeRoot(trace) {
-  const nodes = {};
-  let root;
-
-  trace.spans.forEach((s) => {
-    const node = {
-      startTimeMs:
-        root !== undefined ? timestampToMs(s.timestamp) - timestampToMs(root.timestamp) : 0,
-      timestamp: s.timestamp,
-      spanId: s.span_id,
-      operation: s.operation,
-      service: s.service_name,
-      durationMs: durationNanoToMs(s.duration_nano),
-      children: [],
-    };
-    nodes[s.span_id] = node;
-
-    const parentId = s.parent_span_id;
-    if (parentId === '') {
-      root = node;
-    } else if (nodes[parentId]) {
-      nodes[parentId].children.push(node);
-    }
-  });
-
-  return root;
-}
diff --git a/app/assets/javascripts/tracing/components/tracing_details.vue b/app/assets/javascripts/tracing/components/tracing_details.vue
deleted file mode 100644
index c6b2e88c69c..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_details.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<script>
-import { GlLoadingIcon } from '@gitlab/ui';
-import { s__ } from '~/locale';
-import { createAlert } from '~/alert';
-import { visitUrl, isSafeURL } from '~/lib/utils/url_utility';
-import TracingDetailsChart from './tracing_details_chart.vue';
-import TracingDetailsHeader from './tracing_details_header.vue';
-
-export default {
-  components: {
-    GlLoadingIcon,
-    TracingDetailsChart,
-    TracingDetailsHeader,
-  },
-  i18n: {
-    error: s__('Tracing|Failed to load trace details.'),
-  },
-  props: {
-    observabilityClient: {
-      required: true,
-      type: Object,
-    },
-    traceId: {
-      required: true,
-      type: String,
-    },
-    tracingIndexUrl: {
-      required: true,
-      type: String,
-      validator: (val) => isSafeURL(val),
-    },
-  },
-  data() {
-    return {
-      trace: null,
-      loading: false,
-    };
-  },
-  created() {
-    this.validateAndFetch();
-  },
-  methods: {
-    async validateAndFetch() {
-      if (!this.traceId) {
-        createAlert({
-          message: this.$options.i18n.error,
-        });
-      }
-      this.loading = true;
-      try {
-        const enabled = await this.observabilityClient.isTracingEnabled();
-        if (enabled) {
-          await this.fetchTrace();
-        } else {
-          this.goToTracingIndex();
-        }
-      } catch (e) {
-        createAlert({
-          message: this.$options.i18n.error,
-        });
-      } finally {
-        this.loading = false;
-      }
-    },
-    async fetchTrace() {
-      this.loading = true;
-      try {
-        this.trace = await this.observabilityClient.fetchTrace(this.traceId);
-      } catch (e) {
-        createAlert({
-          message: this.$options.i18n.error,
-        });
-      } finally {
-        this.loading = false;
-      }
-    },
-    goToTracingIndex() {
-      visitUrl(this.tracingIndexUrl);
-    },
-  },
-};
-</script>
-
-<template>
-  <div v-if="loading" class="gl-py-5">
-    <gl-loading-icon size="lg" />
-  </div>
-
-  <div v-else-if="trace" data-testid="trace-details" class="gl-mx-7">
-    <tracing-details-header :trace="trace" />
-    <tracing-details-chart :trace="trace" />
-  </div>
-</template>
diff --git a/app/assets/javascripts/tracing/components/tracing_details_chart.vue b/app/assets/javascripts/tracing/components/tracing_details_chart.vue
deleted file mode 100644
index 0f7532e254f..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_details_chart.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script>
-import TracingDetailsSpansChart from './tracing_details_spans_chart.vue';
-import { mapTraceToTreeRoot, durationNanoToMs, assignColorToServices } from './trace_utils';
-
-export default {
-  components: {
-    TracingDetailsSpansChart,
-  },
-  props: {
-    trace: {
-      required: true,
-      type: Object,
-    },
-  },
-  computed: {
-    spans() {
-      const root = mapTraceToTreeRoot(this.trace);
-      return [root];
-    },
-    traceDurationMs() {
-      return durationNanoToMs(this.trace.duration_nano);
-    },
-    serviceToColor() {
-      return assignColorToServices(this.trace);
-    },
-  },
-};
-</script>
-
-<template>
-  <tracing-details-spans-chart
-    :spans="spans"
-    :trace-duration-ms="traceDurationMs"
-    :service-to-color="serviceToColor"
-  />
-</template>
diff --git a/app/assets/javascripts/tracing/components/tracing_details_header.vue b/app/assets/javascripts/tracing/components/tracing_details_header.vue
deleted file mode 100644
index ccd8062b419..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_details_header.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<script>
-import { GlCard } from '@gitlab/ui';
-import { formatDate } from '~/lib/utils/datetime/date_format_utility';
-import { formatTraceDuration } from './trace_utils';
-
-const CARD_CLASS = 'gl-mr-7 gl-w-15p gl-min-w-fit-content';
-const HEADER_CLASS = 'gl-p-2 gl-font-weight-bold gl--flex-center';
-const BODY_CLASS =
-  'gl--flex-center gl-flex-direction-column gl-my-0 gl-p-4 gl-font-weight-bold gl-text-center gl-flex-grow-1 gl-font-lg';
-
-export default {
-  CARD_CLASS,
-  HEADER_CLASS,
-  BODY_CLASS,
-  components: {
-    GlCard,
-  },
-  props: {
-    trace: {
-      required: true,
-      type: Object,
-    },
-  },
-  computed: {
-    title() {
-      return `${this.trace.service_name} : ${this.trace.operation}`;
-    },
-    traceDate() {
-      return formatDate(this.trace.timestamp, 'mmm d, yyyy');
-    },
-    traceTime() {
-      return formatDate(this.trace.timestamp, 'H:MM:ss Z');
-    },
-    traceDuration() {
-      return formatTraceDuration(this.trace.duration_nano);
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="gl-mb-6">
-    <h1>{{ title }}</h1>
-
-    <div class="gl-display-flex gl-flex-wrap gl-justify-content-center gl-my-7 gl-row-gap-6">
-      <gl-card
-        data-testid="trace-date-card"
-        :class="$options.CARD_CLASS"
-        :body-class="$options.BODY_CLASS"
-        :header-class="$options.HEADER_CLASS"
-      >
-        <template #header>
-          {{ __('Trace Start') }}
-        </template>
-
-        <template #default>
-          <span>{{ traceDate }}</span>
-          <span class="gl-text-secondary gl-font-weight-normal">{{ traceTime }}</span>
-        </template>
-      </gl-card>
-
-      <gl-card
-        data-testid="trace-duration-card"
-        :class="$options.CARD_CLASS"
-        :body-class="$options.BODY_CLASS"
-        :header-class="$options.HEADER_CLASS"
-      >
-        <template #header>
-          {{ __('Duration') }}
-        </template>
-
-        <template #default>
-          <span>{{ traceDuration }}</span>
-        </template>
-      </gl-card>
-
-      <gl-card
-        data-testid="trace-spans-card"
-        :class="$options.CARD_CLASS"
-        :body-class="$options.BODY_CLASS"
-        :header-class="$options.HEADER_CLASS"
-      >
-        <template #header>
-          {{ __('Total Spans') }}
-        </template>
-
-        <template #default>
-          <span>{{ trace.totalSpans }}</span>
-        </template>
-      </gl-card>
-    </div>
-  </div>
-</template>
diff --git a/app/assets/javascripts/tracing/components/tracing_details_spans_chart.vue b/app/assets/javascripts/tracing/components/tracing_details_spans_chart.vue
deleted file mode 100644
index a4053fda935..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_details_spans_chart.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<script>
-import { GlButton, GlTruncate } from '@gitlab/ui';
-import { clamp } from 'lodash';
-import { formatDurationMs } from './trace_utils';
-
-export default {
-  name: 'TracingDetailsSpansChart',
-  components: {
-    GlButton,
-    GlTruncate,
-  },
-  props: {
-    spans: {
-      required: true,
-      type: Array,
-    },
-    traceDurationMs: {
-      required: true,
-      type: Number,
-    },
-    depth: {
-      required: false,
-      type: Number,
-      default: 0,
-    },
-    serviceToColor: {
-      required: true,
-      type: Object,
-    },
-  },
-  data() {
-    return {
-      expanded: this.expandedState(this.spans),
-    };
-  },
-  computed: {
-    spanDetailsStyle() {
-      return {
-        paddingLeft: `${this.depth * 16}px`,
-      };
-    },
-  },
-  watch: {
-    spans(_, newSpans) {
-      this.expanded = this.expandedState(newSpans);
-    },
-  },
-  methods: {
-    expandedState(spans) {
-      return spans.map((x) => x.children.length > 0);
-    },
-    hasChildrenSpans(index) {
-      return this.spans[index].children.length > 0;
-    },
-    toggleExpand(index) {
-      if (!this.hasChildrenSpans(index)) return;
-
-      this.$set(this.expanded, index, !this.isExpanded(index));
-    },
-    isExpanded(index) {
-      return this.expanded[index];
-    },
-    durationWrapperStyle(span) {
-      const l = Math.floor((100 * span.startTimeMs) / this.traceDurationMs);
-      return {
-        marginLeft: `${l}%`,
-      };
-    },
-    durationLineStyle(span) {
-      const w = clamp((100 * span.durationMs) / this.traceDurationMs, 0.5, 100);
-      return {
-        width: `${w}%`,
-        height: '32px',
-        borderRadius: '4px',
-      };
-    },
-    durationValue(span) {
-      return formatDurationMs(span.durationMs);
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="span-tree">
-    <div
-      v-for="(span, index) in spans"
-      :key="span.span_id"
-      :data-testid="`span-container-${depth}-${index}`"
-    >
-      <div class="gl-display-flex gl-border-b gl-hover-bg-t-gray-a-08">
-        <div
-          data-testid="span-details"
-          class="gl-w-30p gl-min-w-20 gl-display-flex gl-flex-direction-row gl-p-3 gl-border-r"
-          :style="spanDetailsStyle"
-        >
-          <div>
-            <gl-button
-              class="gl-mr-1"
-              :class="{ invisible: !hasChildrenSpans(index) }"
-              :icon="`chevron-${isExpanded(index) ? 'down' : 'up'}`"
-              category="tertiary"
-              size="small"
-              @click="toggleExpand(index)"
-            />
-          </div>
-
-          <div class="gl-display-flex gl-flex-direction-column gl-text-truncate">
-            <gl-truncate
-              class="gl-font-weight-bold gl-text-primary"
-              :text="span.operation"
-              with-tooltip
-            />
-            <gl-truncate class="gl-text-secondary" :text="span.service" with-tooltip />
-          </div>
-        </div>
-
-        <div
-          class="gl-display-flex gl-flex-grow-1 gl-flex-direction-column gl-justify-content-center gl-px-4 gl-py-3"
-        >
-          <div :style="durationWrapperStyle(span)" data-testid="span-duration">
-            <div
-              data-testid="span-duration-bar"
-              :style="durationLineStyle(span)"
-              :class="`gl-bg-data-viz-${serviceToColor[span.service]}`"
-            ></div>
-            <span class="gl-text-secondary">{{ durationValue(span) }}</span>
-          </div>
-        </div>
-      </div>
-
-      <tracing-details-spans-chart
-        v-if="isExpanded(index)"
-        :spans="span.children"
-        :depth="depth + 1"
-        :trace-duration-ms="traceDurationMs"
-        :service-to-color="serviceToColor"
-      />
-    </div>
-  </div>
-</template>
diff --git a/app/assets/javascripts/tracing/components/tracing_empty_state.vue b/app/assets/javascripts/tracing/components/tracing_empty_state.vue
deleted file mode 100644
index f17060db6bc..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_empty_state.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<script>
-import EMPTY_TRACING_SVG from '@gitlab/svgs/dist/illustrations/monitoring/tracing.svg?url';
-import { GlEmptyState, GlButton } from '@gitlab/ui';
-import { s__ } from '~/locale';
-
-export default {
-  EMPTY_TRACING_SVG,
-  name: 'TracingEmptyState',
-  i18n: {
-    title: s__('Tracing|Get started with Tracing'),
-    description: s__('Tracing|Monitor your applications with GitLab Distributed Tracing.'),
-    enableButtonText: s__('Tracing|Enable'),
-  },
-  components: {
-    GlEmptyState,
-    GlButton,
-  },
-};
-</script>
-
-<template>
-  <gl-empty-state :title="$options.i18n.title" :svg-path="$options.EMPTY_TRACING_SVG">
-    <template #description>
-      <div>
-        <span>{{ $options.i18n.description }}</span>
-      </div>
-    </template>
-
-    <template #actions>
-      <gl-button variant="confirm" class="gl-mx-2 gl-mb-3" @click="$emit('enable-tracing')">
-        {{ $options.i18n.enableButtonText }}
-      </gl-button>
-    </template>
-  </gl-empty-state>
-</template>
diff --git a/app/assets/javascripts/tracing/components/tracing_list.vue b/app/assets/javascripts/tracing/components/tracing_list.vue
deleted file mode 100644
index 9f3efd0b4d3..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_list.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<script>
-import { GlLoadingIcon } from '@gitlab/ui';
-import { s__ } from '~/locale';
-import { createAlert } from '~/alert';
-import { visitUrl, joinPaths } from '~/lib/utils/url_utility';
-import UrlSync from '~/vue_shared/components/url_sync.vue';
-import {
-  queryToFilterObj,
-  filterObjToQuery,
-  filterObjToFilterToken,
-  filterTokensToFilterObj,
-} from '../filters';
-import TracingEmptyState from './tracing_empty_state.vue';
-import TracingTableList from './tracing_table_list.vue';
-import FilteredSearch from './tracing_list_filtered_search.vue';
-
-export default {
-  components: {
-    GlLoadingIcon,
-    TracingTableList,
-    TracingEmptyState,
-    FilteredSearch,
-    UrlSync,
-  },
-  props: {
-    observabilityClient: {
-      required: true,
-      type: Object,
-    },
-  },
-  data() {
-    return {
-      loading: true,
-      /**
-       * tracingEnabled: boolean | null.
-       * null identifies a state where we don't know if tracing is enabled or not (e.g. when fetching the status from the API fails)
-       */
-      tracingEnabled: null,
-      traces: [],
-      filters: queryToFilterObj(window.location.search),
-    };
-  },
-  computed: {
-    query() {
-      return filterObjToQuery(this.filters);
-    },
-    initialFilterValue() {
-      return filterObjToFilterToken(this.filters);
-    },
-  },
-  async created() {
-    this.checkEnabled();
-  },
-  methods: {
-    async checkEnabled() {
-      this.loading = true;
-      try {
-        this.tracingEnabled = await this.observabilityClient.isTracingEnabled();
-        if (this.tracingEnabled) {
-          await this.fetchTraces();
-        }
-      } catch (e) {
-        createAlert({
-          message: s__('Tracing|Failed to load page.'),
-        });
-      } finally {
-        this.loading = false;
-      }
-    },
-    async enableTracing() {
-      this.loading = true;
-      try {
-        await this.observabilityClient.enableTraces();
-        this.tracingEnabled = true;
-        await this.fetchTraces();
-      } catch (e) {
-        createAlert({
-          message: s__('Tracing|Failed to enable tracing.'),
-        });
-      } finally {
-        this.loading = false;
-      }
-    },
-    async fetchTraces() {
-      this.loading = true;
-      try {
-        const traces = await this.observabilityClient.fetchTraces(this.filters);
-        this.traces = traces;
-      } catch (e) {
-        createAlert({
-          message: s__('Tracing|Failed to load traces.'),
-        });
-      } finally {
-        this.loading = false;
-      }
-    },
-    selectTrace({ traceId }) {
-      visitUrl(joinPaths(window.location.pathname, traceId));
-    },
-    handleFilters(filterTokens) {
-      this.filters = filterTokensToFilterObj(filterTokens);
-      this.fetchTraces();
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <div v-if="loading" class="gl-py-5">
-      <gl-loading-icon size="lg" />
-    </div>
-
-    <template v-else-if="tracingEnabled !== null">
-      <tracing-empty-state v-if="tracingEnabled === false" @enable-tracing="enableTracing" />
-
-      <template v-else>
-        <filtered-search :initial-filters="initialFilterValue" @submit="handleFilters" />
-        <url-sync :query="query" />
-
-        <tracing-table-list :traces="traces" @reload="fetchTraces" @trace-selected="selectTrace" />
-      </template>
-    </template>
-  </div>
-</template>
diff --git a/app/assets/javascripts/tracing/components/tracing_list_filtered_search.vue b/app/assets/javascripts/tracing/components/tracing_list_filtered_search.vue
deleted file mode 100644
index d086f2d03ff..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_list_filtered_search.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<script>
-import { GlFilteredSearch, GlFilteredSearchToken } from '@gitlab/ui';
-import { s__ } from '~/locale';
-import {
-  OPERATORS_IS,
-  OPERATORS_IS_NOT,
-} from '~/vue_shared/components/filtered_search_bar/constants';
-import {
-  PERIOD_FILTER_TOKEN_TYPE,
-  SERVICE_NAME_FILTER_TOKEN_TYPE,
-  OPERATION_FILTER_TOKEN_TYPE,
-  TRACE_ID_FILTER_TOKEN_TYPE,
-  DURATION_MS_FILTER_TOKEN_TYPE,
-} from '../filters';
-
-export default {
-  availableTokens: [
-    {
-      title: s__('Tracing|Period'),
-      icon: 'clock',
-      type: PERIOD_FILTER_TOKEN_TYPE,
-      token: GlFilteredSearchToken,
-      operators: OPERATORS_IS,
-      unique: true,
-      options: [
-        { value: '1m', title: s__('Tracing|Last 1 minute') },
-        { value: '15m', title: s__('Tracing|Last 15 minutes') },
-        { value: '30m', title: s__('Tracing|Last 30 minutes') },
-        { value: '1h', title: s__('Tracing|Last 1 hour') },
-        { value: '24h', title: s__('Tracing|Last 24 hours') },
-        { value: '7d', title: s__('Tracing|Last 7 days') },
-        { value: '14d', title: s__('Tracing|Last 14 days') },
-        { value: '30d', title: s__('Tracing|Last 30 days') },
-      ],
-    },
-    {
-      title: s__('Tracing|Service'),
-      type: SERVICE_NAME_FILTER_TOKEN_TYPE,
-      token: GlFilteredSearchToken,
-      operators: OPERATORS_IS_NOT,
-    },
-    {
-      title: s__('Tracing|Operation'),
-      type: OPERATION_FILTER_TOKEN_TYPE,
-      token: GlFilteredSearchToken,
-      operators: OPERATORS_IS_NOT,
-    },
-    {
-      title: s__('Tracing|Trace ID'),
-      type: TRACE_ID_FILTER_TOKEN_TYPE,
-      token: GlFilteredSearchToken,
-      operators: OPERATORS_IS_NOT,
-    },
-    {
-      title: s__('Tracing|Duration (ms)'),
-      type: DURATION_MS_FILTER_TOKEN_TYPE,
-      token: GlFilteredSearchToken,
-      operators: [
-        { value: '>', description: s__('Tracing|longer than') },
-        { value: '<', description: s__('Tracing|shorter than') },
-      ],
-    },
-  ],
-  components: {
-    GlFilteredSearch,
-  },
-  props: {
-    initialFilters: {
-      type: Array,
-      required: false,
-      default: () => [],
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="vue-filtered-search-bar-container row-content-block gl-border-t-none">
-    <gl-filtered-search
-      :value="initialFilters"
-      terms-as-tokens
-      :placeholder="s__('Tracing|Filter Traces')"
-      :available-tokens="$options.availableTokens"
-      @submit="$emit('submit', $event)"
-    />
-  </div>
-</template>
diff --git a/app/assets/javascripts/tracing/components/tracing_table_list.vue b/app/assets/javascripts/tracing/components/tracing_table_list.vue
deleted file mode 100644
index ef66797c75d..00000000000
--- a/app/assets/javascripts/tracing/components/tracing_table_list.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<script>
-import { GlTable, GlLink, GlTruncate } from '@gitlab/ui';
-import { s__ } from '~/locale';
-import { formatDate } from '~/lib/utils/datetime/date_format_utility';
-import { formatTraceDuration } from './trace_utils';
-
-export const tableDataClass = 'gl-display-flex gl-md-display-table-cell gl-align-items-center';
-export default {
-  name: 'TracingTableList',
-  i18n: {
-    title: s__('Tracing|Traces'),
-    emptyText: s__('Tracing|No traces to display.'),
-    emptyLinkText: s__('Tracing|Check again'),
-  },
-  fields: [
-    {
-      key: 'timestamp',
-      label: s__('Tracing|Date'),
-      tdClass: tableDataClass,
-      sortable: true,
-    },
-    {
-      key: 'service_name',
-      label: s__('Tracing|Service'),
-      tdClass: tableDataClass,
-      sortable: true,
-    },
-    {
-      key: 'operation',
-      label: s__('Tracing|Operation'),
-      tdClass: tableDataClass,
-      sortable: true,
-    },
-    {
-      key: 'duration',
-      label: s__('Tracing|Duration'),
-      thClass: 'gl-w-15p',
-      tdClass: tableDataClass,
-      sortable: true,
-    },
-  ],
-  components: {
-    GlTable,
-    GlLink,
-    GlTruncate,
-  },
-  props: {
-    traces: {
-      required: true,
-      type: Array,
-    },
-  },
-  computed: {
-    formattedTraces() {
-      return this.traces.map((x) => ({
-        ...x,
-        timestamp: formatDate(x.timestamp),
-        duration: formatTraceDuration(x.duration_nano),
-      }));
-    },
-  },
-  methods: {
-    onSelect(items) {
-      if (items[0]) {
-        this.$emit('trace-selected', { traceId: items[0].trace_id });
-      }
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <h4 class="gl-display-block gl-md-display-none! gl-my-5">{{ $options.i18n.title }}</h4>
-
-    <gl-table
-      :items="formattedTraces"
-      :fields="$options.fields"
-      show-empty
-      sort-by="timestamp"
-      :sort-desc="true"
-      fixed
-      stacked="md"
-      tbody-tr-class="table-row"
-      selectable
-      select-mode="single"
-      selected-variant=""
-      @row-selected="onSelect"
-    >
-      <template #cell(service_name)="{ item }">
-        <gl-truncate :text="item.service_name" with-tooltip />
-      </template>
-
-      <template #cell(operation)="{ item }">
-        <gl-truncate :text="item.operation" with-tooltip />
-      </template>
-
-      <template #empty>
-        {{ $options.i18n.emptyText }}
-        <gl-link @click="$emit('reload')">{{ $options.i18n.emptyLinkText }}</gl-link>
-      </template>
-    </gl-table>
-  </div>
-</template>
diff --git a/app/assets/javascripts/tracing/details_index.vue b/app/assets/javascripts/tracing/details_index.vue
deleted file mode 100644
index 5702a88766c..00000000000
--- a/app/assets/javascripts/tracing/details_index.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script>
-import ObservabilityContainer from '~/observability/components/observability_container.vue';
-import TracingDetails from './components/tracing_details.vue';
-
-export default {
-  components: {
-    ObservabilityContainer,
-    TracingDetails,
-  },
-  props: {
-    traceId: {
-      type: String,
-      required: true,
-    },
-    oauthUrl: {
-      type: String,
-      required: true,
-    },
-    tracingUrl: {
-      type: String,
-      required: true,
-    },
-    provisioningUrl: {
-      type: String,
-      required: true,
-    },
-    tracingIndexUrl: {
-      required: true,
-      type: String,
-    },
-  },
-};
-</script>
-
-<template>
-  <observability-container
-    :oauth-url="oauthUrl"
-    :tracing-url="tracingUrl"
-    :provisioning-url="provisioningUrl"
-  >
-    <template #default="{ observabilityClient }">
-      <tracing-details
-        :trace-id="traceId"
-        :tracing-index-url="tracingIndexUrl"
-        :observability-client="observabilityClient"
-      />
-    </template>
-  </observability-container>
-</template>
diff --git a/app/assets/javascripts/tracing/filters.js b/app/assets/javascripts/tracing/filters.js
deleted file mode 100644
index 88a54b2e69f..00000000000
--- a/app/assets/javascripts/tracing/filters.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import {
-  filterToQueryObject,
-  urlQueryToFilter,
-  prepareTokens,
-  processFilters,
-} from '~/vue_shared/components/filtered_search_bar/filtered_search_utils';
-import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants';
-
-export const PERIOD_FILTER_TOKEN_TYPE = 'period';
-export const SERVICE_NAME_FILTER_TOKEN_TYPE = 'service-name';
-export const OPERATION_FILTER_TOKEN_TYPE = 'operation';
-export const TRACE_ID_FILTER_TOKEN_TYPE = 'trace-id';
-export const DURATION_MS_FILTER_TOKEN_TYPE = 'duration-ms';
-
-export function queryToFilterObj(url) {
-  const filter = urlQueryToFilter(url, {
-    filteredSearchTermKey: 'search',
-    customOperators: [
-      {
-        operator: '>',
-        prefix: 'gt',
-      },
-      {
-        operator: '<',
-        prefix: 'lt',
-      },
-    ],
-  });
-  const {
-    period = null,
-    service = null,
-    operation = null,
-    trace_id: traceId = null,
-    durationMs = null,
-  } = filter;
-  const search = filter[FILTERED_SEARCH_TERM];
-  return {
-    period,
-    service,
-    operation,
-    traceId,
-    durationMs,
-    search,
-  };
-}
-
-export function filterObjToQuery(filters) {
-  return filterToQueryObject(
-    {
-      period: filters.period,
-      service: filters.serviceName,
-      operation: filters.operation,
-      trace_id: filters.traceId,
-      durationMs: filters.durationMs,
-      [FILTERED_SEARCH_TERM]: filters.search,
-    },
-    {
-      filteredSearchTermKey: 'search',
-      customOperators: [
-        {
-          operator: '>',
-          prefix: 'gt',
-          applyOnlyToKey: 'durationMs',
-        },
-        {
-          operator: '<',
-          prefix: 'lt',
-          applyOnlyToKey: 'durationMs',
-        },
-      ],
-    },
-  );
-}
-
-export function filterObjToFilterToken(filters) {
-  return prepareTokens({
-    [PERIOD_FILTER_TOKEN_TYPE]: filters.period,
-    [SERVICE_NAME_FILTER_TOKEN_TYPE]: filters.serviceName,
-    [OPERATION_FILTER_TOKEN_TYPE]: filters.operation,
-    [TRACE_ID_FILTER_TOKEN_TYPE]: filters.traceId,
-    [DURATION_MS_FILTER_TOKEN_TYPE]: filters.durationMs,
-    [FILTERED_SEARCH_TERM]: filters.search,
-  });
-}
-
-export function filterTokensToFilterObj(tokens) {
-  const {
-    [SERVICE_NAME_FILTER_TOKEN_TYPE]: serviceName,
-    [PERIOD_FILTER_TOKEN_TYPE]: period,
-    [OPERATION_FILTER_TOKEN_TYPE]: operation,
-    [TRACE_ID_FILTER_TOKEN_TYPE]: traceId,
-    [DURATION_MS_FILTER_TOKEN_TYPE]: durationMs,
-    [FILTERED_SEARCH_TERM]: search,
-  } = processFilters(tokens);
-
-  return {
-    serviceName,
-    period,
-    operation,
-    traceId,
-    durationMs,
-    search,
-  };
-}
diff --git a/app/assets/javascripts/tracing/list_index.vue b/app/assets/javascripts/tracing/list_index.vue
deleted file mode 100644
index 432fbb81506..00000000000
--- a/app/assets/javascripts/tracing/list_index.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<script>
-import ObservabilityContainer from '~/observability/components/observability_container.vue';
-import TracingList from './components/tracing_list.vue';
-
-export default {
-  components: {
-    ObservabilityContainer,
-    TracingList,
-  },
-  props: {
-    oauthUrl: {
-      type: String,
-      required: true,
-    },
-    tracingUrl: {
-      type: String,
-      required: true,
-    },
-    provisioningUrl: {
-      type: String,
-      required: true,
-    },
-  },
-};
-</script>
-
-<template>
-  <observability-container
-    :oauth-url="oauthUrl"
-    :tracing-url="tracingUrl"
-    :provisioning-url="provisioningUrl"
-  >
-    <template #default="{ observabilityClient }">
-      <tracing-list :observability-client="observabilityClient" />
-    </template>
-  </observability-container>
-</template>
diff --git a/app/controllers/projects/tracing_controller.rb b/app/controllers/projects/tracing_controller.rb
deleted file mode 100644
index 45e773bf62b..00000000000
--- a/app/controllers/projects/tracing_controller.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Projects
-  class TracingController < Projects::ApplicationController
-    include ::Observability::ContentSecurityPolicy
-
-    feature_category :tracing
-
-    before_action :check_tracing_enabled
-
-    def index; end
-
-    def show
-      @trace_id = params[:id]
-    end
-
-    private
-
-    def check_tracing_enabled
-      render_404 unless Gitlab::Observability.tracing_enabled?(project)
-    end
-  end
-end
diff --git a/app/helpers/projects/observability_helper.rb b/app/helpers/projects/observability_helper.rb
deleted file mode 100644
index 4515fdb1bc3..00000000000
--- a/app/helpers/projects/observability_helper.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Projects
-  module ObservabilityHelper
-    def observability_tracing_view_model(project)
-      Gitlab::Json.generate({
-        tracingUrl: Gitlab::Observability.tracing_url(project),
-        provisioningUrl: Gitlab::Observability.provisioning_url(project),
-        oauthUrl: Gitlab::Observability.oauth_url
-      })
-    end
-
-    def observability_tracing_details_model(project, trace_id)
-      Gitlab::Json.generate({
-        tracingIndexUrl: namespace_project_tracing_index_path(project.group, project),
-        traceId: trace_id,
-        tracingUrl: Gitlab::Observability.tracing_url(project),
-        provisioningUrl: Gitlab::Observability.provisioning_url(project),
-        oauthUrl: Gitlab::Observability.oauth_url
-      })
-    end
-  end
-end
diff --git a/app/views/layouts/service_desk.html.haml b/app/views/layouts/service_desk.html.haml
index 13e9785317c..e9c5d51c674 100644
--- a/app/views/layouts/service_desk.html.haml
+++ b/app/views/layouts/service_desk.html.haml
@@ -24,11 +24,5 @@
         %br
         = link_to "Unsubscribe", @unsubscribe_url
 
-        -# EE-specific start
-        - if Gitlab::CurrentSettings.email_additional_text.present?
-          %br
-          %br
-            = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
-        -# EE-specific end
-
+        = render_if_exists 'layouts/email_additional_text'
         = html_footer_message
diff --git a/app/views/projects/tracing/index.html.haml b/app/views/projects/tracing/index.html.haml
deleted file mode 100644
index ae6608cf343..00000000000
--- a/app/views/projects/tracing/index.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- page_title _('Tracing')
-
-#js-tracing{ data: { view_model: observability_tracing_view_model(@project) } }
-
diff --git a/app/views/projects/tracing/show.html.haml b/app/views/projects/tracing/show.html.haml
deleted file mode 100644
index 77915430da2..00000000000
--- a/app/views/projects/tracing/show.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-- @no_container = true
-
-- page_title _('Trace Details')
-- add_to_breadcrumbs _('Tracing'), project_tracing_index_path(@project)
-
-#js-tracing-details{ data: { view_model: observability_tracing_details_model(@project, @trace_id) } }
-
diff --git a/app/views/repository_check_mailer/notify.html.haml b/app/views/repository_check_mailer/notify.html.haml
index dfcd1c6b19f..d6c57b98ea9 100644
--- a/app/views/repository_check_mailer/notify.html.haml
+++ b/app/views/repository_check_mailer/notify.html.haml
@@ -7,4 +7,4 @@
 %p
   = _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url }
 
-= render_if_exists 'repository_check_mailer/email_additional_text'
+= render_if_exists 'shared/additional_email_text'
diff --git a/app/views/repository_check_mailer/notify.text.haml b/app/views/repository_check_mailer/notify.text.haml
index a2e04fa710f..dc316d3e2be 100644
--- a/app/views/repository_check_mailer/notify.text.haml
+++ b/app/views/repository_check_mailer/notify.text.haml
@@ -4,4 +4,4 @@
 
 = _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url }
 
-= render_if_exists 'repository_check_mailer/email_additional_text'
+= render_if_exists 'shared/additional_email_text'
diff --git a/config/routes/project.rb b/config/routes/project.rb
index a4b513fc33e..e7242f1ecee 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -383,8 +383,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :tracing, only: [:index, :show], controller: :tracing
-
         namespace :design_management do
           namespace :designs, path: 'designs/:design_id(/:sha)', constraints: -> (params) { params[:sha].nil? || Gitlab::Git.commit_id?(params[:sha]) } do
             resource :raw_image, only: :show
diff --git a/doc/administration/auditor_users.md b/doc/administration/auditor_users.md
index 3078c27d5f6..2befb01f096 100644
--- a/doc/administration/auditor_users.md
+++ b/doc/administration/auditor_users.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/atlassian.md b/doc/administration/auth/atlassian.md
index cbfb4921e14..639e285ead2 100644
--- a/doc/administration/auth/atlassian.md
+++ b/doc/administration/auth/atlassian.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 554b3d776ac..7d1b98d16d1 100644
--- a/doc/administration/auth/cognito.md
+++ b/doc/administration/auth/cognito.md
@@ -1,6 +1,6 @@
 ---
 type: concepts, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 6ced9f844cd..590d38bf67a 100644
--- a/doc/administration/auth/crowd.md
+++ b/doc/administration/auth/crowd.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 4e96cdf0411..4526a74c1f8 100644
--- a/doc/administration/auth/index.md
+++ b/doc/administration/auth/index.md
@@ -1,6 +1,6 @@
 ---
 type: index
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 9f95682fc47..0d33fca1fa2 100644
--- a/doc/administration/auth/jwt.md
+++ b/doc/administration/auth/jwt.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 388288bbe49..1d0b082a80f 100644
--- a/doc/administration/auth/ldap/google_secure_ldap.md
+++ b/doc/administration/auth/ldap/google_secure_ldap.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 aea25c95337..d2c27fe35b4 100644
--- a/doc/administration/auth/ldap/index.md
+++ b/doc/administration/auth/ldap/index.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 a4384a0691a..c5624235a76 100644
--- a/doc/administration/auth/ldap/ldap-troubleshooting.md
+++ b/doc/administration/auth/ldap/ldap-troubleshooting.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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_synchronization.md b/doc/administration/auth/ldap/ldap_synchronization.md
index b8b323bcbd1..e95876a8b3c 100644
--- a/doc/administration/auth/ldap/ldap_synchronization.md
+++ b/doc/administration/auth/ldap/ldap_synchronization.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 1f76818a510..f3200aea67b 100644
--- a/doc/administration/auth/oidc.md
+++ b/doc/administration/auth/oidc.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 1662639dd29..855157321d7 100644
--- a/doc/administration/auth/smartcard.md
+++ b/doc/administration/auth/smartcard.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/administration/auth/test_oidc_oauth.md b/doc/administration/auth/test_oidc_oauth.md
index be0ea5c963e..eba911dcb33 100644
--- a/doc/administration/auth/test_oidc_oauth.md
+++ b/doc/administration/auth/test_oidc_oauth.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/credentials_inventory.md b/doc/administration/credentials_inventory.md
index 235d69ec454..221ab8360ea 100644
--- a/doc/administration/credentials_inventory.md
+++ b/doc/administration/credentials_inventory.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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/external_users.md b/doc/administration/external_users.md
index 3a848fa406d..56a6debb7b1 100644
--- a/doc/administration/external_users.md
+++ b/doc/administration/external_users.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index 3389801291e..b3633efcd13 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -174,8 +174,7 @@ http://secondary.example.com/
                          Health Status: Healthy
                           Repositories: succeeded 12345 / total 12345 (100%)
                  Verified Repositories: succeeded 12345 / total 12345 (100%)
-                                 Wikis: succeeded 6789 / total 6789 (100%)
-                        Verified Wikis: succeeded 6789 / total 6789 (100%)
+             Project Wiki Repositories: succeeded 6789 / total 6789 (100%)
                            Attachments: succeeded 4 / total 4 (100%)
                       CI job artifacts: succeeded 0 / total 0 (0%)
                    Design repositories: succeeded 1 / total 1 (100%)
@@ -192,6 +191,7 @@ http://secondary.example.com/
      Terraform State Versions Verified: succeeded 0 / total 10 (0%)
          Snippet Repositories Verified: succeeded 99 / total 100 (99%)
            Pipeline Artifacts Verified: succeeded 0 / total 10 (0%)
+    Project Wiki Repositories Verified: succeeded 6789 / total 6789 (100%)
                          Sync Settings: Full
               Database replication lag: 0 seconds
        Last event ID seen from primary: 12345 (about 2 minutes ago)
diff --git a/doc/administration/integration/diagrams_net.md b/doc/administration/integration/diagrams_net.md
index 5c19fe4391b..13be572d524 100644
--- a/doc/administration/integration/diagrams_net.md
+++ b/doc/administration/integration/diagrams_net.md
@@ -7,6 +7,9 @@ type: reference, howto
 
 # Diagrams.net **(FREE SELF)**
 
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86206) in GitLab 15.10.
+> - Offline environment support [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116281) in GitLab 16.1.
+
 With the [diagrams.net](https://www.diagrams.net/) integration, you can create and embed SVG diagrams in wikis.
 The diagram editor is available in both the plain text editor and the rich text editor.
 
diff --git a/doc/administration/moderate_users.md b/doc/administration/moderate_users.md
index dd892de9bec..3095f696978 100644
--- a/doc/administration/moderate_users.md
+++ b/doc/administration/moderate_users.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index a1c98b37bed..3839c68be85 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -250,18 +250,12 @@ configuration option in `gitlab.yml`. These metrics are served from the
 | `geo_job_artifacts_synced_missing_on_primary`  | Gauge   | 10.7  | Number of job artifacts marked as synced due to the file missing on the primary | `url` |
 | `geo_repositories_checksummed`                 | Gauge   | 10.7  | Number of repositories checksummed on primary | `url` |
 | `geo_repositories_checksum_failed`             | Gauge   | 10.7  | Number of repositories failed to calculate the checksum on primary | `url` |
-| `geo_wikis_checksummed`                        | Gauge   | 10.7  | Number of wikis checksummed on primary | `url` |
-| `geo_wikis_checksum_failed`                    | Gauge   | 10.7  | Number of wikis failed to calculate the checksum on primary | `url` |
 | `geo_repositories_verified`                    | Gauge   | 10.7  | Number of repositories successfully verified on secondary | `url` |
 | `geo_repositories_verification_failed`         | Gauge   | 10.7  | Number of repositories that failed verification on secondary | `url` |
 | `geo_repositories_checksum_mismatch`           | Gauge   | 10.7  | Number of repositories that checksum mismatch on secondary | `url` |
-| `geo_wikis_verified`                           | Gauge   | 10.7  | Number of wikis successfully verified on secondary | `url` |
-| `geo_wikis_verification_failed`                | Gauge   | 10.7  | Number of wikis that failed verification on secondary | `url` |
-| `geo_wikis_checksum_mismatch`                  | Gauge   | 10.7  | Number of wikis that checksum mismatch on secondary | `url` |
 | `geo_repositories_checked`                     | Gauge   | 11.1  | Number of repositories that have been checked via `git fsck` | `url` |
 | `geo_repositories_checked_failed`              | Gauge   | 11.1  | Number of repositories that have a failure from `git fsck` | `url` |
 | `geo_repositories_retrying_verification`       | Gauge   | 11.2  | Number of repositories verification failures that Geo is actively trying to correct on secondary  | `url` |
-| `geo_wikis_retrying_verification`              | Gauge   | 11.2  | Number of wikis verification failures that Geo is actively trying to correct on secondary | `url` |
 | `geo_package_files`                            | Gauge   | 13.0  | Number of package files on primary | `url` |
 | `geo_package_files_checksummed`                | Gauge   | 13.0  | Number of package files checksummed on primary | `url` |
 | `geo_package_files_checksum_failed`            | Gauge   | 13.0  | Number of package files failed to calculate the checksum on primary | `url` |
diff --git a/doc/administration/raketasks/ldap.md b/doc/administration/raketasks/ldap.md
index 4a657b04bdc..e6700288631 100644
--- a/doc/administration/raketasks/ldap.md
+++ b/doc/administration/raketasks/ldap.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/external_authorization.md b/doc/administration/settings/external_authorization.md
index 23ec75a9bb5..2d110dc2ea7 100644
--- a/doc/administration/settings/external_authorization.md
+++ b/doc/administration/settings/external_authorization.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 0d02a9c40e8..3669d79a953 100644
--- a/doc/administration/settings/rate_limit_on_users_api.md
+++ b/doc/administration/settings/rate_limit_on_users_api.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/scim_setup.md b/doc/administration/settings/scim_setup.md
index 72ef20de587..6028abf6eab 100644
--- a/doc/administration/settings/scim_setup.md
+++ b/doc/administration/settings/scim_setup.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/user_settings.md b/doc/administration/user_settings.md
index 43e88bf6eac..2cf04822722 100644
--- a/doc/administration/user_settings.md
+++ b/doc/administration/user_settings.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/access_requests.md b/doc/api/access_requests.md
index 341cb768154..bd4c4df5660 100644
--- a/doc/api/access_requests.md
+++ b/doc/api/access_requests.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: "To 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/appearance.md b/doc/api/appearance.md
index 94fb092c739..4018e787acf 100644
--- a/doc/api/appearance.md
+++ b/doc/api/appearance.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/applications.md b/doc/api/applications.md
index f597e1acc44..9875dfab96d 100644
--- a/doc/api/applications.md
+++ b/doc/api/applications.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/avatar.md b/doc/api/avatar.md
index 68031a05f43..98e644d9ae9 100644
--- a/doc/api/avatar.md
+++ b/doc/api/avatar.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/geo_nodes.md b/doc/api/geo_nodes.md
index 4ec57274bd7..33c4a36e770 100644
--- a/doc/api/geo_nodes.md
+++ b/doc/api/geo_nodes.md
@@ -343,10 +343,6 @@ Example response:
     "repositories_failed_count": null,
     "repositories_synced_count": null,
     "repositories_synced_in_percentage": "0.00%",
-    "wikis_count": 41,
-    "wikis_failed_count": null,
-    "wikis_synced_count": null,
-    "wikis_synced_in_percentage": "0.00%",
     "replication_slots_count": 1,
     "replication_slots_used_count": 1,
     "replication_slots_used_in_percentage": "100.00%",
@@ -357,19 +353,11 @@ Example response:
     "repositories_checksummed_count": 20,
     "repositories_checksum_failed_count": 5,
     "repositories_checksummed_in_percentage": "48.78%",
-    "wikis_checksummed_count": 10,
-    "wikis_checksum_failed_count": 3,
-    "wikis_checksummed_in_percentage": "24.39%",
     "repositories_verified_count": 20,
     "repositories_verification_failed_count": 5,
     "repositories_verified_in_percentage": "48.78%",
     "repositories_checksum_mismatch_count": 3,
-    "wikis_verified_count": 10,
-    "wikis_verification_failed_count": 3,
-    "wikis_verified_in_percentage": "24.39%",
-    "wikis_checksum_mismatch_count": 1,
     "repositories_retrying_verification_count": 1,
-    "wikis_retrying_verification_count": 3,
     "last_event_id": 23,
     "last_event_timestamp": 1509681166,
     "cursor_last_event_id": null,
@@ -619,10 +607,6 @@ Example response:
     "repositories_failed_count": 1,
     "repositories_synced_count": 40,
     "repositories_synced_in_percentage": "97.56%",
-    "wikis_count": 41,
-    "wikis_failed_count": 0,
-    "wikis_synced_count": 41,
-    "wikis_synced_in_percentage": "100.00%",
     "replication_slots_count": null,
     "replication_slots_used_count": null,
     "replication_slots_used_in_percentage": "0.00%",
@@ -630,19 +614,11 @@ Example response:
     "repositories_checksummed_count": 20,
     "repositories_checksum_failed_count": 5,
     "repositories_checksummed_in_percentage": "48.78%",
-    "wikis_checksummed_count": 10,
-    "wikis_checksum_failed_count": 3,
-    "wikis_checksummed_in_percentage": "24.39%",
     "repositories_verified_count": 20,
     "repositories_verification_failed_count": 5,
     "repositories_verified_in_percentage": "48.78%",
     "repositories_checksum_mismatch_count": 3,
-    "wikis_verified_count": 10,
-    "wikis_verification_failed_count": 3,
-    "wikis_verified_in_percentage": "24.39%",
-    "wikis_checksum_mismatch_count": 1,
     "repositories_retrying_verification_count": 4,
-    "wikis_retrying_verification_count": 2,
     "repositories_checked_count": 5,
     "repositories_checked_failed_count": 1,
     "repositories_checked_in_percentage": "12.20%",
@@ -850,10 +826,6 @@ Example response:
   "repositories_failed_count": 1,
   "repositories_synced_count": 40,
   "repositories_synced_in_percentage": "97.56%",
-  "wikis_count": 41,
-  "wikis_failed_count": 0,
-  "wikis_synced_count": 41,
-  "wikis_synced_in_percentage": "100.00%",
   "replication_slots_count": null,
   "replication_slots_used_count": null,
   "replication_slots_used_in_percentage": "0.00%",
diff --git a/doc/api/geo_sites.md b/doc/api/geo_sites.md
index ff06f668514..f1c56983328 100644
--- a/doc/api/geo_sites.md
+++ b/doc/api/geo_sites.md
@@ -296,25 +296,15 @@ Example response:
     "repositories_replication_enabled": null,
     "repositories_synced_count": null,
     "repositories_failed_count": null,
-    "wikis_synced_count": null,
-    "wikis_failed_count": null,
     "repositories_verified_count": null,
     "repositories_verification_failed_count": null,
     "repositories_verification_total_count": null,
-    "wikis_verified_count": null,
-    "wikis_verification_failed_count": null,
-    "wikis_verification_total_count": null,
     "job_artifacts_synced_missing_on_primary_count": null,
     "repositories_checksummed_count": 19,
     "repositories_checksum_failed_count": 0,
     "repositories_checksum_mismatch_count": null,
     "repositories_checksum_total_count": 19,
-    "wikis_checksummed_count": 0,
-    "wikis_checksum_failed_count": 0,
-    "wikis_checksum_mismatch_count": null,
-    "wikis_checksum_total_count": 19,
     "repositories_retrying_verification_count": null,
-    "wikis_retrying_verification_count": null,
     "projects_count": 19,
     "container_repositories_replication_enabled": null,
     "design_repositories_replication_enabled": null,
@@ -479,9 +469,6 @@ Example response:
     "repositories_checksummed_in_percentage": "100.00%",
     "repositories_verified_in_percentage": "0.00%",
     "repositories_checked_in_percentage": "0.00%",
-    "wikis_synced_in_percentage": "0.00%",
-    "wikis_checksummed_in_percentage": "0.00%",
-    "wikis_verified_in_percentage": "0.00%",
     "replication_slots_used_in_percentage": "100.00%",
     "design_repositories_synced_in_percentage": "0.00%",
     "lfs_objects_synced_in_percentage": "0.00%",
@@ -515,7 +502,6 @@ Example response:
     "project_wiki_repositories_synced_in_percentage": "0.00%",
     "project_wiki_repositories_verified_in_percentage": "0.00%",
     "repositories_count": 19,
-    "wikis_count": 19,
     "replication_slots_count": 1,
     "replication_slots_used_count": 1,
     "healthy": true,
@@ -548,25 +534,15 @@ Example response:
     "repositories_replication_enabled": true,
     "repositories_synced_count": 18,
     "repositories_failed_count": 0,
-    "wikis_synced_count": 18,
-    "wikis_failed_count": 0,
     "repositories_verified_count": 0,
     "repositories_verification_failed_count": 0,
     "repositories_verification_total_count": 19,
-    "wikis_verified_count": 0,
-    "wikis_verification_failed_count": 0,
-    "wikis_verification_total_count": 19,
     "job_artifacts_synced_missing_on_primary_count": null,
     "repositories_checksummed_count": null,
     "repositories_checksum_failed_count": null,
     "repositories_checksum_mismatch_count": 0,
     "repositories_checksum_total_count": null,
-    "wikis_checksummed_count": null,
-    "wikis_checksum_failed_count": null,
-    "wikis_checksum_mismatch_count": 0,
-    "wikis_checksum_total_count": null,
     "repositories_retrying_verification_count": 0,
-    "wikis_retrying_verification_count": 0,
     "projects_count": 19,
     "container_repositories_replication_enabled": null,
     "design_repositories_replication_enabled": true,
@@ -731,9 +707,6 @@ Example response:
     "repositories_checksummed_in_percentage": "0.00%",
     "repositories_verified_in_percentage": "0.00%",
     "repositories_checked_in_percentage": "0.00%",
-    "wikis_synced_in_percentage": "94.74%",
-    "wikis_checksummed_in_percentage": "0.00%",
-    "wikis_verified_in_percentage": "0.00%",
     "replication_slots_used_in_percentage": "0.00%",
     "design_repositories_synced_in_percentage": "0.00%",
     "lfs_objects_synced_in_percentage": "0.00%",
@@ -767,7 +740,6 @@ Example response:
     "project_wiki_repositories_synced_in_percentage": "100.00%",
     "project_wiki_repositories_verified_in_percentage": "100.00%",
     "repositories_count": 19,
-    "wikis_count": 19,
     "replication_slots_count": null,
     "replication_slots_used_count": null,
     "healthy": false,
@@ -816,25 +788,15 @@ Example response:
   "repositories_replication_enabled": true,
   "repositories_synced_count": 18,
   "repositories_failed_count": 0,
-  "wikis_synced_count": 18,
-  "wikis_failed_count": 0,
   "repositories_verified_count": 0,
   "repositories_verification_failed_count": 0,
   "repositories_verification_total_count": 19,
-  "wikis_verified_count": 0,
-  "wikis_verification_failed_count": 0,
-  "wikis_verification_total_count": 19,
   "job_artifacts_synced_missing_on_primary_count": null,
   "repositories_checksummed_count": null,
   "repositories_checksum_failed_count": null,
   "repositories_checksum_mismatch_count": 0,
   "repositories_checksum_total_count": null,
-  "wikis_checksummed_count": null,
-  "wikis_checksum_failed_count": null,
-  "wikis_checksum_mismatch_count": 0,
-  "wikis_checksum_total_count": null,
   "repositories_retrying_verification_count": 0,
-  "wikis_retrying_verification_count": 0,
   "projects_count": 19,
   "container_repositories_replication_enabled": null,
   "design_repositories_replication_enabled": true,
@@ -999,9 +961,6 @@ Example response:
   "repositories_checksummed_in_percentage": "0.00%",
   "repositories_verified_in_percentage": "0.00%",
   "repositories_checked_in_percentage": "0.00%",
-  "wikis_synced_in_percentage": "94.74%",
-  "wikis_checksummed_in_percentage": "0.00%",
-  "wikis_verified_in_percentage": "0.00%",
   "replication_slots_used_in_percentage": "0.00%",
   "design_repositories_synced_in_percentage": "0.00%",
   "lfs_objects_synced_in_percentage": "0.00%",
@@ -1035,7 +994,6 @@ Example response:
   "project_wiki_repositories_synced_in_percentage": "100.00%",
   "project_wiki_repositories_verified_in_percentage": "100.00%",
   "repositories_count": 19,
-  "wikis_count": 19,
   "replication_slots_count": null,
   "replication_slots_used_count": null,
   "healthy": false,
diff --git a/doc/api/graphql/users_example.md b/doc/api/graphql/users_example.md
index 2234528c52a..0fd61689b8e 100644
--- a/doc/api/graphql/users_example.md
+++ b/doc/api/graphql/users_example.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/group_access_tokens.md b/doc/api/group_access_tokens.md
index 0488473c5d1..b99c91d2e5c 100644
--- a/doc/api/group_access_tokens.md
+++ b/doc/api/group_access_tokens.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/member_roles.md b/doc/api/member_roles.md
index 311f43bcebf..1bc91793445 100644
--- a/doc/api/member_roles.md
+++ b/doc/api/member_roles.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/members.md b/doc/api/members.md
index 3a350de4188..189c6321b3a 100644
--- a/doc/api/members.md
+++ b/doc/api/members.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/namespaces.md b/doc/api/namespaces.md
index 1ede530578b..569fcc3d644 100644
--- a/doc/api/namespaces.md
+++ b/doc/api/namespaces.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/oauth2.md b/doc/api/oauth2.md
index 75b50829ddd..00e8a4c86c6 100644
--- a/doc/api/oauth2.md
+++ b/doc/api/oauth2.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/plan_limits.md b/doc/api/plan_limits.md
index 53dedca3312..789acf46205 100644
--- a/doc/api/plan_limits.md
+++ b/doc/api/plan_limits.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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_access_tokens.md b/doc/api/project_access_tokens.md
index e3d0767595b..793eb49c767 100644
--- a/doc/api/project_access_tokens.md
+++ b/doc/api/project_access_tokens.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/saml.md b/doc/api/saml.md
index a44e1537f1e..60fd549f84f 100644
--- a/doc/api/saml.md
+++ b/doc/api/saml.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/scim.md b/doc/api/scim.md
index 94662250313..5fec030c110 100644
--- a/doc/api/scim.md
+++ b/doc/api/scim.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/settings.md b/doc/api/settings.md
index 31fe0293622..284539ab022 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/statistics.md b/doc/api/statistics.md
index 691b03505a7..b60b012e339 100644
--- a/doc/api/statistics.md
+++ b/doc/api/statistics.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/users.md b/doc/api/users.md
index 2a40bd44757..58d852961d3 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/development/cascading_settings.md b/doc/development/cascading_settings.md
index 42f4b5dd6f3..16ad7b3eab6 100644
--- a/doc/development/cascading_settings.md
+++ b/doc/development/cascading_settings.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/development/permissions.md b/doc/development/permissions.md
index aa58447b818..35fd0f1c440 100644
--- a/doc/development/permissions.md
+++ b/doc/development/permissions.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/development/permissions/authorizations.md b/doc/development/permissions/authorizations.md
index 8d8944562a8..7580b7c473b 100644
--- a/doc/development/permissions/authorizations.md
+++ b/doc/development/permissions/authorizations.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/development/permissions/custom_roles.md b/doc/development/permissions/custom_roles.md
index 337c8f6d96b..d317d943cd3 100644
--- a/doc/development/permissions/custom_roles.md
+++ b/doc/development/permissions/custom_roles.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/development/permissions/predefined_roles.md b/doc/development/permissions/predefined_roles.md
index 9afc5966e93..62d6c1d92e2 100644
--- a/doc/development/permissions/predefined_roles.md
+++ b/doc/development/permissions/predefined_roles.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/development/policies.md b/doc/development/policies.md
index 38f1fc54bf4..faf5b32985f 100644
--- a/doc/development/policies.md
+++ b/doc/development/policies.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/alicloud.md b/doc/integration/alicloud.md
index 9054341960f..3984deb303a 100644
--- a/doc/integration/alicloud.md
+++ b/doc/integration/alicloud.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/auth0.md b/doc/integration/auth0.md
index e6a6853cdef..a6577a3eb89 100644
--- a/doc/integration/auth0.md
+++ b/doc/integration/auth0.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/azure.md b/doc/integration/azure.md
index 08ca19a950b..71f6c2cf3a0 100644
--- a/doc/integration/azure.md
+++ b/doc/integration/azure.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/bitbucket.md b/doc/integration/bitbucket.md
index 7fad67116f3..0e880c79b7a 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/cas.md b/doc/integration/cas.md
index d2a29161a53..f4aa1a06b81 100644
--- a/doc/integration/cas.md
+++ b/doc/integration/cas.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 remove_date: '2023-08-15'
diff --git a/doc/integration/ding_talk.md b/doc/integration/ding_talk.md
index 005bf0a3244..91727ba5398 100644
--- a/doc/integration/ding_talk.md
+++ b/doc/integration/ding_talk.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/facebook.md b/doc/integration/facebook.md
index 0ff640306c3..299b1e53ff2 100644
--- a/doc/integration/facebook.md
+++ b/doc/integration/facebook.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/github.md b/doc/integration/github.md
index df9a0db961b..0de7e463944 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/gitlab.md b/doc/integration/gitlab.md
index 92709d974aa..8162d011395 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/google.md b/doc/integration/google.md
index 5bba50c940a..5ef47c79e2d 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/kerberos.md b/doc/integration/kerberos.md
index 15acd4e7b90..9139c374780 100644
--- a/doc/integration/kerberos.md
+++ b/doc/integration/kerberos.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: "To 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/oauth2_generic.md b/doc/integration/oauth2_generic.md
index 00a50489793..5595a45fe3e 100644
--- a/doc/integration/oauth2_generic.md
+++ b/doc/integration/oauth2_generic.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/oauth_provider.md b/doc/integration/oauth_provider.md
index 8a3a7f4cea5..232ff6cb360 100644
--- a/doc/integration/oauth_provider.md
+++ b/doc/integration/oauth_provider.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/omniauth.md b/doc/integration/omniauth.md
index b832a9b21a2..6add3534593 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/openid_connect_provider.md b/doc/integration/openid_connect_provider.md
index dffa81f067f..c9c208bf1c1 100644
--- a/doc/integration/openid_connect_provider.md
+++ b/doc/integration/openid_connect_provider.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/salesforce.md b/doc/integration/salesforce.md
index 3a90a4570e6..a1df213d9dc 100644
--- a/doc/integration/salesforce.md
+++ b/doc/integration/salesforce.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 e4ad8c33aa1..5e70a27e52a 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index 859b5682879..c392864e346 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 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
 ---
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index ed83db0d4eb..6491df1ec56 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/asset_proxy.md b/doc/security/asset_proxy.md
index cde377cbb73..16051d22bd6 100644
--- a/doc/security/asset_proxy.md
+++ b/doc/security/asset_proxy.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/crime_vulnerability.md b/doc/security/crime_vulnerability.md
index fdf3e5055b0..2c9969ab707 100644
--- a/doc/security/crime_vulnerability.md
+++ b/doc/security/crime_vulnerability.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/security/hardening.md b/doc/security/hardening.md
index 21b8594fc6e..9c222e5c758 100644
--- a/doc/security/hardening.md
+++ b/doc/security/hardening.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 310355bb594..bb89737cc92 100644
--- a/doc/security/hardening_application_recommendations.md
+++ b/doc/security/hardening_application_recommendations.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 16b649cbdd7..72a3699868b 100644
--- a/doc/security/hardening_cicd_recommendations.md
+++ b/doc/security/hardening_cicd_recommendations.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 1cc3294f68b..e8cae41c535 100644
--- a/doc/security/hardening_configuration_recommendations.md
+++ b/doc/security/hardening_configuration_recommendations.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 a227f0134d0..3c50196f9bc 100644
--- a/doc/security/hardening_general_concepts.md
+++ b/doc/security/hardening_general_concepts.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 33f88d43d22..80eea9b5085 100644
--- a/doc/security/hardening_operating_system_recommendations.md
+++ b/doc/security/hardening_operating_system_recommendations.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 5365228537f..c07acd7a5a3 100644
--- a/doc/security/index.md
+++ b/doc/security/index.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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
diff --git a/doc/security/information_exclusivity.md b/doc/security/information_exclusivity.md
index 21e4ad8b108..a0d7b425a23 100644
--- a/doc/security/information_exclusivity.md
+++ b/doc/security/information_exclusivity.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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
diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md
index a13c591fefc..c7ebd713240 100644
--- a/doc/security/password_length_limits.md
+++ b/doc/security/password_length_limits.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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
diff --git a/doc/security/password_storage.md b/doc/security/password_storage.md
index e814f4e5069..71e7510513e 100644
--- a/doc/security/password_storage.md
+++ b/doc/security/password_storage.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/security/passwords_for_integrated_authentication_methods.md b/doc/security/passwords_for_integrated_authentication_methods.md
index a141241f97c..c7d94120887 100644
--- a/doc/security/passwords_for_integrated_authentication_methods.md
+++ b/doc/security/passwords_for_integrated_authentication_methods.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/security/rate_limits.md b/doc/security/rate_limits.md
index 45e55dee56b..936e2931ff5 100644
--- a/doc/security/rate_limits.md
+++ b/doc/security/rate_limits.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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
diff --git a/doc/security/reset_user_password.md b/doc/security/reset_user_password.md
index 5f2554f59b6..4a59d2f9a21 100644
--- a/doc/security/reset_user_password.md
+++ b/doc/security/reset_user_password.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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/security/responding_to_security_incidents.md b/doc/security/responding_to_security_incidents.md
index 0cd7170d35b..b5e38ce55ca 100644
--- a/doc/security/responding_to_security_incidents.md
+++ b/doc/security/responding_to_security_incidents.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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
diff --git a/doc/security/ssh_keys_restrictions.md b/doc/security/ssh_keys_restrictions.md
index e5c1067fc8a..90affd089f3 100644
--- a/doc/security/ssh_keys_restrictions.md
+++ b/doc/security/ssh_keys_restrictions.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 8c4c2bc3ad4..bceb10023a4 100644
--- a/doc/security/token_overview.md
+++ b/doc/security/token_overview.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md
index e0042277b99..0c569e9843d 100644
--- a/doc/security/two_factor_authentication.md
+++ b/doc/security/two_factor_authentication.md
@@ -1,6 +1,6 @@
 ---
 type: howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 5d6a52a612d..b2c8624b057 100644
--- a/doc/security/unlock_user.md
+++ b/doc/security/unlock_user.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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/security/user_email_confirmation.md b/doc/security/user_email_confirmation.md
index c0ed0e7e82f..56445903d6c 100644
--- a/doc/security/user_email_confirmation.md
+++ b/doc/security/user_email_confirmation.md
@@ -1,6 +1,6 @@
 ---
 type: howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 ad19cc62f4c..6ddda281a03 100644
--- a/doc/security/user_file_uploads.md
+++ b/doc/security/user_file_uploads.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 58815396ed2..f8bd50bc4b3 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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
diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md
index 6137ade4559..8ca4247924b 100644
--- a/doc/topics/authentication/index.md
+++ b/doc/topics/authentication/index.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/policies/scan-execution-policies.md b/doc/user/application_security/policies/scan-execution-policies.md
index 59aa880ff9f..5dae0ca1b93 100644
--- a/doc/user/application_security/policies/scan-execution-policies.md
+++ b/doc/user/application_security/policies/scan-execution-policies.md
@@ -113,11 +113,6 @@ This rule enforces the defined actions whenever the pipeline runs for a selected
 
 > - The `branch_type` field was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/404774) in GitLab 16.1 [with a flag](../../../administration/feature_flags.md) named `security_policies_branch_type`. Disabled by default.
 > - The `branch_type` field was [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/413062) in GitLab 16.2.
-> - The security policy bot users were [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/394958) in GitLab 16.3 [with flag](../../../administration/feature_flags.md) named `scan_execution_group_bot_users`. Enabled by default.
-
-FLAG:
-On self-managed GitLab, security policy bot users are available. To hide the feature, an administrator can [disable the feature flag](../../../administration/feature_flags.md) named `scan_execution_group_bot_users`.
-On GitLab.com, this feature is available.
 
 This rule schedules a scan pipeline, enforcing the defined actions on the schedule defined in the `cadence` field. A scheduled pipeline does not run other jobs defined in the project's `.gitlab-ci.yml` file. When a project is linked to a security policy project, a security policy bot is created in the project and will become the author of any scheduled pipelines.
 
diff --git a/doc/user/enterprise_user/index.md b/doc/user/enterprise_user/index.md
index c3c106e7fcc..04683620ba9 100644
--- a/doc/user/enterprise_user/index.md
+++ b/doc/user/enterprise_user/index.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/user/group/saml_sso/example_saml_config.md b/doc/user/group/saml_sso/example_saml_config.md
index c5f84510c57..70e01e1d9a9 100644
--- a/doc/user/group/saml_sso/example_saml_config.md
+++ b/doc/user/group/saml_sso/example_saml_config.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To determine 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 --git a/doc/user/group/saml_sso/group_sync.md b/doc/user/group/saml_sso/group_sync.md
index dd8d9d5f481..335c989c85f 100644
--- a/doc/user/group/saml_sso/group_sync.md
+++ b/doc/user/group/saml_sso/group_sync.md
@@ -1,6 +1,6 @@
 ---
 type: reference, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/index.md b/doc/user/group/saml_sso/index.md
index 5f630f27724..734679cf331 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md
index a10436d5e6e..a9b9bf26444 100644
--- a/doc/user/group/saml_sso/scim_setup.md
+++ b/doc/user/group/saml_sso/scim_setup.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 9344a875868..4ccb942250c 100644
--- a/doc/user/group/saml_sso/troubleshooting.md
+++ b/doc/user/group/saml_sso/troubleshooting.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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_scim.md b/doc/user/group/saml_sso/troubleshooting_scim.md
index 4a66719b020..63d10f3e932 100644
--- a/doc/user/group/saml_sso/troubleshooting_scim.md
+++ b/doc/user/group/saml_sso/troubleshooting_scim.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 e5166661a33..2bd6215263e 100644
--- a/doc/user/group/settings/group_access_tokens.md
+++ b/doc/user/group/settings/group_access_tokens.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: "To determine 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
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 2b9f61f5edc..e3422b3f9d5 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 b26925e38b2..c3612b787ac 100644
--- a/doc/user/profile/account/create_accounts.md
+++ b/doc/user/profile/account/create_accounts.md
@@ -1,6 +1,6 @@
 ---
 type: reference
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 b31dd5facc1..cf6ee61660f 100644
--- a/doc/user/profile/account/delete_account.md
+++ b/doc/user/profile/account/delete_account.md
@@ -1,6 +1,6 @@
 ---
 type: howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index 83bdf883510..c2b02f143db 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/index.md b/doc/user/profile/index.md
index d8aa5074775..828f37cbf43 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -1,6 +1,6 @@
 ---
 type: index, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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 9161f5d4cf6..aa6b0f61c7e 100644
--- a/doc/user/profile/personal_access_tokens.md
+++ b/doc/user/profile/personal_access_tokens.md
@@ -1,6 +1,6 @@
 ---
 type: concepts, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/service_accounts.md b/doc/user/profile/service_accounts.md
index 62cad791eed..761d269d504 100644
--- a/doc/user/profile/service_accounts.md
+++ b/doc/user/profile/service_accounts.md
@@ -1,6 +1,6 @@
 ---
 type: index, howto
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/user_passwords.md b/doc/user/profile/user_passwords.md
index d8604bc712e..7882502a588 100644
--- a/doc/user/profile/user_passwords.md
+++ b/doc/user/profile/user_passwords.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md
index fdaa11a26d6..88f6917d4b6 100644
--- a/doc/user/project/repository/gpg_signed_commits/index.md
+++ b/doc/user/project/repository/gpg_signed_commits/index.md
@@ -7,13 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Sign commits with GPG **(FREE ALL)**
 
 You can sign the commits you make in a GitLab repository with a
-GPG ([GNU Privacy Guard](https://gnupg.org/)) key. When you add a cryptographic
-signature to your commit, you provide extra assurance that a commit
-originated from you, rather than an impersonator. If GitLab can verify a commit
-author's identity with a public GPG key, the commit is marked **Verified** in the
-GitLab UI. You can then configure [push rules](../push_rules.md)
-for your project to reject individual commits not signed with GPG, or reject all
-commits from unverified users.
+GPG ([GNU Privacy Guard](https://gnupg.org/)) key.
 
 NOTE:
 GitLab uses the term GPG for all OpenPGP, PGP, and GPG-related material and
@@ -174,7 +168,7 @@ you can sign individual commits manually, or configure Git to default to signed
      ```
 
   1. Enter the passphrase of your GPG key when asked.
-  1. Push to GitLab and check that your commits [are verified](#verify-commits).
+  1. Push to GitLab and check that your commits [are verified](../signed_commits/index.md#verify-commits).
 - Sign all Git commits by default by running this command:
 
   ```shell
@@ -222,29 +216,6 @@ Prerequisites:
    gpgsign = true
    ```
 
-## Verify commits
-
-You can review commits for a merge request, or for an entire project:
-
-1. To review commits for a project:
-   1. On the left sidebar, select **Search or go to** and find your project.
-   1. Select **Code > Commits**.
-1. To review commits for a merge request:
-   1. On the left sidebar, select **Search or go to** and find your project.
-   1. Select **Code > Merge requests**, then select your merge request.
-   1. Select **Commits**.
-1. Identify the commit you want to review. Signed commits show either a **Verified**
-   or **Unverified** badge, depending on the verification status of the GPG
-   signature. Unsigned commits do not display a badge:
-
-   ![Signed and unsigned commits](img/project_signed_and_unsigned_commits.png)
-
-1. To display the signature details for a commit, select the GPG badge:
-
-   ![Signed commit with verified signature](img/project_signed_commit_verified_signature.png)
-
-   ![Signed commit with unverified signature](img/project_signed_commit_unverified_signature.png)
-
 ## Revoke a GPG key
 
 If a GPG key becomes compromised, revoke it. Revoking a key changes both future and past commits:
@@ -279,9 +250,6 @@ If you must unverify both future and past commits,
 
 ## Related topics
 
-- [Sign commits and tags with X.509 certificates](../x509_signed_commits/index.md)
-- [Sign commits with SSH keys](../ssh_signed_commits/index.md)
-- [Commits API](../../../../api/commits.md)
 - GPG resources:
   - [Git Tools - Signing Your Work](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work)
   - [Managing OpenPGP Keys](https://riseup.net/en/security/message-security/openpgp/gpg-keys)
@@ -291,20 +259,6 @@ If you must unverify both future and past commits,
 
 ## Troubleshooting
 
-### Fix verification problems with signed commits
-
-Commits can be signed with [X.509 certificates](../x509_signed_commits/index.md)
-or a GPG key. The verification process for both methods can fail for multiple reasons:
-
-| Value                       | Description | Possible Fixes |
-|-----------------------------|-------------|----------------|
-| `UNVERIFIED`                | The commit signature is not valid. | Sign the commit with a valid signature. |
-| `SAME_USER_DIFFERENT_EMAIL` | The GPG key used to sign the commit does not contain the committer email, but does contain a different valid email for the committer. | Amend the commit to use an email address that matches the GPG key, or update the GPG key [to include the email address](https://security.stackexchange.com/a/261468). |
-| `OTHER_USER`                | The signature and GPG key are valid, but the key belongs to a different user than the committer. | Amend the commit to use the correct email address, or amend the commit to use a GPG key associated with your user. |
-| `UNVERIFIED_KEY`            | The key associated with the GPG signature has no verified email address associated with the committer. | Add and verify the email to your GitLab profile, [update the GPG key to include the email address](https://security.stackexchange.com/a/261468), or amend the commit to use a different committer email address. |
-| `UNKNOWN_KEY`               | The GPG key associated with the GPG signature for this commit is unknown to GitLab. | [Add the GPG key](#add-a-gpg-key-to-your-account) to your GitLab profile. |
-| `MULTIPLE_SIGNATURES`       | Multiple GPG or X.509 signatures have been found for the commit. | Amend the commit to use only one GPG or X.509 signature. |
-
 ### Secret key not available
 
 If you receive the errors `secret key not available`
diff --git a/doc/user/project/repository/signed_commits/index.md b/doc/user/project/repository/signed_commits/index.md
new file mode 100644
index 00000000000..148e775f161
--- /dev/null
+++ b/doc/user/project/repository/signed_commits/index.md
@@ -0,0 +1,64 @@
+---
+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
+---
+
+# Signed commits **(FREE ALL)**
+
+When you add a cryptographic signature to your commit, you provide extra assurance that a commit
+originated from you, rather than an impersonator. If GitLab can verify a commit
+author's identity with a public GPG key, the commit is marked **Verified** in the
+GitLab UI. You can then configure [push rules](../push_rules.md)
+for your project to reject individual commits not signed with GPG, or reject all
+commits from unverified users.
+
+Sign commits with your:
+
+- [SSH key](../ssh_signed_commits/index.md).
+- [GPG key](../gpg_signed_commits/index.md).
+- [Personal x.509 certificate](../x509_signed_commits/index.md).
+
+## Verify commits
+
+You can review commits for a merge request, or for an entire project, to confirm
+they are signed:
+
+1. To review commits for a project:
+   1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
+   1. Select **Code > Commits**.
+1. To review commits for a merge request:
+   1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
+   1. On the left sidebar, select **Merge requests**, then select your merge request.
+   1. Select **Commits**.
+1. Identify the commit you want to review. Signed commits show either a **Verified**
+   or **Unverified** badge, depending on the verification status of the signature.
+   Unsigned commits do not display a badge:
+
+   ![Signed and unsigned commits](../gpg_signed_commits/img/project_signed_and_unsigned_commits.png)
+
+1. To display the signature details for a commit, select **Verified** to see
+   the fingerprint or key ID:
+
+   ![Signed commit with verified signature](../gpg_signed_commits/img/project_signed_commit_verified_signature.png)
+
+   ![Signed commit with unverified signature](../gpg_signed_commits/img/project_signed_commit_unverified_signature.png)
+
+You can also [use the Commits API](../../../../api/commits.md#get-gpg-signature-of-a-commit)
+to check a commit's signature.
+
+## Troubleshooting
+
+### Fix verification problems with signed commits
+
+The verification process for commits signed with GPG keys or X.509 certificates
+can fail for multiple reasons:
+
+| Value                       | Description | Possible Fixes |
+|-----------------------------|-------------|----------------|
+| `UNVERIFIED`                | The commit signature is not valid. | Sign the commit with a valid signature. |
+| `SAME_USER_DIFFERENT_EMAIL` | The GPG key used to sign the commit does not contain the committer email, but does contain a different valid email for the committer. | Amend the commit to use an email address that matches the GPG key, or update the GPG key [to include the email address](https://security.stackexchange.com/a/261468). |
+| `OTHER_USER`                | The signature and GPG key are valid, but the key belongs to a different user than the committer. | Amend the commit to use the correct email address, or amend the commit to use a GPG key associated with your user. |
+| `UNVERIFIED_KEY`            | The key associated with the GPG signature has no verified email address associated with the committer. | Add and verify the email to your GitLab profile, [update the GPG key to include the email address](https://security.stackexchange.com/a/261468), or amend the commit to use a different committer email address. |
+| `UNKNOWN_KEY`               | The GPG key associated with the GPG signature for this commit is unknown to GitLab. | [Add the GPG key](../gpg_signed_commits/index.md#add-a-gpg-key-to-your-account) to your GitLab profile. |
+| `MULTIPLE_SIGNATURES`       | Multiple GPG or X.509 signatures have been found for the commit. | Amend the commit to use only one GPG or X.509 signature. |
diff --git a/doc/user/project/repository/ssh_signed_commits/index.md b/doc/user/project/repository/ssh_signed_commits/index.md
index 86cb7097faf..0e16bead064 100644
--- a/doc/user/project/repository/ssh_signed_commits/index.md
+++ b/doc/user/project/repository/ssh_signed_commits/index.md
@@ -9,10 +9,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/343879) in GitLab 15.7 [with a flag](../../../../administration/feature_flags.md) named `ssh_commit_signatures`. Enabled by default.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/384202) in GitLab 15.8. Feature flag `ssh_commit_signatures` removed.
 
-Use SSH keys to sign Git commits in the same manner as
-[GPG signed commits](../gpg_signed_commits/index.md). When you sign commits
-with SSH keys, GitLab uses the SSH public keys associated with your
-GitLab account to cryptographically verify the commit signature.
+When you sign commits with SSH keys, GitLab uses the SSH public keys associated
+with your GitLab account to cryptographically verify the commit signature.
 If successful, GitLab displays a **Verified** label on the commit.
 
 You may use the same SSH keys for `git+ssh` authentication to GitLab
@@ -89,23 +87,11 @@ To sign a commit:
 
 ## Verify commits
 
-You can review commits for a merge request, or for an entire project, to confirm
-they are signed:
+You can verify all types of signed commits
+[in the GitLab UI](../signed_commits/index.md#verify-commits). Commits signed
+with an SSH key can also be verified locally.
 
-1. To review commits for a project:
-   1. On the left sidebar, select **Search or go to** and find your project.
-   1. Select **Code > Commits**.
-1. To review commits for a merge request:
-   1. On the left sidebar, select **Search or go to** and find your project.
-   1. On the left sidebar, select **Merge requests**, then select your merge request.
-   1. Select **Commits**.
-1. Identify the commit you want to review. Signed commits show either a **Verified**
-   or **Unverified** badge, depending on the verification status of the signature.
-   Unsigned commits do not display a badge.
-1. To display the signature details for a commit, select **Verified**. GitLab shows
-   the SSH key's fingerprint.
-
-## Verify commits locally
+### Verify commits locally
 
 To verify commits locally, create an
 [allowed signers file](https://man7.org/linux/man-pages/man1/ssh-keygen.1.html#ALLOWED_SIGNERS)
diff --git a/doc/user/project/repository/x509_signed_commits/index.md b/doc/user/project/repository/x509_signed_commits/index.md
index 20860718b43..5bd2e590b52 100644
--- a/doc/user/project/repository/x509_signed_commits/index.md
+++ b/doc/user/project/repository/x509_signed_commits/index.md
@@ -6,8 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Sign commits and tags with X.509 certificates **(FREE ALL)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773) in GitLab 12.8.
-
 [X.509](https://en.wikipedia.org/wiki/X.509) is a standard format for public key
 certificates issued by a public or private Public Key Infrastructure (PKI).
 Personal X.509 certificates are used for authentication or signing purposes
@@ -160,13 +158,11 @@ can start signing your tags:
 ## Related topics
 
 - [Rake task for X.509 signatures](../../../../raketasks/x509_signatures.md)
-- [Sign commits with GPG](../gpg_signed_commits/index.md)
-- [Sign commits with SSH keys](../ssh_signed_commits/index.md)
 
 ## Troubleshooting
 
 For committers without administrator access, review the list of
-[verification problems with signed commits](../gpg_signed_commits/index.md#fix-verification-problems-with-signed-commits)
+[verification problems with signed commits](../signed_commits/index.md#fix-verification-problems-with-signed-commits)
 for possible fixes. The other troubleshooting suggestions on this page require
 administrator access.
 
diff --git a/doc/user/project/settings/project_access_tokens.md b/doc/user/project/settings/project_access_tokens.md
index 58cb919283e..8dd29306efa 100644
--- a/doc/user/project/settings/project_access_tokens.md
+++ b/doc/user/project/settings/project_access_tokens.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: "To determine 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
diff --git a/doc/user/ssh.md b/doc/user/ssh.md
index 36c93182bac..a322c3ce3db 100644
--- a/doc/user/ssh.md
+++ b/doc/user/ssh.md
@@ -1,5 +1,5 @@
 ---
-stage: Manage
+stage: Govern
 group: Authentication and Authorization
 info: To 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/gitlab/observability.rb b/lib/gitlab/observability.rb
index da329749064..a4e18cc170b 100644
--- a/lib/gitlab/observability.rb
+++ b/lib/gitlab/observability.rb
@@ -27,10 +27,6 @@ module Gitlab
       "#{Gitlab::Observability.observability_url}/v1/auth/start"
     end
 
-    def tracing_url(project)
-      "#{Gitlab::Observability.observability_url}/query/#{project.group.id}/#{project.id}/v1/traces"
-    end
-
     def provisioning_url(project)
       "#{Gitlab::Observability.observability_url}/v3/tenant/#{project.id}"
     end
@@ -45,11 +41,6 @@ module Gitlab
       Feature.enabled?(:observability_group_tab)
     end
 
-    # Returns true if Tracing UI is enabled
-    def tracing_enabled?(project)
-      Feature.enabled?(:observability_tracing, project)
-    end
-
     # Returns the embeddable Observability URL of a given URL
     #
     #  - Validates the URL
@@ -162,3 +153,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Observability.prepend_mod_with('Gitlab::Observability')
diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb
index 87b09e42fe1..a74448d0bdc 100644
--- a/lib/sidebars/projects/menus/monitor_menu.rb
+++ b/lib/sidebars/projects/menus/monitor_menu.rb
@@ -8,7 +8,6 @@ module Sidebars
         def configure_menu_items
           return false unless feature_enabled?
 
-          add_item(tracing_menu_item)
           add_item(error_tracking_menu_item)
           add_item(alert_management_menu_item)
           add_item(incidents_menu_item)
@@ -63,20 +62,6 @@ module Sidebars
           )
         end
 
-        def tracing_menu_item
-          unless Gitlab::Observability.tracing_enabled?(context.project)
-            return ::Sidebars::NilMenuItem.new(item_id: :tracing)
-          end
-
-          ::Sidebars::MenuItem.new(
-            title: _('Tracing'),
-            link: project_tracing_index_path(context.project),
-            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::MonitorMenu,
-            active_routes: { controller: :tracing },
-            item_id: :tracing
-          )
-        end
-
         def alert_management_menu_item
           unless can?(context.current_user, :read_alert_management_alert, context.project)
             return ::Sidebars::NilMenuItem.new(item_id: :alert_management)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 16ac3f8043c..c05c87986e3 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -11551,9 +11551,15 @@ msgstr ""
 msgid "CodeSuggestions|Enable Code Suggestions"
 msgstr ""
 
+msgid "CodeSuggestions|Enhance your coding experience with intelligent recommendations. %{linkStart}Code Suggestions%{linkEnd} uses generative AI to suggest code while you're developing. Not available for users with the Guest role."
+msgstr ""
+
 msgid "CodeSuggestions|Get code suggestions as you write code in your IDE. %{link_start}Learn more%{link_end}."
 msgstr ""
 
+msgid "CodeSuggestions|Introducing the Code Suggestions add-on"
+msgstr ""
+
 msgid "CodeSuggestions|Projects in this group can use Code Suggestions"
 msgstr ""
 
@@ -18020,9 +18026,6 @@ msgstr ""
 msgid "Enhance security by storing service account keys in secret managers - learn more about %{docLinkStart}secret management with GitLab%{docLinkEnd}"
 msgstr ""
 
-msgid "Enhance your coding experience with intelligent recommendations. %{linkStart}Code Suggestions%{linkEnd} uses generative AI to suggest code while you're developing. Not available for users with the Guest role."
-msgstr ""
-
 msgid "Ensure your %{linkStart}environment is part of the deploy stage%{linkEnd} of your CI pipeline to track deployments to your cluster."
 msgstr ""
 
@@ -40707,6 +40710,9 @@ msgstr ""
 msgid "Runners|Minor version upgrades are available."
 msgstr ""
 
+msgid "Runners|Most recent failures"
+msgstr ""
+
 msgid "Runners|Multiple tags must be separated by a comma. For example, %{example}."
 msgstr ""
 
@@ -41076,6 +41082,9 @@ msgstr ""
 msgid "Runners|The unique ID for each runner that uses this configuration."
 msgstr ""
 
+msgid "Runners|There are no recent runner failures for your instance runners. Error messages will populate here if runners fail."
+msgstr ""
+
 msgid "Runners|There are no runners running jobs right now. Active runners will populate here as they pick up jobs."
 msgstr ""
 
@@ -49759,6 +49768,18 @@ msgstr ""
 msgid "Tracing|Service"
 msgstr ""
 
+msgid "Tracing|Span Details"
+msgstr ""
+
+msgid "Tracing|Span ID"
+msgstr ""
+
+msgid "Tracing|Status Code"
+msgstr ""
+
+msgid "Tracing|Toggle children spans"
+msgstr ""
+
 msgid "Tracing|Trace ID"
 msgstr ""
 
diff --git a/spec/frontend/tracing/components/trace_utils_spec.js b/spec/frontend/tracing/components/trace_utils_spec.js
deleted file mode 100644
index ba2e360b0fc..00000000000
--- a/spec/frontend/tracing/components/trace_utils_spec.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import _ from 'lodash';
-import {
-  mapTraceToTreeRoot,
-  durationNanoToMs,
-  formatDurationMs,
-  formatTraceDuration,
-  assignColorToServices,
-} from '~/tracing/components/trace_utils';
-
-describe('trace_utils', () => {
-  describe('durationNanoToMs', () => {
-    it('converts a duration value from nano to ms', () => {
-      expect(durationNanoToMs(1000000001)).toBe(1000000);
-    });
-  });
-
-  describe('formatDurationMs', () => {
-    it('formats a duration ms value', () => {
-      expect(formatDurationMs(1000)).toBe('1000 ms');
-    });
-  });
-
-  describe('formatTraceDuration', () => {
-    it('formats the trace duration nano value', () => {
-      expect(formatTraceDuration(1000000001)).toBe('1000000 ms');
-    });
-  });
-
-  describe('assignColorToService', () => {
-    it('should assign the right palette', () => {
-      const trace = { duration_nane: 100000, spans: [] };
-      trace.spans = _.times(31).map((i) => ({
-        timestamp: '2023-08-07T15:03:32.199806Z',
-        span_id: `SPAN-${i}`,
-        trace_id: 'TRACE-1',
-        service_name: `service-${i}`,
-        operation: 'op',
-        duration_nano: 100000,
-        parent_span_id: '',
-      }));
-
-      expect(assignColorToServices(trace)).toEqual({
-        'service-0': 'blue-500',
-        'service-1': 'orange-500',
-        'service-2': 'aqua-500',
-        'service-3': 'green-500',
-        'service-4': 'magenta-500',
-        'service-5': 'blue-600',
-        'service-6': 'orange-600',
-        'service-7': 'aqua-600',
-        'service-8': 'green-600',
-        'service-9': 'magenta-600',
-        'service-10': 'blue-700',
-        'service-11': 'orange-700',
-        'service-12': 'aqua-700',
-        'service-13': 'green-700',
-        'service-14': 'magenta-700',
-        'service-15': 'blue-800',
-        'service-16': 'orange-800',
-        'service-17': 'aqua-800',
-        'service-18': 'green-800',
-        'service-19': 'magenta-800',
-        'service-20': 'blue-900',
-        'service-21': 'orange-900',
-        'service-22': 'aqua-900',
-        'service-23': 'green-900',
-        'service-24': 'magenta-900',
-        'service-25': 'blue-950',
-        'service-26': 'orange-950',
-        'service-27': 'aqua-950',
-        'service-28': 'green-950',
-        'service-29': 'magenta-950',
-        // restart pallete
-        'service-30': 'blue-500',
-      });
-    });
-  });
-
-  describe('mapTraceToTreeRoot', () => {
-    it('should map a trace data to tree data and return the root node', () => {
-      const trace = {
-        spans: [
-          {
-            timestamp: '2023-08-07T15:03:32.199806Z',
-            span_id: 'SPAN-1',
-            trace_id: 'TRACE-1',
-            service_name: 'tracegen',
-            operation: 'lets-go',
-            duration_nano: 100120000,
-            parent_span_id: '',
-          },
-          {
-            timestamp: '2023-08-07T15:03:32.199871Z',
-            span_id: 'SPAN-2',
-            trace_id: 'TRACE-1',
-            service_name: 'tracegen',
-            operation: 'okey-dokey',
-            duration_nano: 100055000,
-            parent_span_id: 'SPAN-1',
-          },
-          {
-            timestamp: '2023-08-07T15:03:53.199871Z',
-            span_id: 'SPAN-3',
-            trace_id: 'TRACE-1',
-            service_name: 'tracegen',
-            operation: 'okey-dokey',
-            duration_nano: 50027500,
-            parent_span_id: 'SPAN-2',
-          },
-          {
-            timestamp: '2023-08-07T15:03:53.199871Z',
-            span_id: 'SPAN-4',
-            trace_id: 'TRACE-1',
-            service_name: 'fake-service-2',
-            operation: 'okey-dokey',
-            duration_nano: 50027500,
-            parent_span_id: 'SPAN-2',
-          },
-        ],
-        duration_nano: 3000000,
-      };
-
-      expect(mapTraceToTreeRoot(trace)).toEqual({
-        durationMs: 100120,
-        operation: 'lets-go',
-        service: 'tracegen',
-        spanId: 'SPAN-1',
-        startTimeMs: 0,
-        timestamp: '2023-08-07T15:03:32.199806Z',
-        children: [
-          {
-            durationMs: 100055,
-            operation: 'okey-dokey',
-            service: 'tracegen',
-            spanId: 'SPAN-2',
-            startTimeMs: 0,
-            timestamp: '2023-08-07T15:03:32.199871Z',
-            children: [
-              {
-                children: [],
-                durationMs: 50028,
-                operation: 'okey-dokey',
-                service: 'tracegen',
-                spanId: 'SPAN-3',
-                startTimeMs: 21000,
-                timestamp: '2023-08-07T15:03:53.199871Z',
-              },
-              {
-                children: [],
-                durationMs: 50028,
-                operation: 'okey-dokey',
-                service: 'fake-service-2',
-                spanId: 'SPAN-4',
-                startTimeMs: 21000,
-                timestamp: '2023-08-07T15:03:53.199871Z',
-              },
-            ],
-          },
-        ],
-      });
-    });
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_details_chart_spec.js b/spec/frontend/tracing/components/tracing_details_chart_spec.js
deleted file mode 100644
index 5062cbc5d9d..00000000000
--- a/spec/frontend/tracing/components/tracing_details_chart_spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import TracingDetailsChart from '~/tracing/components/tracing_details_chart.vue';
-import TracingDetailsSpansChart from '~/tracing/components/tracing_details_spans_chart.vue';
-import {
-  mapTraceToTreeRoot,
-  assignColorToServices,
-  durationNanoToMs,
-} from '~/tracing/components/trace_utils';
-
-jest.mock('~/tracing/components/trace_utils');
-
-describe('TracingDetailsChart', () => {
-  let wrapper;
-
-  const mockTrace = {
-    timestamp: '2023-08-07T15:03:32.199806Z',
-    trace_id: 'dabb7ae1-2501-8e57-18e1-30ab21a9ab19',
-    service_name: 'tracegen',
-    operation: 'lets-go',
-    statusCode: 'STATUS_CODE_UNSET',
-    duration_nano: 100120000,
-    spans: [
-      {
-        timestamp: '2023-08-07T15:03:32.199806Z',
-        span_id: 'A1FB81EB031B09E8',
-        trace_id: 'dabb7ae1-2501-8e57-18e1-30ab21a9ab19',
-        service_name: 'tracegen',
-        operation: 'lets-go',
-        duration_nano: 100120000,
-        parent_span_id: '',
-        statusCode: 'STATUS_CODE_UNSET',
-      },
-    ],
-  };
-
-  beforeEach(() => {
-    mapTraceToTreeRoot.mockReturnValue(mockTrace.spans[0]);
-    assignColorToServices.mockReturnValue({ tracegen: 'red' });
-    durationNanoToMs.mockReturnValue(100);
-
-    wrapper = shallowMountExtended(TracingDetailsChart, {
-      propsData: {
-        trace: mockTrace,
-      },
-    });
-  });
-
-  it('renders the TracingDetailsSpansChart component', () => {
-    expect(wrapper.findComponent(TracingDetailsSpansChart).exists()).toBe(true);
-  });
-
-  it('passes the correct props to the TracingDetailsSpansChart component', () => {
-    const tracingDetailsSpansChart = wrapper.findComponent(TracingDetailsSpansChart);
-
-    expect(mapTraceToTreeRoot).toHaveBeenCalledWith(mockTrace);
-
-    expect(tracingDetailsSpansChart.props('spans')).toEqual([mockTrace.spans[0]]);
-    expect(tracingDetailsSpansChart.props('traceDurationMs')).toBe(100);
-    expect(tracingDetailsSpansChart.props('serviceToColor')).toEqual({ tracegen: 'red' });
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_details_header_spec.js b/spec/frontend/tracing/components/tracing_details_header_spec.js
deleted file mode 100644
index 579b8babfe4..00000000000
--- a/spec/frontend/tracing/components/tracing_details_header_spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import TracingDetailsHeader from '~/tracing/components/tracing_details_header.vue';
-
-describe('TracingDetailsHeader', () => {
-  let wrapper;
-
-  beforeEach(() => {
-    wrapper = shallowMountExtended(TracingDetailsHeader, {
-      propsData: {
-        trace: {
-          service_name: 'Service',
-          operation: 'Operation',
-          timestamp: 1692021937219,
-          duration_nano: 1000000,
-          totalSpans: 10,
-        },
-      },
-    });
-  });
-
-  it('renders the correct title', () => {
-    expect(wrapper.find('h1').text()).toBe('Service : Operation');
-  });
-
-  it('renders the correct trace date', () => {
-    expect(wrapper.findByTestId('trace-date-card').text()).toMatchInterpolatedText(
-      'Trace Start Aug 14, 2023 14:05:37 UTC',
-    );
-  });
-
-  it('renders the correct trace duration', () => {
-    expect(wrapper.findByTestId('trace-duration-card').text()).toMatchInterpolatedText(
-      'Duration 1000 ms',
-    );
-  });
-
-  it('renders the correct total spans', () => {
-    expect(wrapper.findByTestId('trace-spans-card').text()).toMatchInterpolatedText(
-      'Total Spans 10',
-    );
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_details_span_chart_spec.js b/spec/frontend/tracing/components/tracing_details_span_chart_spec.js
deleted file mode 100644
index aaa02aef406..00000000000
--- a/spec/frontend/tracing/components/tracing_details_span_chart_spec.js
+++ /dev/null
@@ -1,181 +0,0 @@
-import { GlButton, GlTruncate } from '@gitlab/ui';
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import TracingDetailsSpansChart from '~/tracing/components/tracing_details_spans_chart.vue';
-
-describe('TracingDetailsSpansChart', () => {
-  const mockSpans = [
-    {
-      operation: 'operation-1',
-      service: 'service-1',
-      startTimeMs: 100,
-      durationMs: 150,
-      children: [
-        {
-          operation: 'operation-3',
-          service: 'service-3',
-          startTimeMs: 0,
-          durationMs: 100,
-          children: [],
-        },
-      ],
-    },
-    {
-      operation: 'operation-2',
-      service: 'service-2',
-      startTimeMs: 100,
-      durationMs: 200,
-      children: [],
-    },
-  ];
-
-  const mockProps = {
-    spans: mockSpans,
-    traceDurationMs: 300,
-    serviceToColor: {
-      'service-1': 'blue-500',
-      'service-2': 'orange-500',
-    },
-  };
-
-  let wrapper;
-
-  const getSpan = (index, depth = 0) => wrapper.findByTestId(`span-container-${depth}-${index}`);
-  const getSpanDetails = (index, depth = 0) =>
-    getSpan(index, depth).find('[data-testid="span-details"]');
-
-  const getToggleButton = (index, depth = 0) =>
-    getSpanDetails(index, depth).findComponent(GlButton);
-
-  const getSpanDuration = (index, depth = 0) =>
-    getSpan(index, depth).find('[data-testid="span-duration"]');
-
-  const getSpanDurationBar = (index, depth = 0) =>
-    getSpanDuration(index, depth).find('[data-testid="span-duration-bar"]');
-
-  beforeEach(() => {
-    wrapper = shallowMountExtended(TracingDetailsSpansChart, {
-      propsData: {
-        ...mockProps,
-      },
-    });
-  });
-
-  it('renders the correct number of spans', () => {
-    expect(wrapper.findAll('[data-testid^="span-container-"]')).toHaveLength(
-      mockProps.spans.length,
-    );
-  });
-
-  it('renders tracing-details-spans-chart only if span has children', () => {
-    const childrenChart = getSpan(0).findComponent(TracingDetailsSpansChart);
-
-    expect(childrenChart.exists()).toBe(true);
-    expect(childrenChart.props('depth')).toBe(1);
-    expect(childrenChart.props('traceDurationMs')).toBe(mockProps.traceDurationMs);
-    expect(childrenChart.props('serviceToColor')).toBe(mockProps.serviceToColor);
-    expect(childrenChart.props('spans')).toBe(mockProps.spans[0].children);
-
-    // span with no children
-    expect(getSpan(1).findComponent(TracingDetailsSpansChart).exists()).toBe(false);
-  });
-
-  it('toggle the children spans when clicking the expand button', async () => {
-    await getToggleButton(0).vm.$emit('click');
-
-    expect(getToggleButton(0).props('icon')).toBe('chevron-up');
-    expect(getSpan(0).findComponent(TracingDetailsSpansChart).exists()).toBe(false);
-
-    await getToggleButton(0).vm.$emit('click');
-
-    expect(getToggleButton(0).props('icon')).toBe('chevron-down');
-    expect(getSpan(0).findComponent(TracingDetailsSpansChart).exists()).toBe(true);
-  });
-
-  it('reset the expanded state when the spans change', async () => {
-    await getToggleButton(0).vm.$emit('click');
-    expect(getSpan(0).findComponent(TracingDetailsSpansChart).exists()).toBe(false);
-
-    await wrapper.setProps({ spans: [...mockSpans] });
-    expect(getSpan(0).findComponent(TracingDetailsSpansChart).exists()).toBe(true);
-  });
-
-  describe('span details', () => {
-    it('renders the spans details with left padding based on depth', () => {
-      wrapper = shallowMountExtended(TracingDetailsSpansChart, {
-        propsData: {
-          ...mockProps,
-          depth: 2,
-        },
-      });
-      expect(getSpanDetails(0, 2).element.style.paddingLeft).toBe('32px');
-    });
-
-    it('renders span operation and service name', () => {
-      const textContents = getSpanDetails(0).findAllComponents(GlTruncate);
-      expect(textContents.at(0).props('text')).toBe('operation-1');
-      expect(textContents.at(1).props('text')).toBe('service-1');
-    });
-
-    it('renders the expanded button', () => {
-      expect(getToggleButton(0).props('icon')).toBe('chevron-down');
-    });
-  });
-
-  describe('span duration', () => {
-    it('renders the duration value', () => {
-      expect(
-        wrapper.findByTestId('span-container-0-0').find('[data-testid="span-duration"]').text(),
-      ).toBe('150 ms');
-    });
-
-    it('renders the proper color based on service', () => {
-      expect(
-        wrapper
-          .findByTestId('span-container-0-0')
-          .find('[data-testid="span-duration-bar"]')
-          .classes(),
-      ).toContain('gl-bg-data-viz-blue-500');
-    });
-
-    it('renders the bar with the proper style', () => {
-      expect(getSpanDuration(0).element.style.marginLeft).toBe('33%');
-      expect(
-        getSpanDurationBar(0).find('[data-testid="span-duration-bar"]').element.style.width,
-      ).toBe('50%');
-    });
-
-    it('bar width should not be less than 0.5% and not bigger than 100%', () => {
-      wrapper = shallowMountExtended(TracingDetailsSpansChart, {
-        propsData: {
-          serviceToColor: {
-            'service-1': 'blue-500',
-            'service-2': 'orange-500',
-          },
-          traceDurationMs: 300,
-          spans: [
-            {
-              operation: 'operation-1',
-              service: 'service-1',
-              startTimeMs: 0,
-              durationMs: 1,
-              children: [],
-            },
-            {
-              operation: 'operation-2',
-              service: 'service-2',
-              startTimeMs: 0,
-              durationMs: 310,
-              children: [],
-            },
-          ],
-        },
-      });
-      expect(
-        getSpanDurationBar(0).find('[data-testid="span-duration-bar"]').element.style.width,
-      ).toBe('0.5%');
-      expect(
-        getSpanDurationBar(1).find('[data-testid="span-duration-bar"]').element.style.width,
-      ).toBe('100%');
-    });
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_details_spec.js b/spec/frontend/tracing/components/tracing_details_spec.js
deleted file mode 100644
index 1b0a450d7fa..00000000000
--- a/spec/frontend/tracing/components/tracing_details_spec.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import { GlLoadingIcon } from '@gitlab/ui';
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import TracingDetails from '~/tracing/components/tracing_details.vue';
-import waitForPromises from 'helpers/wait_for_promises';
-import { createAlert } from '~/alert';
-import { visitUrl, isSafeURL } from '~/lib/utils/url_utility';
-import TracingDetailsChart from '~/tracing/components/tracing_details_chart.vue';
-import TracingDetailsHeader from '~/tracing/components/tracing_details_header.vue';
-
-jest.mock('~/alert');
-jest.mock('~/lib/utils/url_utility');
-
-describe('TracingDetails', () => {
-  let wrapper;
-  let observabilityClientMock;
-
-  const TRACE_ID = 'test-trace-id';
-  const TRACING_INDEX_URL = 'https://www.gitlab.com/flightjs/Flight/-/tracing';
-
-  const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
-  const findTraceDetails = () => wrapper.findComponentByTestId('trace-details');
-
-  const props = {
-    traceId: TRACE_ID,
-    tracingIndexUrl: TRACING_INDEX_URL,
-  };
-
-  const mountComponent = async () => {
-    wrapper = shallowMountExtended(TracingDetails, {
-      propsData: {
-        ...props,
-        observabilityClient: observabilityClientMock,
-      },
-    });
-    await waitForPromises();
-  };
-
-  beforeEach(() => {
-    isSafeURL.mockReturnValue(true);
-
-    observabilityClientMock = {
-      isTracingEnabled: jest.fn(),
-      fetchTrace: jest.fn(),
-    };
-  });
-
-  it('renders the loading indicator while checking if tracing is enabled', () => {
-    mountComponent();
-
-    expect(findLoadingIcon().exists()).toBe(true);
-    expect(observabilityClientMock.isTracingEnabled).toHaveBeenCalled();
-  });
-
-  describe('when tracing is enabled', () => {
-    const mockTrace = { traceId: 'test-trace-id', foo: 'bar' };
-    beforeEach(async () => {
-      observabilityClientMock.isTracingEnabled.mockResolvedValueOnce(true);
-      observabilityClientMock.fetchTrace.mockResolvedValueOnce(mockTrace);
-
-      await mountComponent();
-    });
-
-    it('fetches the trace and renders the trace details', () => {
-      expect(observabilityClientMock.isTracingEnabled).toHaveBeenCalled();
-      expect(observabilityClientMock.fetchTrace).toHaveBeenCalled();
-      expect(findLoadingIcon().exists()).toBe(false);
-      expect(findTraceDetails().exists()).toBe(true);
-    });
-
-    it('renders the correct components', () => {
-      const details = findTraceDetails();
-      expect(details.findComponent(TracingDetailsChart).exists()).toBe(true);
-      expect(details.findComponent(TracingDetailsHeader).exists()).toBe(true);
-    });
-  });
-
-  describe('when tracing is not enabled', () => {
-    beforeEach(async () => {
-      observabilityClientMock.isTracingEnabled.mockResolvedValueOnce(false);
-
-      await mountComponent();
-    });
-
-    it('redirects to tracingIndexUrl', () => {
-      expect(visitUrl).toHaveBeenCalledWith(props.tracingIndexUrl);
-    });
-  });
-
-  describe('error handling', () => {
-    it('if isTracingEnabled fails, it renders an alert and empty page', async () => {
-      observabilityClientMock.isTracingEnabled.mockRejectedValueOnce('error');
-
-      await mountComponent();
-
-      expect(createAlert).toHaveBeenCalledWith({ message: 'Failed to load trace details.' });
-      expect(findLoadingIcon().exists()).toBe(false);
-      expect(findTraceDetails().exists()).toBe(false);
-    });
-
-    it('if fetchTrace fails, it renders an alert and empty page', async () => {
-      observabilityClientMock.isTracingEnabled.mockReturnValueOnce(true);
-      observabilityClientMock.fetchTrace.mockRejectedValueOnce('error');
-
-      await mountComponent();
-
-      expect(createAlert).toHaveBeenCalledWith({ message: 'Failed to load trace details.' });
-      expect(findLoadingIcon().exists()).toBe(false);
-      expect(findTraceDetails().exists()).toBe(false);
-    });
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_empty_state_spec.js b/spec/frontend/tracing/components/tracing_empty_state_spec.js
deleted file mode 100644
index d91c62a1dad..00000000000
--- a/spec/frontend/tracing/components/tracing_empty_state_spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { GlButton, GlEmptyState } from '@gitlab/ui';
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import TracingEmptyState from '~/tracing/components/tracing_empty_state.vue';
-
-describe('TracingEmptyState', () => {
-  let wrapper;
-
-  const findEnableButton = () => wrapper.findComponent(GlButton);
-
-  beforeEach(() => {
-    wrapper = shallowMountExtended(TracingEmptyState);
-  });
-
-  it('renders the component properly', () => {
-    expect(wrapper.exists()).toBe(true);
-  });
-
-  it('displays the correct title', () => {
-    const { title } = wrapper.findComponent(GlEmptyState).props();
-    expect(title).toBe('Get started with Tracing');
-  });
-
-  it('displays the correct description', () => {
-    const description = wrapper.find('span').text();
-    expect(description).toBe('Monitor your applications with GitLab Distributed Tracing.');
-  });
-
-  it('displays the enable button', () => {
-    const enableButton = findEnableButton();
-    expect(enableButton.exists()).toBe(true);
-    expect(enableButton.text()).toBe('Enable');
-  });
-
-  it('emits enable-tracing when enable button is clicked', () => {
-    findEnableButton().vm.$emit('click');
-
-    expect(wrapper.emitted('enable-tracing')).toHaveLength(1);
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_list_filtered_search_spec.js b/spec/frontend/tracing/components/tracing_list_filtered_search_spec.js
deleted file mode 100644
index ad15dd4a371..00000000000
--- a/spec/frontend/tracing/components/tracing_list_filtered_search_spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { GlFilteredSearch } from '@gitlab/ui';
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-
-import TracingListFilteredSearch from '~/tracing/components/tracing_list_filtered_search.vue';
-
-describe('TracingListFilteredSearch', () => {
-  let wrapper;
-  const initialFilters = [
-    { type: 'period', value: '1h' },
-    { type: 'service_name', value: 'example-service' },
-  ];
-  beforeEach(() => {
-    wrapper = shallowMountExtended(TracingListFilteredSearch, {
-      propsData: {
-        initialFilters,
-      },
-    });
-  });
-
-  it('renders the component', () => {
-    expect(wrapper.exists()).toBe(true);
-  });
-
-  it('sets initialFilters prop correctly', () => {
-    expect(wrapper.findComponent(GlFilteredSearch).props('value')).toEqual(initialFilters);
-  });
-
-  it('emits submit event on filtered search submit', () => {
-    wrapper
-      .findComponent(GlFilteredSearch)
-      .vm.$emit('submit', { filters: [{ type: 'period', value: '1h' }] });
-
-    expect(wrapper.emitted('submit')).toHaveLength(1);
-    expect(wrapper.emitted('submit')[0][0]).toEqual({
-      filters: [{ type: 'period', value: '1h' }],
-    });
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_list_spec.js b/spec/frontend/tracing/components/tracing_list_spec.js
deleted file mode 100644
index 63f1d09e5c0..00000000000
--- a/spec/frontend/tracing/components/tracing_list_spec.js
+++ /dev/null
@@ -1,216 +0,0 @@
-import { GlLoadingIcon } from '@gitlab/ui';
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import TracingList from '~/tracing/components/tracing_list.vue';
-import TracingEmptyState from '~/tracing/components/tracing_empty_state.vue';
-import TracingTableList from '~/tracing/components/tracing_table_list.vue';
-import waitForPromises from 'helpers/wait_for_promises';
-import { createAlert } from '~/alert';
-import * as urlUtility from '~/lib/utils/url_utility';
-import {
-  queryToFilterObj,
-  filterObjToQuery,
-  filterObjToFilterToken,
-  filterTokensToFilterObj,
-} from '~/tracing/filters';
-import FilteredSearch from '~/tracing/components/tracing_list_filtered_search.vue';
-import UrlSync from '~/vue_shared/components/url_sync.vue';
-import setWindowLocation from 'helpers/set_window_location_helper';
-
-jest.mock('~/alert');
-jest.mock('~/tracing/filters');
-
-describe('TracingList', () => {
-  let wrapper;
-  let observabilityClientMock;
-
-  const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
-  const findEmptyState = () => wrapper.findComponent(TracingEmptyState);
-  const findTableList = () => wrapper.findComponent(TracingTableList);
-  const findFilteredSearch = () => wrapper.findComponent(FilteredSearch);
-  const findUrlSync = () => wrapper.findComponent(UrlSync);
-
-  const mountComponent = async () => {
-    wrapper = shallowMountExtended(TracingList, {
-      propsData: {
-        observabilityClient: observabilityClientMock,
-      },
-    });
-    await waitForPromises();
-  };
-
-  beforeEach(() => {
-    observabilityClientMock = {
-      isTracingEnabled: jest.fn(),
-      enableTraces: jest.fn(),
-      fetchTraces: jest.fn(),
-    };
-  });
-
-  it('renders the loading indicator while checking if tracing is enabled', () => {
-    mountComponent();
-    expect(findLoadingIcon().exists()).toBe(true);
-    expect(findEmptyState().exists()).toBe(false);
-    expect(findTableList().exists()).toBe(false);
-    expect(findFilteredSearch().exists()).toBe(false);
-    expect(findUrlSync().exists()).toBe(false);
-    expect(observabilityClientMock.isTracingEnabled).toHaveBeenCalled();
-  });
-
-  describe('when tracing is enabled', () => {
-    const mockTraces = ['trace1', 'trace2'];
-    beforeEach(async () => {
-      observabilityClientMock.isTracingEnabled.mockResolvedValueOnce(true);
-      observabilityClientMock.fetchTraces.mockResolvedValueOnce(mockTraces);
-
-      await mountComponent();
-    });
-
-    it('fetches the traces and renders the trace list with filtered search', () => {
-      expect(observabilityClientMock.isTracingEnabled).toHaveBeenCalled();
-      expect(observabilityClientMock.fetchTraces).toHaveBeenCalled();
-      expect(findLoadingIcon().exists()).toBe(false);
-      expect(findEmptyState().exists()).toBe(false);
-      expect(findTableList().exists()).toBe(true);
-      expect(findFilteredSearch().exists()).toBe(true);
-      expect(findUrlSync().exists()).toBe(true);
-      expect(findTableList().props('traces')).toBe(mockTraces);
-    });
-
-    it('calls fetchTraces method when TracingTableList emits reload event', () => {
-      observabilityClientMock.fetchTraces.mockClear();
-      observabilityClientMock.fetchTraces.mockResolvedValueOnce(['trace1']);
-
-      findTableList().vm.$emit('reload');
-
-      expect(observabilityClientMock.fetchTraces).toHaveBeenCalledTimes(1);
-    });
-
-    it('on trace selection it redirects to the details url', () => {
-      setWindowLocation('base_path');
-      const visitUrlMock = jest.spyOn(urlUtility, 'visitUrl').mockReturnValue({});
-
-      findTableList().vm.$emit('trace-selected', { traceId: 'test-trace-id' });
-
-      expect(visitUrlMock).toHaveBeenCalledTimes(1);
-      expect(visitUrlMock).toHaveBeenCalledWith('/base_path/test-trace-id');
-    });
-  });
-
-  describe('filtered search', () => {
-    let mockFilterObj;
-    let mockFilterToken;
-    let mockQuery;
-    let mockUpdatedFilterObj;
-
-    beforeEach(async () => {
-      observabilityClientMock.isTracingEnabled.mockResolvedValue(true);
-      observabilityClientMock.fetchTraces.mockResolvedValue([]);
-
-      setWindowLocation('?trace-id=foo');
-
-      mockFilterObj = { mock: 'filter-obj' };
-      queryToFilterObj.mockReturnValue(mockFilterObj);
-
-      mockFilterToken = ['mock-token'];
-      filterObjToFilterToken.mockReturnValue(mockFilterToken);
-
-      mockQuery = { mock: 'query' };
-      filterObjToQuery.mockReturnValueOnce(mockQuery);
-
-      mockUpdatedFilterObj = { mock: 'filter-obj-upd' };
-      filterTokensToFilterObj.mockReturnValue(mockUpdatedFilterObj);
-
-      await mountComponent();
-    });
-
-    it('renders FilteredSeach with initial filters parsed from window.location', () => {
-      expect(queryToFilterObj).toHaveBeenCalledWith('?trace-id=foo');
-      expect(filterObjToFilterToken).toHaveBeenCalledWith(mockFilterObj);
-      expect(findFilteredSearch().props('initialFilters')).toBe(mockFilterToken);
-    });
-
-    it('renders UrlSync and sets query prop', () => {
-      expect(filterObjToQuery).toHaveBeenCalledWith(mockFilterObj);
-      expect(findUrlSync().props('query')).toBe(mockQuery);
-    });
-
-    it('process filters on search submit', async () => {
-      const mockUpdatedQuery = { mock: 'updated-query' };
-      filterObjToQuery.mockReturnValueOnce(mockUpdatedQuery);
-      const mockFilters = { mock: 'some-filter' };
-
-      findFilteredSearch().vm.$emit('submit', mockFilters);
-      await waitForPromises();
-
-      expect(filterTokensToFilterObj).toHaveBeenCalledWith(mockFilters);
-      expect(filterObjToQuery).toHaveBeenCalledWith(mockUpdatedFilterObj);
-      expect(findUrlSync().props('query')).toBe(mockUpdatedQuery);
-    });
-
-    it('fetches traces with filters', () => {
-      expect(observabilityClientMock.fetchTraces).toHaveBeenCalledWith(mockFilterObj);
-
-      findFilteredSearch().vm.$emit('submit', {});
-
-      expect(observabilityClientMock.fetchTraces).toHaveBeenLastCalledWith(mockUpdatedFilterObj);
-    });
-  });
-
-  describe('when tracing is not enabled', () => {
-    beforeEach(async () => {
-      observabilityClientMock.isTracingEnabled.mockResolvedValueOnce(false);
-      observabilityClientMock.fetchTraces.mockResolvedValueOnce([]);
-
-      await mountComponent();
-    });
-
-    it('renders TracingEmptyState', () => {
-      expect(findEmptyState().exists()).toBe(true);
-    });
-
-    it('calls enableTracing when TracingEmptyState emits enable-tracing', () => {
-      findEmptyState().vm.$emit('enable-tracing');
-
-      expect(observabilityClientMock.enableTraces).toHaveBeenCalled();
-    });
-  });
-
-  describe('error handling', () => {
-    it('if isTracingEnabled fails, it renders an alert and empty page', async () => {
-      observabilityClientMock.isTracingEnabled.mockRejectedValueOnce('error');
-
-      await mountComponent();
-
-      expect(createAlert).toHaveBeenCalledWith({ message: 'Failed to load page.' });
-      expect(findLoadingIcon().exists()).toBe(false);
-      expect(findEmptyState().exists()).toBe(false);
-      expect(findTableList().exists()).toBe(false);
-    });
-
-    it('if fetchTraces fails, it renders an alert and empty list', async () => {
-      observabilityClientMock.fetchTraces.mockRejectedValueOnce('error');
-      observabilityClientMock.isTracingEnabled.mockReturnValueOnce(true);
-
-      await mountComponent();
-
-      expect(createAlert).toHaveBeenCalledWith({ message: 'Failed to load traces.' });
-      expect(findTableList().exists()).toBe(true);
-      expect(findTableList().props('traces')).toEqual([]);
-    });
-
-    it('if enableTraces fails, it renders an alert and empty-state', async () => {
-      observabilityClientMock.isTracingEnabled.mockReturnValueOnce(false);
-      observabilityClientMock.enableTraces.mockRejectedValueOnce('error');
-
-      await mountComponent();
-
-      findEmptyState().vm.$emit('enable-tracing');
-      await waitForPromises();
-
-      expect(createAlert).toHaveBeenCalledWith({ message: 'Failed to enable tracing.' });
-      expect(findLoadingIcon().exists()).toBe(false);
-      expect(findEmptyState().exists()).toBe(true);
-      expect(findTableList().exists()).toBe(false);
-    });
-  });
-});
diff --git a/spec/frontend/tracing/components/tracing_table_list_spec.js b/spec/frontend/tracing/components/tracing_table_list_spec.js
deleted file mode 100644
index 1930ebe6b4e..00000000000
--- a/spec/frontend/tracing/components/tracing_table_list_spec.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { nextTick } from 'vue';
-import { mountExtended } from 'helpers/vue_test_utils_helper';
-import TracingTableList from '~/tracing/components/tracing_table_list.vue';
-
-describe('TracingTableList', () => {
-  let wrapper;
-  const mockTraces = [
-    {
-      timestamp: '2023-07-10T15:02:30.677538Z',
-      service_name: 'tracegen',
-      operation: 'lets-go',
-      duration_nano: 150000,
-    },
-    {
-      timestamp: '2023-07-10T15:02:30.677538Z',
-      service_name: 'tracegen',
-      operation: 'lets-go',
-      duration_nano: 200000,
-    },
-  ];
-
-  const mountComponent = ({ traces = mockTraces } = {}) => {
-    wrapper = mountExtended(TracingTableList, {
-      propsData: {
-        traces,
-      },
-    });
-  };
-
-  const getRows = () => wrapper.findComponent({ name: 'GlTable' }).find('tbody').findAll('tr');
-  const getRow = (idx) => getRows().at(idx);
-  const getCells = (trIdx) => getRows().at(trIdx).findAll('td');
-
-  const getCell = (trIdx, tdIdx) => {
-    return getCells(trIdx).at(tdIdx);
-  };
-
-  const selectRow = async (idx) => {
-    getRow(idx).trigger('click');
-    await nextTick();
-  };
-
-  it('renders traces as table', () => {
-    mountComponent();
-
-    const rows = wrapper.findAll('table tbody tr');
-
-    expect(rows.length).toBe(mockTraces.length);
-
-    mockTraces.forEach((trace, i) => {
-      expect(getCells(i).length).toBe(4);
-      expect(getCell(i, 0).text()).toBe('Jul 10, 2023 3:02pm UTC');
-      expect(getCell(i, 1).text()).toBe(trace.service_name);
-      expect(getCell(i, 2).text()).toBe(trace.operation);
-      expect(getCell(i, 3).text()).toBe(`${trace.duration_nano / 1000} ms`);
-    });
-  });
-
-  it('emits trace-selected on row selection', async () => {
-    mountComponent();
-
-    await selectRow(0);
-    expect(wrapper.emitted('trace-selected')).toHaveLength(1);
-    expect(wrapper.emitted('trace-selected')[0][0]).toEqual({ trace_id: mockTraces[0].trace_id });
-  });
-
-  it('renders the empty state when no traces are provided', () => {
-    mountComponent({ traces: [] });
-
-    expect(getCell(0, 0).text()).toContain('No traces to display');
-    const link = getCell(0, 0).findComponent({ name: 'GlLink' });
-    expect(link.text()).toBe('Check again');
-
-    link.trigger('click');
-    expect(wrapper.emitted('reload')).toHaveLength(1);
-  });
-});
diff --git a/spec/frontend/tracing/details_index_spec.js b/spec/frontend/tracing/details_index_spec.js
deleted file mode 100644
index e0d368b6cb7..00000000000
--- a/spec/frontend/tracing/details_index_spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import DetailsIndex from '~/tracing/details_index.vue';
-import TracingDetails from '~/tracing/components/tracing_details.vue';
-import ObservabilityContainer from '~/observability/components/observability_container.vue';
-
-describe('DetailsIndex', () => {
-  const props = {
-    traceId: 'test-trace-id',
-    tracingIndexUrl: 'https://example.com/tracing/index',
-    oauthUrl: 'https://example.com/oauth',
-    tracingUrl: 'https://example.com/tracing',
-    provisioningUrl: 'https://example.com/provisioning',
-  };
-
-  let wrapper;
-
-  const mountComponent = () => {
-    wrapper = shallowMountExtended(DetailsIndex, {
-      propsData: props,
-    });
-  };
-
-  it('renders ObservabilityContainer component', () => {
-    mountComponent();
-
-    const observabilityContainer = wrapper.findComponent(ObservabilityContainer);
-    expect(observabilityContainer.exists()).toBe(true);
-    expect(observabilityContainer.props('oauthUrl')).toBe(props.oauthUrl);
-    expect(observabilityContainer.props('tracingUrl')).toBe(props.tracingUrl);
-    expect(observabilityContainer.props('provisioningUrl')).toBe(props.provisioningUrl);
-  });
-
-  it('renders TracingList component inside ObservabilityContainer', () => {
-    mountComponent();
-
-    const observabilityContainer = wrapper.findComponent(ObservabilityContainer);
-    const detailsCmp = observabilityContainer.findComponent(TracingDetails);
-    expect(detailsCmp.exists()).toBe(true);
-    expect(detailsCmp.props('traceId')).toBe(props.traceId);
-    expect(detailsCmp.props('tracingIndexUrl')).toBe(props.tracingIndexUrl);
-  });
-});
diff --git a/spec/frontend/tracing/filters_spec.js b/spec/frontend/tracing/filters_spec.js
deleted file mode 100644
index ee396326f45..00000000000
--- a/spec/frontend/tracing/filters_spec.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import {
-  filterToQueryObject,
-  urlQueryToFilter,
-  prepareTokens,
-  processFilters,
-} from '~/vue_shared/components/filtered_search_bar/filtered_search_utils';
-import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants';
-
-import {
-  PERIOD_FILTER_TOKEN_TYPE,
-  SERVICE_NAME_FILTER_TOKEN_TYPE,
-  OPERATION_FILTER_TOKEN_TYPE,
-  TRACE_ID_FILTER_TOKEN_TYPE,
-  DURATION_MS_FILTER_TOKEN_TYPE,
-  queryToFilterObj,
-  filterObjToQuery,
-  filterObjToFilterToken,
-  filterTokensToFilterObj,
-} from '~/tracing/filters';
-
-jest.mock('~/vue_shared/components/filtered_search_bar/filtered_search_utils');
-
-describe('utils', () => {
-  describe('queryToFilterObj', () => {
-    it('should build a filter obj', () => {
-      const url = 'http://example.com/';
-      urlQueryToFilter.mockReturnValue({
-        period: '7d',
-        service: 'my_service',
-        operation: 'my_operation',
-        trace_id: 'my_trace_id',
-        durationMs: '500',
-        [FILTERED_SEARCH_TERM]: 'test',
-      });
-
-      const filterObj = queryToFilterObj(url);
-
-      expect(urlQueryToFilter).toHaveBeenCalledWith(url, {
-        customOperators: [
-          { operator: '>', prefix: 'gt' },
-          { operator: '<', prefix: 'lt' },
-        ],
-        filteredSearchTermKey: 'search',
-      });
-      expect(filterObj).toEqual({
-        period: '7d',
-        service: 'my_service',
-        operation: 'my_operation',
-        traceId: 'my_trace_id',
-        durationMs: '500',
-        search: 'test',
-      });
-    });
-  });
-
-  describe('filterObjToQuery', () => {
-    it('should convert filter object to URL query', () => {
-      filterToQueryObject.mockReturnValue('mockquery');
-
-      const query = filterObjToQuery({
-        period: '7d',
-        serviceName: 'my_service',
-        operation: 'my_operation',
-        traceId: 'my_trace_id',
-        durationMs: '500',
-        search: 'test',
-      });
-
-      expect(filterToQueryObject).toHaveBeenCalledWith(
-        {
-          period: '7d',
-          service: 'my_service',
-          operation: 'my_operation',
-          trace_id: 'my_trace_id',
-          durationMs: '500',
-          'filtered-search-term': 'test',
-        },
-        {
-          customOperators: [
-            { applyOnlyToKey: 'durationMs', operator: '>', prefix: 'gt' },
-            { applyOnlyToKey: 'durationMs', operator: '<', prefix: 'lt' },
-          ],
-          filteredSearchTermKey: 'search',
-        },
-      );
-      expect(query).toBe('mockquery');
-    });
-  });
-
-  describe('filterObjToFilterToken', () => {
-    it('should convert filter object to filter tokens', () => {
-      const mockTokens = [];
-      prepareTokens.mockReturnValue(mockTokens);
-
-      const tokens = filterObjToFilterToken({
-        period: '7d',
-        serviceName: 'my_service',
-        operation: 'my_operation',
-        traceId: 'my_trace_id',
-        durationMs: '500',
-        search: 'test',
-      });
-
-      expect(prepareTokens).toHaveBeenCalledWith({
-        [PERIOD_FILTER_TOKEN_TYPE]: '7d',
-        [SERVICE_NAME_FILTER_TOKEN_TYPE]: 'my_service',
-        [OPERATION_FILTER_TOKEN_TYPE]: 'my_operation',
-        [TRACE_ID_FILTER_TOKEN_TYPE]: 'my_trace_id',
-        [DURATION_MS_FILTER_TOKEN_TYPE]: '500',
-        [FILTERED_SEARCH_TERM]: 'test',
-      });
-      expect(tokens).toBe(mockTokens);
-    });
-  });
-
-  describe('filterTokensToFilterObj', () => {
-    it('should convert filter tokens to filter object', () => {
-      const mockTokens = [];
-      processFilters.mockReturnValue({
-        [SERVICE_NAME_FILTER_TOKEN_TYPE]: 'my_service',
-        [PERIOD_FILTER_TOKEN_TYPE]: '7d',
-        [OPERATION_FILTER_TOKEN_TYPE]: 'my_operation',
-        [TRACE_ID_FILTER_TOKEN_TYPE]: 'my_trace_id',
-        [DURATION_MS_FILTER_TOKEN_TYPE]: '500',
-        [FILTERED_SEARCH_TERM]: 'test',
-      });
-
-      const filterObj = filterTokensToFilterObj(mockTokens);
-
-      expect(processFilters).toHaveBeenCalledWith(mockTokens);
-      expect(filterObj).toEqual({
-        serviceName: 'my_service',
-        period: '7d',
-        operation: 'my_operation',
-        traceId: 'my_trace_id',
-        durationMs: '500',
-        search: 'test',
-      });
-    });
-  });
-});
diff --git a/spec/frontend/tracing/list_index_spec.js b/spec/frontend/tracing/list_index_spec.js
deleted file mode 100644
index a5759035c2f..00000000000
--- a/spec/frontend/tracing/list_index_spec.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import ListIndex from '~/tracing/list_index.vue';
-import TracingList from '~/tracing/components/tracing_list.vue';
-import ObservabilityContainer from '~/observability/components/observability_container.vue';
-
-describe('ListIndex', () => {
-  const props = {
-    oauthUrl: 'https://example.com/oauth',
-    tracingUrl: 'https://example.com/tracing',
-    provisioningUrl: 'https://example.com/provisioning',
-  };
-
-  let wrapper;
-
-  const mountComponent = () => {
-    wrapper = shallowMountExtended(ListIndex, {
-      propsData: props,
-    });
-  };
-
-  it('renders ObservabilityContainer component', () => {
-    mountComponent();
-
-    const observabilityContainer = wrapper.findComponent(ObservabilityContainer);
-    expect(observabilityContainer.exists()).toBe(true);
-    expect(observabilityContainer.props('oauthUrl')).toBe(props.oauthUrl);
-    expect(observabilityContainer.props('tracingUrl')).toBe(props.tracingUrl);
-    expect(observabilityContainer.props('provisioningUrl')).toBe(props.provisioningUrl);
-  });
-
-  it('renders TracingList component inside ObservabilityContainer', () => {
-    mountComponent();
-
-    const observabilityContainer = wrapper.findComponent(ObservabilityContainer);
-    expect(observabilityContainer.findComponent(TracingList).exists()).toBe(true);
-  });
-});
diff --git a/spec/helpers/projects/observability_helper_spec.rb b/spec/helpers/projects/observability_helper_spec.rb
deleted file mode 100644
index 0f47cdb8be2..00000000000
--- a/spec/helpers/projects/observability_helper_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'json'
-
-RSpec.describe Projects::ObservabilityHelper, type: :helper, feature_category: :tracing do
-  include Gitlab::Routing.url_helpers
-
-  let_it_be(:group) { build_stubbed(:group) }
-  let_it_be(:project) { build_stubbed(:project, group: group) }
-
-  describe '#observability_tracing_view_model' do
-    it 'generates the correct JSON' do
-      expected_json = {
-        tracingUrl: Gitlab::Observability.tracing_url(project),
-        provisioningUrl: Gitlab::Observability.provisioning_url(project),
-        oauthUrl: Gitlab::Observability.oauth_url
-      }.to_json
-
-      expect(helper.observability_tracing_view_model(project)).to eq(expected_json)
-    end
-  end
-
-  describe '#observability_tracing_details_model' do
-    it 'generates the correct JSON' do
-      expected_json = {
-        tracingIndexUrl: namespace_project_tracing_index_path(project.group, project),
-        traceId: "trace-id",
-        tracingUrl: Gitlab::Observability.tracing_url(project),
-        provisioningUrl: Gitlab::Observability.provisioning_url(project),
-        oauthUrl: Gitlab::Observability.oauth_url
-      }.to_json
-
-      expect(helper.observability_tracing_details_model(project, "trace-id")).to eq(expected_json)
-    end
-  end
-end
diff --git a/spec/lib/gitlab/observability_spec.rb b/spec/lib/gitlab/observability_spec.rb
index c2e18e480a9..04c35f0ee3a 100644
--- a/spec/lib/gitlab/observability_spec.rb
+++ b/spec/lib/gitlab/observability_spec.rb
@@ -40,12 +40,6 @@ RSpec.describe Gitlab::Observability, feature_category: :error_tracking do
     it { is_expected.to eq("#{described_class.observability_url}/v1/auth/start") }
   end
 
-  describe '.tracing_url' do
-    subject { described_class.tracing_url(project) }
-
-    it { is_expected.to eq("#{described_class.observability_url}/query/#{group.id}/#{project.id}/v1/traces") }
-  end
-
   describe '.provisioning_url' do
     subject { described_class.provisioning_url(project) }
 
@@ -169,27 +163,6 @@ RSpec.describe Gitlab::Observability, feature_category: :error_tracking do
     end
   end
 
-  describe '.tracing_enabled?' do
-    let_it_be(:project) { create(:project, :repository) }
-
-    it 'returns true if feature is enabled globally' do
-      expect(described_class.tracing_enabled?(project)).to eq(true)
-    end
-
-    it 'returns true if feature is enabled for the project' do
-      stub_feature_flags(observability_tracing: false)
-      stub_feature_flags(observability_tracing: project)
-
-      expect(described_class.tracing_enabled?(project)).to eq(true)
-    end
-
-    it 'returns false if feature is disabled globally' do
-      stub_feature_flags(observability_tracing: false)
-
-      expect(described_class.tracing_enabled?(project)).to eq(false)
-    end
-  end
-
   describe '.allowed_for_action?' do
     let(:group) { build_stubbed(:group) }
     let(:user) { build_stubbed(:user) }
diff --git a/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb b/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb
index c0787aa9db5..f1df56823b1 100644
--- a/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb
+++ b/spec/lib/sidebars/projects/menus/monitor_menu_spec.rb
@@ -88,19 +88,5 @@ RSpec.describe Sidebars::Projects::Menus::MonitorMenu, feature_category: :naviga
 
       it_behaves_like 'access rights checks'
     end
-
-    describe 'Tracing' do
-      let(:item_id) { :tracing }
-
-      specify { is_expected.not_to be_nil }
-
-      describe 'when feature is disabled' do
-        before do
-          stub_feature_flags(observability_tracing: false)
-        end
-
-        specify { is_expected.to be_nil }
-      end
-    end
   end
 end
diff --git a/spec/requests/projects/tracing_controller_spec.rb b/spec/requests/projects/tracing_controller_spec.rb
deleted file mode 100644
index 8996ea7f8d6..00000000000
--- a/spec/requests/projects/tracing_controller_spec.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Projects::TracingController, feature_category: :tracing do
-  let_it_be(:group) { create(:group) }
-  let_it_be(:project) { create(:project, group: group) }
-  let_it_be(:user) { create(:user) }
-  let(:path) { nil }
-  let(:observability_tracing_ff) { true }
-
-  subject do
-    get path
-    response
-  end
-
-  before do
-    stub_feature_flags(observability_tracing: observability_tracing_ff)
-    sign_in(user)
-  end
-
-  shared_examples 'tracing route request' do
-    it_behaves_like 'observability csp policy' do
-      before_all do
-        project.add_developer(user)
-      end
-
-      let(:tested_path) { path }
-    end
-
-    context 'when user does not have permissions' do
-      it 'returns 404' do
-        expect(subject).to have_gitlab_http_status(:not_found)
-      end
-    end
-
-    context 'when user has permissions' do
-      before_all do
-        project.add_developer(user)
-      end
-
-      it 'returns 200' do
-        expect(subject).to have_gitlab_http_status(:ok)
-      end
-
-      context 'when feature is disabled' do
-        let(:observability_tracing_ff) { false }
-
-        it 'returns 404' do
-          expect(subject).to have_gitlab_http_status(:not_found)
-        end
-      end
-    end
-  end
-
-  describe 'GET #index' do
-    let(:path) { project_tracing_index_path(project) }
-
-    it_behaves_like 'tracing route request'
-
-    describe 'html response' do
-      before_all do
-        project.add_developer(user)
-      end
-
-      it 'renders the js-tracing element correctly' do
-        element = Nokogiri::HTML.parse(subject.body).at_css('#js-tracing')
-
-        expected_view_model = {
-          tracingUrl: Gitlab::Observability.tracing_url(project),
-          provisioningUrl: Gitlab::Observability.provisioning_url(project),
-          oauthUrl: Gitlab::Observability.oauth_url
-        }.to_json
-        expect(element.attributes['data-view-model'].value).to eq(expected_view_model)
-      end
-    end
-  end
-
-  describe 'GET #show' do
-    let(:path) { project_tracing_path(project, id: "test-trace-id") }
-
-    it_behaves_like 'tracing route request'
-
-    describe 'html response' do
-      before_all do
-        project.add_developer(user)
-      end
-
-      it 'renders the js-tracing element correctly' do
-        element = Nokogiri::HTML.parse(subject.body).at_css('#js-tracing-details')
-
-        expected_view_model = {
-          tracingIndexUrl: project_tracing_index_path(project),
-          traceId: 'test-trace-id',
-          tracingUrl: Gitlab::Observability.tracing_url(project),
-          provisioningUrl: Gitlab::Observability.provisioning_url(project),
-          oauthUrl: Gitlab::Observability.oauth_url
-        }.to_json
-
-        expect(element.attributes['data-view-model'].value).to eq(expected_view_model)
-      end
-    end
-  end
-end
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index f257e1ca6de..e1c146aa677 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -2750,7 +2750,6 @@
 - './ee/spec/services/geo/wiki_sync_service_spec.rb'
 - './ee/spec/services/gitlab_subscriptions/activate_service_spec.rb'
 - './ee/spec/services/gitlab_subscriptions/check_future_renewal_service_spec.rb'
-- './ee/spec/services/gitlab_subscriptions/create_hand_raise_lead_service_spec.rb'
 - './ee/spec/services/gitlab_subscriptions/create_service_spec.rb'
 - './ee/spec/services/gitlab_subscriptions/create_trial_or_lead_service_spec.rb'
 - './ee/spec/services/gitlab_subscriptions/fetch_purchase_eligible_namespaces_service_spec.rb'
diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index 810c87162bf..a09319b4980 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -82,7 +82,6 @@ RSpec.shared_context 'project navbar structure' do
       {
         nav_item: _('Monitor'),
         nav_sub_items: [
-          _('Tracing'),
           _('Error Tracking'),
           _('Alerts'),
           _('Incidents')
diff --git a/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue b/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
index f6838ddbb92..e319b199cb0 100644
--- a/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
+++ b/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
@@ -146,7 +146,7 @@ export default {
         const items = this.items
         const field = this.sizeField
         const minItemSize = this.minItemSize
-        let computedMinSize = 10000
+        let computedMinSize = this.buffer
         let accumulator = 0
         let current
         for (let i = 0, l = items.length; i < l; i++) {