diff --git a/src/features/activities/components/ActivitiesExportForm/ActivitiesExportForm.test.tsx b/src/features/activities/components/ActivitiesExportForm/ActivitiesExportForm.test.tsx
index 48c0cac2d3..948c21f16b 100644
--- a/src/features/activities/components/ActivitiesExportForm/ActivitiesExportForm.test.tsx
+++ b/src/features/activities/components/ActivitiesExportForm/ActivitiesExportForm.test.tsx
@@ -74,7 +74,6 @@ describe("ActivitiesExportForm", () => {
       "creator",
     );
 
-    await openAttributeGroup(user, /audit & time/i);
     expect(
       screen.getByRole("checkbox", { name: "Creator" }),
     ).toBeInTheDocument();
diff --git a/src/features/exports/components/ExportForm/ExportForm.test.tsx b/src/features/exports/components/ExportForm/ExportForm.test.tsx
new file mode 100644
index 0000000000..1c91a370b8
--- /dev/null
+++ b/src/features/exports/components/ExportForm/ExportForm.test.tsx
@@ -0,0 +1,318 @@
+import { INPUT_DATE_FORMAT } from "@/constants";
+import { renderWithProviders } from "@/tests/render";
+import { screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import moment from "moment";
+import { describe, expect, it, vi } from "vitest";
+import ExportForm from "./ExportForm";
+import type {
+  ExportFieldGroup,
+  ExportFormValues,
+} from "../../types/ExportForm";
+
+const FIELD_GROUPS: readonly ExportFieldGroup[] = [
+  {
+    title: "Primary Identity",
+    key: "primary-identity",
+    fields: [
+      { id: "hostname", label: "Hostname" },
+      { id: "title", label: "Instance name" },
+    ],
+  },
+  {
+    title: "Compliance",
+    key: "compliance",
+    fields: [
+      { id: "securely_patched", label: "Securely patched" },
+      { id: "time_to_patch_days", label: "Time to patch (days)" },
+    ],
+  },
+];
+
+const INITIAL_VALUES: ExportFormValues = {
+  name: "",
+  selectedFieldIds: [],
+  retainUntil: moment().add(3, "years").format(INPUT_DATE_FORMAT),
+};
+
+const renderForm = (
+  overrides: Partial<{
+    initialValues: ExportFormValues;
+    onGenerate: (args: {
+      values: ExportFormValues;
+      fieldsToExport: { id: string; label: string; groupTitle?: string }[];
+    }) => Promise<void>;
+  }> = {},
+) => {
+  const onGenerate =
+    overrides.onGenerate ?? vi.fn().mockResolvedValue(undefined);
+
+  renderWithProviders(
+    <ExportForm
+      fieldGroups={FIELD_GROUPS}
+      initialValues={overrides.initialValues ?? INITIAL_VALUES}
+      isSubmitting={false}
+      onGenerate={onGenerate}
+    />,
+  );
+
+  return { onGenerate };
+};
+
+const openAttributeGroup = async (
+  user: ReturnType<typeof userEvent.setup>,
+  name: RegExp,
+) => {
+  await user.click(screen.getByRole("tab", { name }));
+};
+
+describe("ExportForm", () => {
+  it("keeps Next disabled until an export name and at least one attribute are selected", async () => {
+    const user = userEvent.setup();
+    renderForm();
+
+    const nextButton = screen.getByRole("button", { name: "Next" });
+
+    expect(nextButton).toHaveAttribute("aria-disabled", "true");
+
+    await user.type(
+      screen.getByRole("textbox", { name: "Export name" }),
+      "My export",
+    );
+
+    expect(nextButton).toHaveAttribute("aria-disabled", "true");
+
+    await openAttributeGroup(user, /primary identity/i);
+    await user.click(screen.getByRole("checkbox", { name: "Hostname" }));
+
+    expect(nextButton).not.toHaveAttribute("aria-disabled", "true");
+  });
+
+  it("filters attributes by search text and shows the empty state when nothing matches", async () => {
+    const user = userEvent.setup();
+    renderForm();
+
+    const searchInput = screen.getByRole("searchbox", {
+      name: "Search attributes",
+    });
+
+    await user.type(searchInput, "securely");
+
+    expect(
+      screen.getByRole("tab", { name: /compliance/i }),
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByRole("tab", { name: /primary identity/i }),
+    ).not.toBeInTheDocument();
+
+    await user.clear(searchInput);
+    await user.type(searchInput, "does not exist");
+
+    expect(
+      screen.getByText("No attributes match your search."),
+    ).toBeInTheDocument();
+  });
+
+  it("auto-expands matching groups so fields are visible without clicking the group header", async () => {
+    const user = userEvent.setup();
+    renderForm();
+
+    expect(
+      screen.queryByRole("checkbox", { name: "Hostname" }),
+    ).not.toBeInTheDocument();
+
+    await user.type(
+      screen.getByRole("searchbox", { name: "Search attributes" }),
+      "host",
+    );
+
+    expect(
+      screen.getByRole("checkbox", { name: "Hostname" }),
+    ).toBeInTheDocument();
+  });
+
+  it("auto-expands groups matched by group title so all their fields are visible", async () => {
+    const user = userEvent.setup();
+    renderForm();
+
+    await user.type(
+      screen.getByRole("searchbox", { name: "Search attributes" }),
+      "compliance",
+    );
+
+    expect(
+      screen.getByRole("checkbox", { name: "Securely patched" }),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole("checkbox", { name: "Time to patch (days)" }),
+    ).toBeInTheDocument();
+  });
+
+  it("selects and deselects all fields in a group from the group checkbox", async () => {
+    const user = userEvent.setup();
+    const onGenerate = vi.fn().mockResolvedValue(undefined);
+
+    renderForm({ onGenerate });
+
+    const exportName = screen.getByRole("textbox", { name: "Export name" });
+    const nextButton = screen.getByRole("button", { name: "Next" });
+    const groupSelectAll = screen.getByRole("checkbox", {
+      name: "Primary Identity",
+    });
+
+    await user.type(exportName, "Group selection export");
+    await user.click(groupSelectAll);
+
+    expect(nextButton).not.toHaveAttribute("aria-disabled", "true");
+
+    await user.click(nextButton);
+    await user.click(screen.getByRole("button", { name: "Generate TSV" }));
+
+    await waitFor(() => {
+      expect(onGenerate).toHaveBeenCalledWith({
+        values: expect.objectContaining({
+          selectedFieldIds: ["hostname", "title"],
+        }),
+        fieldsToExport: [
+          { id: "hostname", label: "Hostname", groupTitle: "Primary Identity" },
+          {
+            id: "title",
+            label: "Instance name",
+            groupTitle: "Primary Identity",
+          },
+        ],
+      });
+    });
+
+    await user.click(screen.getByRole("button", { name: "Back" }));
+    await user.click(
+      screen.getByRole("checkbox", { name: "Primary Identity" }),
+    );
+
+    expect(nextButton).toHaveAttribute("aria-disabled", "true");
+  });
+
+  it("moves to the reorder step on the first submit and returns to step 0 with Back", async () => {
+    const user = userEvent.setup();
+    const { onGenerate } = renderForm();
+
+    await user.type(
+      screen.getByRole("textbox", { name: "Export name" }),
+      "Ordered export",
+    );
+    await openAttributeGroup(user, /primary identity/i);
+    await user.click(screen.getByRole("checkbox", { name: "Hostname" }));
+    await user.click(screen.getByRole("button", { name: "Next" }));
+
+    expect(onGenerate).not.toHaveBeenCalled();
+    expect(
+      screen.getByRole("button", { name: "Generate TSV" }),
+    ).toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: "Back" }));
+
+    expect(screen.getByRole("button", { name: "Next" })).toBeInTheDocument();
+    expect(
+      screen.getByRole("textbox", { name: "Export name" }),
+    ).toBeInTheDocument();
+  });
+
+  it("submits selected fields and form values on the second step", async () => {
+    const user = userEvent.setup();
+    const onGenerate = vi.fn().mockResolvedValue(undefined);
+
+    renderForm({ onGenerate });
+
+    await user.type(
+      screen.getByRole("textbox", { name: "Export name" }),
+      "Compliance export",
+    );
+    await openAttributeGroup(user, /primary identity/i);
+    await user.click(screen.getByRole("checkbox", { name: "Hostname" }));
+    await openAttributeGroup(user, /compliance/i);
+    await user.click(
+      screen.getByRole("checkbox", { name: "Securely patched" }),
+    );
+
+    await user.click(screen.getByRole("button", { name: "Next" }));
+    await user.click(screen.getByRole("button", { name: "Generate TSV" }));
+
+    await waitFor(() => {
+      expect(onGenerate).toHaveBeenCalledWith({
+        values: expect.objectContaining({
+          name: "Compliance export",
+          selectedFieldIds: ["hostname", "securely_patched"],
+          retainUntil: INITIAL_VALUES.retainUntil,
+        }),
+        fieldsToExport: [
+          { id: "hostname", label: "Hostname", groupTitle: "Primary Identity" },
+          {
+            id: "securely_patched",
+            label: "Securely patched",
+            groupTitle: "Compliance",
+          },
+        ],
+      });
+    });
+  });
+
+  it("shows group badges and reset button on step 2", async () => {
+    const user = userEvent.setup();
+    renderForm();
+
+    await user.type(
+      screen.getByRole("textbox", { name: "Export name" }),
+      "Badge test",
+    );
+    await openAttributeGroup(user, /primary identity/i);
+    await user.click(screen.getByRole("checkbox", { name: "Hostname" }));
+    await openAttributeGroup(user, /compliance/i);
+    await user.click(
+      screen.getByRole("checkbox", { name: "Securely patched" }),
+    );
+    await user.click(screen.getByRole("button", { name: "Next" }));
+
+    expect(screen.getByText("Primary Identity")).toBeInTheDocument();
+    expect(screen.getByText("Compliance")).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: /reset to default order/i }),
+    ).toBeInTheDocument();
+  });
+
+  it("reset to default order restores group-declaration sequence after manual reorder", async () => {
+    const user = userEvent.setup();
+    const onGenerate = vi.fn().mockResolvedValue(undefined);
+
+    renderForm({ onGenerate });
+
+    await user.type(
+      screen.getByRole("textbox", { name: "Export name" }),
+      "Reset test",
+    );
+    await openAttributeGroup(user, /primary identity/i);
+    await user.click(screen.getByRole("checkbox", { name: "Hostname" }));
+    await user.click(screen.getByRole("checkbox", { name: "Instance name" }));
+    await user.click(screen.getByRole("button", { name: "Next" }));
+
+    await user.click(
+      screen.getByRole("button", { name: /move hostname down/i }),
+    );
+
+    await user.click(
+      screen.getByRole("button", { name: /reset to default order/i }),
+    );
+
+    await user.click(screen.getByRole("button", { name: "Generate TSV" }));
+
+    await waitFor(() => {
+      expect(onGenerate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          fieldsToExport: [
+            expect.objectContaining({ id: "hostname" }),
+            expect.objectContaining({ id: "title" }),
+          ],
+        }),
+      );
+    });
+  });
+});
diff --git a/src/features/exports/components/ExportForm/ExportForm.tsx b/src/features/exports/components/ExportForm/ExportForm.tsx
index a3ce1de0d1..7b638be9b1 100644
--- a/src/features/exports/components/ExportForm/ExportForm.tsx
+++ b/src/features/exports/components/ExportForm/ExportForm.tsx
@@ -52,7 +52,9 @@ const ExportForm: FC<ExportFormProps> = ({
     validationSchema: VALIDATION_SCHEMA,
     onSubmit: async (values) => {
       const selectedFields = fieldGroups
-        .flatMap((group) => group.fields)
+        .flatMap((group) =>
+          group.fields.map((field) => ({ ...field, groupTitle: group.title })),
+        )
         .filter((field) => values.selectedFieldIds.includes(field.id));
 
       if (step === 0) {
@@ -165,6 +167,31 @@ const ExportForm: FC<ExportFormProps> = ({
 
   const selectedFieldIdsError = getFormikError(formik, "selectedFieldIds");
 
+  const renderFieldGroups = () => {
+    if (!filteredFieldGroups.length) {
+      return (
+        <p className={classes.emptyState}>No attributes match your search.</p>
+      );
+    }
+
+    if (attributeSearch.trim()) {
+      return filteredFieldGroups.map((group) => {
+        const section = accordionSections.find((s) => s.key === group.key);
+        if (!section) return null;
+        return (
+          <Accordion
+            key={group.key}
+            expanded={group.key}
+            sections={[section]}
+            titleElement="h5"
+          />
+        );
+      });
+    }
+
+    return <Accordion sections={accordionSections} titleElement="h5" />;
+  };
+
   const stepContent =
     step === 0 ? (
       <>
@@ -206,13 +233,7 @@ const ExportForm: FC<ExportFormProps> = ({
               {selectedFieldIdsError}
             </p>
           )}
-          {filteredFieldGroups.length ? (
-            <Accordion sections={accordionSections} titleElement="h5" />
-          ) : (
-            <p className={classes.emptyState}>
-              No attributes match your search.
-            </p>
-          )}
+          {renderFieldGroups()}
         </div>
       </>
     ) : (
diff --git a/src/features/exports/components/SortableFieldList/SortableFieldList.module.scss b/src/features/exports/components/SortableFieldList/SortableFieldList.module.scss
index bc47fc53d8..5cc4d50b66 100644
--- a/src/features/exports/components/SortableFieldList/SortableFieldList.module.scss
+++ b/src/features/exports/components/SortableFieldList/SortableFieldList.module.scss
@@ -5,10 +5,24 @@
   padding-top: $spv--small;
 }
 
-.selectedColumnsIntro {
+.selectedColumnsHeader {
+  align-items: baseline;
+  display: flex;
+  gap: $sph--large;
+  justify-content: space-between;
   margin-bottom: $spv--medium;
 }
 
+.selectedColumnsIntro {
+  flex: 1;
+  margin-bottom: 0;
+}
+
+.resetButton {
+  flex-shrink: 0;
+  white-space: nowrap;
+}
+
 .nameCell {
   align-items: center;
   display: flex;
diff --git a/src/features/exports/components/SortableFieldList/SortableFieldList.test.tsx b/src/features/exports/components/SortableFieldList/SortableFieldList.test.tsx
new file mode 100644
index 0000000000..261f5bf253
--- /dev/null
+++ b/src/features/exports/components/SortableFieldList/SortableFieldList.test.tsx
@@ -0,0 +1,239 @@
+import { renderWithProviders } from "@/tests/render";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { useState } from "react";
+import { describe, expect, it, vi } from "vitest";
+import SortableFieldList from "./SortableFieldList";
+import type { ExportField } from "../../types/ExportForm";
+
+const FIELDS: ExportField[] = [
+  { id: "hostname", label: "Hostname", groupTitle: "Primary Identity" },
+  { id: "status", label: "Status", groupTitle: "Primary Identity" },
+  {
+    id: "securely_patched",
+    label: "Securely patched",
+    groupTitle: "Compliance",
+  },
+];
+
+describe("SortableFieldList", () => {
+  it("renders all field labels", () => {
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={vi.fn()} />,
+    );
+
+    expect(screen.getByText("Hostname")).toBeInTheDocument();
+    expect(screen.getByText("Status")).toBeInTheDocument();
+    expect(screen.getByText("Securely patched")).toBeInTheDocument();
+  });
+
+  it("renders group badges for each field", () => {
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={vi.fn()} />,
+    );
+
+    const primaryBadges = screen.getAllByText("Primary Identity");
+    expect(primaryBadges).toHaveLength(2);
+    expect(screen.getByText("Compliance")).toBeInTheDocument();
+  });
+
+  it("does not render a group badge when groupTitle is absent", () => {
+    const fields: ExportField[] = [{ id: "hostname", label: "Hostname" }];
+
+    renderWithProviders(
+      <SortableFieldList fields={fields} onOrderChange={vi.fn()} />,
+    );
+
+    expect(screen.queryByText("Primary Identity")).not.toBeInTheDocument();
+  });
+
+  it("shows the Reset to default order button", () => {
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={vi.fn()} />,
+    );
+
+    expect(
+      screen.getByRole("button", { name: /reset to default order/i }),
+    ).toBeInTheDocument();
+  });
+
+  it("calls onOrderChange with original fields when Reset is clicked", async () => {
+    const user = userEvent.setup();
+    const onOrderChange = vi.fn();
+
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={onOrderChange} />,
+    );
+
+    await user.click(
+      screen.getByRole("button", { name: /move hostname down/i }),
+    );
+    onOrderChange.mockClear();
+
+    await user.click(
+      screen.getByRole("button", { name: /reset to default order/i }),
+    );
+
+    expect(onOrderChange).toHaveBeenCalledWith(FIELDS);
+  });
+
+  it("restores the displayed row order after Reset is clicked", async () => {
+    const user = userEvent.setup();
+
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={vi.fn()} />,
+    );
+
+    await user.click(
+      screen.getByRole("button", { name: /move hostname down/i }),
+    );
+
+    expect(
+      screen.getByRole("spinbutton", { name: /order for status/i }),
+    ).toHaveValue(1);
+    expect(
+      screen.getByRole("spinbutton", { name: /order for hostname/i }),
+    ).toHaveValue(2);
+
+    await user.click(
+      screen.getByRole("button", { name: /reset to default order/i }),
+    );
+
+    expect(
+      screen.getByRole("spinbutton", { name: /order for hostname/i }),
+    ).toHaveValue(1);
+    expect(
+      screen.getByRole("spinbutton", { name: /order for status/i }),
+    ).toHaveValue(2);
+  });
+
+  it("moves a field up using the arrow button", async () => {
+    const user = userEvent.setup();
+    const onOrderChange = vi.fn();
+
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={onOrderChange} />,
+    );
+
+    await user.click(screen.getByRole("button", { name: /move status up/i }));
+
+    expect(onOrderChange).toHaveBeenCalledWith([
+      expect.objectContaining({ id: "status" }),
+      expect.objectContaining({ id: "hostname" }),
+      expect.objectContaining({ id: "securely_patched" }),
+    ]);
+  });
+
+  it("moves a field down using the arrow button", async () => {
+    const user = userEvent.setup();
+    const onOrderChange = vi.fn();
+
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={onOrderChange} />,
+    );
+
+    await user.click(
+      screen.getByRole("button", { name: /move hostname down/i }),
+    );
+
+    expect(onOrderChange).toHaveBeenCalledWith([
+      expect.objectContaining({ id: "status" }),
+      expect.objectContaining({ id: "hostname" }),
+      expect.objectContaining({ id: "securely_patched" }),
+    ]);
+  });
+
+  it("disables the Up button for the first row and the Down button for the last row", () => {
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={vi.fn()} />,
+    );
+
+    expect(
+      screen.getByRole("button", { name: /move hostname up/i }),
+    ).toHaveAttribute("aria-disabled", "true");
+    expect(
+      screen.getByRole("button", { name: /move securely patched down/i }),
+    ).toHaveAttribute("aria-disabled", "true");
+  });
+
+  it("reset restores original order even when parent state is kept in sync with each move", async () => {
+    const user = userEvent.setup();
+
+    // Mirror ExportForm's usage: parent updates fields on every onOrderChange call
+    const ControlledWrapper = () => {
+      const [fields, setFields] = useState<ExportField[]>(FIELDS);
+      return <SortableFieldList fields={fields} onOrderChange={setFields} />;
+    };
+
+    renderWithProviders(<ControlledWrapper />);
+
+    await user.click(
+      screen.getByRole("button", { name: /move hostname down/i }),
+    );
+
+    expect(
+      screen.getByRole("spinbutton", { name: /order for status/i }),
+    ).toHaveValue(1);
+
+    await user.click(
+      screen.getByRole("button", { name: /reset to default order/i }),
+    );
+
+    expect(
+      screen.getByRole("spinbutton", { name: /order for hostname/i }),
+    ).toHaveValue(1);
+    expect(
+      screen.getByRole("spinbutton", { name: /order for status/i }),
+    ).toHaveValue(2);
+  });
+
+  it("renders the reorder instructions", () => {
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={vi.fn()} />,
+    );
+
+    expect(
+      screen.getByText(/review and reorder the columns for your export/i),
+    ).toBeInTheDocument();
+  });
+
+  it("moves a field to a specific position via the order input", async () => {
+    const user = userEvent.setup();
+    const onOrderChange = vi.fn();
+
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={onOrderChange} />,
+    );
+
+    const hostnameInput = screen.getByRole("spinbutton", {
+      name: /order for hostname/i,
+    });
+    await user.clear(hostnameInput);
+    await user.type(hostnameInput, "3");
+    await user.keyboard("{Enter}");
+
+    expect(onOrderChange).toHaveBeenCalledWith([
+      expect.objectContaining({ id: "status" }),
+      expect.objectContaining({ id: "securely_patched" }),
+      expect.objectContaining({ id: "hostname" }),
+    ]);
+  });
+
+  it("ignores an out-of-range value entered in the order input", async () => {
+    const user = userEvent.setup();
+    const onOrderChange = vi.fn();
+
+    renderWithProviders(
+      <SortableFieldList fields={FIELDS} onOrderChange={onOrderChange} />,
+    );
+
+    const hostnameInput = screen.getByRole("spinbutton", {
+      name: /order for hostname/i,
+    });
+    await user.clear(hostnameInput);
+    await user.type(hostnameInput, "99");
+    await user.keyboard("{Enter}");
+
+    expect(onOrderChange).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/features/exports/components/SortableFieldList/SortableFieldList.tsx b/src/features/exports/components/SortableFieldList/SortableFieldList.tsx
index 1aee381dcf..b12ecdebc4 100644
--- a/src/features/exports/components/SortableFieldList/SortableFieldList.tsx
+++ b/src/features/exports/components/SortableFieldList/SortableFieldList.tsx
@@ -1,4 +1,10 @@
-import { Button, Icon, Input, ModularTable } from "@canonical/react-components";
+import {
+  Button,
+  Chip,
+  Icon,
+  Input,
+  ModularTable,
+} from "@canonical/react-components";
 import classNames from "classnames";
 import {
   useCallback,
@@ -28,6 +34,7 @@ interface ReorderRowData extends Record<string, unknown> {
   index: number;
   fieldId: string;
   label: string;
+  groupTitle: string | undefined;
   currentOrder: string;
 }
 
@@ -73,6 +80,10 @@ const SortableFieldList: FC<SortableFieldListProps> = ({
 
   const orderedFieldsRef = useRef(orderedFields);
   const draggingFieldIdRef = useRef(draggingFieldId);
+  // Capture the field list as it exists on first render so Reset can always
+  // return to the group-declaration order, regardless of how many moves the
+  // parent state has accumulated since then.
+  const initialFieldsRef = useRef<ExportField[]>(fields);
 
   // Stable per-row ref callbacks, cached by fieldId, so the row's ref doesn't
   // churn (null then re-set) on every render.
@@ -95,6 +106,12 @@ const SortableFieldList: FC<SortableFieldListProps> = ({
   });
   usePendingFieldScroll({ orderedFields, pendingScrollRef, rowRefsMap });
 
+  const handleResetOrder = useCallback(() => {
+    setOrderedFields([...initialFieldsRef.current]);
+    setOrderDrafts({});
+    onOrderChange([...initialFieldsRef.current]);
+  }, [onOrderChange]);
+
   const triggerMoveEffect = useCallback((fieldId: string) => {
     if (justMovedTimerRef.current) clearTimeout(justMovedTimerRef.current);
     setJustMovedFieldId(fieldId);
@@ -338,11 +355,19 @@ const SortableFieldList: FC<SortableFieldListProps> = ({
         Header: "Attribute name",
         accessor: "fieldId",
         Cell: ({ row }: CellProps<ReorderRowData>) => {
-          const { label } = row.original;
+          const { label, groupTitle } = row.original;
           return (
             <div className={classes.nameCell}>
               <i className={"p-icon--drag " + classes.dragHandle} />
               <span>{label}</span>
+              {groupTitle && (
+                <Chip
+                  value={groupTitle}
+                  isReadOnly
+                  isDense
+                  className="u-no-margin--bottom"
+                />
+              )}
             </div>
           );
         },
@@ -421,6 +446,7 @@ const SortableFieldList: FC<SortableFieldListProps> = ({
         index,
         fieldId: field.id,
         label: field.label,
+        groupTitle: field.groupTitle,
         currentOrder: orderDrafts[index] ?? String(index + 1),
       })),
     [orderDrafts, orderedFields],
@@ -484,10 +510,20 @@ const SortableFieldList: FC<SortableFieldListProps> = ({
 
   return (
     <div className={classes.selectedColumns}>
-      <p className={classes.selectedColumnsIntro}>
-        Review and reorder the columns for your export. Drag rows or use the
-        controls to change the order.
-      </p>
+      <div className={classes.selectedColumnsHeader}>
+        <p className={classes.selectedColumnsIntro}>
+          Review and reorder the columns for your export. Drag rows or use the
+          controls to change the order.
+        </p>
+        <Button
+          type="button"
+          className={`u-no-margin--bottom ${classes.resetButton}`}
+          onClick={handleResetOrder}
+        >
+          <i className="p-icon--restart" />
+          <span> Reset order</span>
+        </Button>
+      </div>
       <ModularTable
         columns={reorderColumns}
         data={reorderData}
diff --git a/src/features/exports/types/ExportForm.ts b/src/features/exports/types/ExportForm.ts
index baaac6c76e..54bbd0b892 100644
--- a/src/features/exports/types/ExportForm.ts
+++ b/src/features/exports/types/ExportForm.ts
@@ -1,6 +1,7 @@
 export interface ExportField {
   id: string;
   label: string;
+  groupTitle?: string;
 }
 
 export interface ExportFieldGroup {
diff --git a/src/features/instances/components/InstancesExportForm/constants.ts b/src/features/instances/components/InstancesExportForm/constants.ts
index 8345041e53..cc76ed2f80 100644
--- a/src/features/instances/components/InstancesExportForm/constants.ts
+++ b/src/features/instances/components/InstancesExportForm/constants.ts
@@ -13,10 +13,10 @@ export const EXPORT_FIELD_GROUPS: readonly ExportFieldGroup[] = [
     title: "Primary Identity",
     key: "primary-identity",
     fields: [
+      { id: "id", label: "ID" },
       { id: "hostname", label: "Hostname" },
       { id: "title", label: "Instance name" },
       { id: "os", label: "OS" },
-      { id: "id", label: "ID" },
       { id: "status", label: "Status" },
     ],
   },
@@ -27,6 +27,10 @@ export const EXPORT_FIELD_GROUPS: readonly ExportFieldGroup[] = [
       { id: "network_ip_address", label: "IP address" },
       { id: "network_interface", label: "Interface" },
       { id: "network_mac_address", label: "MAC address" },
+      { id: "network_broadcast_address", label: "Broadcast address" },
+      { id: "network_netmask", label: "Netmask" },
+      { id: "network_speed", label: "Speed" },
+      { id: "network_duplex", label: "Duplex" },
     ],
   },
   {
@@ -35,8 +39,14 @@ export const EXPORT_FIELD_GROUPS: readonly ExportFieldGroup[] = [
     fields: [
       { id: "reboot_required_flag", label: "Reboot required" },
       { id: "alert_count", label: "Alert count" },
+      { id: "alerts", label: "Active alerts" },
       { id: "upgrades_security", label: "Security upgrades count" },
+      { id: "upgrades_regular", label: "Regular upgrades count" },
+      { id: "has_release_upgrades", label: "Release upgrade available" },
       { id: "livepatch_info", label: "Livepatch status" },
+      { id: "reboot_packages", label: "Packages needing reboot" },
+      { id: "update_manager_prompt", label: "Update manager prompt" },
+      { id: "ubuntu_pro_reboot_required_info", label: "Pro reboot info" },
     ],
   },
   {
@@ -44,9 +54,20 @@ export const EXPORT_FIELD_GROUPS: readonly ExportFieldGroup[] = [
     key: "compute-storage",
     fields: [
       { id: "hardware_cpu_cores", label: "CPU cores" },
+      { id: "hardware_cpu_model", label: "CPU model" },
+      { id: "hardware_cpu_vendor", label: "CPU vendor" },
       { id: "total_memory", label: "Total memory" },
+      { id: "hardware_memory_size", label: "Memory size (Hardware)" },
+      { id: "total_swap", label: "Total swap" },
       { id: "hardware_disk_size", label: "Total disk size" },
       { id: "computer_type", label: "Computer type" },
+      { id: "hardware_system_serial", label: "System serial" },
+      { id: "hardware_system_vendor", label: "System vendor" },
+      { id: "hardware_system_model", label: "System model" },
+      { id: "mount_device", label: "Mount device" },
+      { id: "mount_point", label: "Mount point" },
+      { id: "mount_filesystem", label: "Filesystem type" },
+      { id: "mount_total_space", label: "Total space" },
     ],
   },
   {
@@ -57,71 +78,62 @@ export const EXPORT_FIELD_GROUPS: readonly ExportFieldGroup[] = [
       { id: "access_group", label: "Access group" },
       { id: "annotations", label: "Annotations" },
       { id: "ubuntu_pro", label: "Ubuntu Pro expiration" },
+      {
+        id: "ubuntu_pro_subscription_type",
+        label: "Ubuntu Pro subscription type",
+      },
       { id: "license_type", label: "License type" },
+      { id: "account_id", label: "Account ID" },
+      { id: "employee_id", label: "Employee ID" },
+      { id: "profiles", label: "Associated profiles" },
+      { id: "comment", label: "Comment" },
+      { id: "archived", label: "Archived" },
     ],
   },
   {
-    title: "Granular Metadata & Deep Diagnostics",
-    key: "granular-metadata-diagnostics",
+    title: "Advanced Infrastructure & Cloud",
+    key: "advanced-infra-cloud",
     fields: [
-      { id: "last_ping_time", label: "Last ping" },
-      { id: "juju_machine_id", label: "Juju machine ID" },
       { id: "cloud_instance_metadata", label: "Cloud instance metadata" },
+      { id: "availability_zone", label: "Availability zone" },
+      { id: "vm_info", label: "VM type" },
+      { id: "container_info", label: "Container type" },
+      { id: "wsl", label: "WSL instance" },
+      { id: "wsl_profiles", label: "WSL profiles" },
+      { id: "juju_machine_id", label: "Juju machine ID" },
+      { id: "juju_model_uuid", label: "Juju model UUID" },
+      { id: "create_instance_supported", label: "Instance creation supported" },
+    ],
+  },
+  {
+    title: "System IDs & Agent Logs",
+    key: "system-ids-logs",
+    fields: [
       { id: "hostagent_uid", label: "Host agent UID" },
       { id: "machine_id", label: "Machine ID" },
       { id: "secure_id", label: "Secure ID" },
       { id: "insecure_id", label: "Insecure ID" },
+      { id: "clone_id", label: "Clone ID" },
       { id: "current_api", label: "Client API version" },
       { id: "current_version", label: "Client version" },
-      { id: "comment", label: "Comment" },
-      { id: "archived", label: "Archived" },
-      { id: "account_id", label: "Account ID" },
-      { id: "employee_id", label: "Employee ID" },
-      { id: "profiles", label: "Associated profiles" },
-      { id: "alerts", label: "Active alerts" },
-      { id: "reboot_packages", label: "Packages needing reboot" },
-      { id: "update_manager_prompt", label: "Update manager prompt" },
-      { id: "upgrades_regular", label: "Regular upgrades count" },
-      { id: "has_release_upgrades", label: "Release upgrade available" },
+      { id: "last_ping_time", label: "Last ping" },
+      { id: "registered_at", label: "Registered at" },
+      { id: "last_exchange_time", label: "Last exchange time" },
+      { id: "last_exchange_duration", label: "Last exchange duration" },
+      { id: "last_exchange_size", label: "Last exchange size" },
       { id: "consecutive_errors", label: "Consecutive errors" },
       { id: "is_inconsistent", label: "Inconsistent" },
-      {
-        id: "ubuntu_pro_subscription_type",
-        label: "Ubuntu Pro subscription type",
-      },
-      { id: "ubuntu_pro_reboot_required_info", label: "Pro reboot info" },
-      { id: "vm_info", label: "VM type" },
-      { id: "container_info", label: "Container type" },
-      { id: "wsl", label: "WSL instance" },
-      { id: "wsl_profiles", label: "WSL profiles" },
+    ],
+  },
+  {
+    title: "Instance Hierarchy",
+    key: "instance-hierarchy",
+    fields: [
       { id: "parent", label: "Parent instance" },
       { id: "children", label: "Child instances" },
       { id: "num_child", label: "Child instance count" },
       { id: "default_child", label: "Default child" },
       { id: "is_default_child", label: "Is default child" },
-      { id: "create_instance_supported", label: "Instance creation supported" },
-      { id: "clone_id", label: "Clone ID" },
-      { id: "hardware_cpu_model", label: "CPU model" },
-      { id: "hardware_cpu_vendor", label: "CPU vendor" },
-      { id: "hardware_memory_size", label: "Memory size (Hardware)" },
-      { id: "total_swap", label: "Total swap" },
-      { id: "hardware_system_serial", label: "System serial" },
-      { id: "hardware_system_vendor", label: "System vendor" },
-      { id: "hardware_system_model", label: "System model" },
-      { id: "mount_device", label: "Mount device" },
-      { id: "mount_point", label: "Mount point" },
-      { id: "mount_filesystem", label: "Filesystem type" },
-      { id: "mount_total_space", label: "Total space" },
-      { id: "network_broadcast_address", label: "Broadcast address" },
-      { id: "network_netmask", label: "Netmask" },
-      { id: "network_speed", label: "Speed" },
-      { id: "network_duplex", label: "Duplex" },
-      { id: "registered_at", label: "Registered at" },
-      { id: "last_exchange_time", label: "Last exchange time" },
-      { id: "last_exchange_duration", label: "Last exchange duration" },
-      { id: "last_exchange_size", label: "Last exchange size" },
-      { id: "availability_zone", label: "Availability zone" },
-      { id: "juju_model_uuid", label: "Juju model UUID" },
     ],
   },
 ];