diff --git a/frontend/src/v2/__tests__/V2AgentSettingsPage.test.tsx b/frontend/src/v2/__tests__/V2AgentSettingsPage.test.tsx
index 4fa897751e..1612b48a1e 100644
--- a/frontend/src/v2/__tests__/V2AgentSettingsPage.test.tsx
+++ b/frontend/src/v2/__tests__/V2AgentSettingsPage.test.tsx
@@ -457,9 +457,10 @@ test('runtime editor writes environment controls through the shared settings hoo
   await screen.findByRole('heading', { name: 'Skills' });
   const sections = Array.from(document.querySelectorAll('.v2-agent-settings h2')).map((node) => node.textContent);
   expect(sections).toEqual(expect.arrayContaining(['Identity', 'Policy', 'Skills']));
+  // D215 artboard: Wake first, then Identity & access (Key, Identity).
+  expect(sections.indexOf('Wake')).toBeLessThan(sections.indexOf('Key'));
   expect(sections.indexOf('Key')).toBeLessThan(sections.indexOf('Identity'));
-  expect(sections.indexOf('Identity')).toBeLessThan(sections.indexOf('Wake'));
-  expect(sections.indexOf('Key')).toBeLessThan(sections.indexOf('How it runs'));
+  expect(sections.indexOf('Identity')).toBeLessThan(sections.indexOf('How it runs'));
   expect(sections.indexOf('Wake')).toBeLessThan(sections.indexOf('How it runs'));
   expect(sections.indexOf('How it runs')).toBeLessThan(sections.indexOf('Connector grants'));
   expect(sections.indexOf('Connector grants')).toBeLessThan(sections.indexOf('Policy'));
diff --git a/frontend/src/v2/agents/V2AgentSettingsPage.tsx b/frontend/src/v2/agents/V2AgentSettingsPage.tsx
index 6c9f9ed47c..8531a45cd0 100644
--- a/frontend/src/v2/agents/V2AgentSettingsPage.tsx
+++ b/frontend/src/v2/agents/V2AgentSettingsPage.tsx
@@ -261,6 +261,7 @@ const V2AgentSettingsPage: React.FC = () => {
       </nav>
       <AgentControlLoader agentName={agentName} instanceId={instanceId}
         refreshNonce={connectionRefreshNonce} onConnectionState={onConnectionState} />
+      <V2AgentWakePods agentName={agentName} instanceId={instanceId} updatePod={updatePod} onRemoved={onRemoved} />
       <section className="v2-agent-settings__section" aria-labelledby="agent-keys-title">
         <div className="v2-agent-settings__section-head">
           <h2 id="agent-keys-title">{t('agentSettings.key')}</h2>
@@ -301,7 +302,6 @@ const V2AgentSettingsPage: React.FC = () => {
         )}
       </section>
       {installation && <V2AgentIdentitySection key={`${agentName}:${instanceId}`} installation={installation} update={update} />}
-      <V2AgentWakePods agentName={agentName} instanceId={instanceId} updatePod={updatePod} onRemoved={onRemoved} />
       <V2AgentRuntimeGrants
         key={`runtime:${agentName}:${instanceId}`}
         name={agentName}