diff --git a/src/mcp/tools/device/__tests__/list_devices.test.ts b/src/mcp/tools/device/__tests__/list_devices.test.ts
index 922474c1..97b4c6cd 100644
--- a/src/mcp/tools/device/__tests__/list_devices.test.ts
+++ b/src/mcp/tools/device/__tests__/list_devices.test.ts
@@ -217,7 +217,7 @@ describe('list_devices plugin (device-shared)', () => {
       expect(text).toContain('Test iPhone');
       expect(text).toContain('test-device-123');
       expect(result.nextStepParams).toEqual({
-        build_device: { scheme: 'YOUR_SCHEME', deviceId: 'UUID_FROM_ABOVE' },
+        build_device: { scheme: 'YOUR_SCHEME' },
         install_app_device: { deviceId: 'UUID_FROM_ABOVE', appPath: 'PATH_TO_APP' },
       });
     });
diff --git a/src/mcp/tools/device/list_devices.ts b/src/mcp/tools/device/list_devices.ts
index fa0d6c14..f592d77a 100644
--- a/src/mcp/tools/device/list_devices.ts
+++ b/src/mcp/tools/device/list_devices.ts
@@ -340,7 +340,7 @@ export async function list_devicesLogic(
         ctx.emit(event);
       }
       ctx.nextStepParams = {
-        build_device: { scheme: 'YOUR_SCHEME', deviceId: 'UUID_FROM_ABOVE' },
+        build_device: { scheme: 'YOUR_SCHEME' },
         install_app_device: { deviceId: 'UUID_FROM_ABOVE', appPath: 'PATH_TO_APP' },
       };
     },
diff --git a/src/snapshot-tests/__fixtures__/cli/device/list--success.txt b/src/snapshot-tests/__fixtures__/cli/device/list--success.txt
index b6e03de4..eb5a71b2 100644
--- a/src/snapshot-tests/__fixtures__/cli/device/list--success.txt
+++ b/src/snapshot-tests/__fixtures__/cli/device/list--success.txt
@@ -29,6 +29,6 @@ Hints
   Before running build/run/test/UI automation tools, set the desired device identifier in session defaults.
 
 Next steps:
-1. Build for device: xcodebuildmcp device build --scheme "YOUR_SCHEME" --device-id "UUID_FROM_ABOVE"
+1. Build for device: xcodebuildmcp device build --scheme "YOUR_SCHEME"
 2. Run tests on device: xcodebuildmcp device test
 3. Get app path: xcodebuildmcp device get-app-path
diff --git a/src/snapshot-tests/__fixtures__/mcp/device/list--success.txt b/src/snapshot-tests/__fixtures__/mcp/device/list--success.txt
index 609c38dd..4685d8a3 100644
--- a/src/snapshot-tests/__fixtures__/mcp/device/list--success.txt
+++ b/src/snapshot-tests/__fixtures__/mcp/device/list--success.txt
@@ -29,6 +29,6 @@ Hints
   Before running build/run/test/UI automation tools, set the desired device identifier in session defaults.
 
 Next steps:
-1. Build for device: build_device({ scheme: "YOUR_SCHEME", deviceId: "UUID_FROM_ABOVE" })
+1. Build for device: build_device({ scheme: "YOUR_SCHEME" })
 2. Run tests on device: test_device()
 3. Get app path: get_device_app_path()