diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 5aea5bebd2d..17006554867 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -167,8 +167,8 @@ public:
     void setSysRoot(const Utils::FilePath &sysRoot) { m_sysRoot = sysRoot; }
     Utils::FilePath sysRoot() const { return m_sysRoot; }
 
-    // iOS 17+
-    QString deviceUuid;
+    void setDeviceUuid(const QString &uuid) { m_deviceUuid = uuid; }
+    QString deviceUuid() const { return m_deviceUuid; }
 
     // Used by general core file debugging. Public access requested in QTCREATORBUG-17158.
     Utils::FilePath coreFile;
@@ -271,6 +271,8 @@ private:
     QString m_deviceSymbolsRoot;
     bool m_continueAfterAttach = false;
     Utils::FilePath m_sysRoot;
+
+    QString m_deviceUuid; // iOS 17+
 };
 
 namespace Internal {
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 1b489369a9d..88f5450e130 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -118,11 +118,6 @@ void DebuggerRunTool::setDebugInfoLocation(const FilePath &debugInfoLocation)
     m_runParameters.debugInfoLocation = debugInfoLocation;
 }
 
-void DebuggerRunTool::setDeviceUuid(const QString &uuid)
-{
-    m_runParameters.deviceUuid = uuid;
-}
-
 void DebuggerRunTool::setTestCase(int testCase)
 {
     m_runParameters.testCase = testCase;
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index 0eae3d8de55..712bf99c14a 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -52,8 +52,6 @@ public:
 
     void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
 
-    void setDeviceUuid(const QString &uuid);
-
     void setAbi(const ProjectExplorer::Abi &abi);
 
     DebuggerEngineType cppEngineType() const;
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 79681f084d2..7634d824add 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -269,7 +269,7 @@ void LldbEngine::handleLldbStarted()
     cmd2.arg("startmode", rp.startMode());
     cmd2.arg("nativemixed", isNativeMixedActive());
     cmd2.arg("workingdirectory", rp.inferior().workingDirectory.path());
-    cmd2.arg("deviceUuid", rp.deviceUuid);
+    cmd2.arg("deviceUuid", rp.deviceUuid());
     Environment environment = rp.inferior().environment;
     // Prevent lldb from automatically setting OS_ACTIVITY_DT_MODE to mirror
     // NSLog to stderr, as that will also mirror os_log, which we pick up in
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 5ad84edd73a..2c16d6a150d 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -926,7 +926,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
         if (dev->handler() == IosDevice::Handler::DeviceCtl) {
             QTC_CHECK(IosDeviceManager::isDeviceCtlDebugSupported());
             rp.setStartMode(AttachToIosDevice);
-            setDeviceUuid(dev->uniqueInternalDeviceId());
+            rp.setDeviceUuid(dev->uniqueInternalDeviceId());
         } else {
             rp.setStartMode(AttachToRemoteProcess);
         }