Add ID for all targets

All targets should have ID. This way it's easier to refer to needed
target

Pick-to: 6.4 6.5 6.3 6.2
Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

21 files changed, 128 insertions, 96 deletions

diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml
index be3ae905..4ba7019a 100644
--- a/coin/platform_configs/address_sanitizer_platforms.yaml
+++ b/coin/platform_configs/address_sanitizer_platforms.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'OpenSUSE-15.4-host-ASAN'
+    Id: 'opensuse-15.4-host-asan'
     Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 7477e345..2db8b0a4 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -8,13 +8,14 @@ Include: [
     ]
 Configurations:
 -
+    Id: 'ubuntu-20.04-documentation'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'Ubuntu-20.04-host'
+    Id: 'ubuntu-20.04'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure']
@@ -24,7 +25,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
 -
-    Id: 'OpenSUSE-15.4-host'
+    Id: 'opensuse-15.4-developer-build'
     Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
@@ -34,6 +35,7 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
     ]
 -
+    Id: 'sles-15_sp4-static'
     Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests', 'UseConfigure']
@@ -42,6 +44,7 @@ Configurations:
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
+    Id: 'windows-10_22h2-msvc2019'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
@@ -55,6 +58,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-11_22h2-msvc2019'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
@@ -67,6 +71,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-10_22h2-msvc2022'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
@@ -79,6 +84,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-11_22h2-msvc2022'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
@@ -91,7 +97,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'Windows10_22H2-MSVC2019-x64-host'
+    Id: 'windows-10_22h2-msvc2019-developer-build'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
@@ -104,11 +110,12 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-10_22h2-msvc2019-arm64'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
     Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
@@ -121,7 +128,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'Windows11_22H2-MSVC2019-x64-host'
+    Id: 'windows-11_22h2-msvc2019-developer-build'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
@@ -133,11 +140,12 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-11_2122-msvc2019-arm64'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
     Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'Windows11_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-11_22h2-msvc2019-developer-build'
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
@@ -147,7 +155,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'RHEL-9.0-host'
+    Id: 'rhel-9.0'
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
@@ -164,7 +172,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
@@ -172,7 +180,7 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
     ]
 -
-    Id: 'Windows10_22H2-Mingw11-x64-host'
+    Id: 'windows-10_22h2-mingw11'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'UseConfigure']
@@ -187,7 +195,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
-    Id: 'Windows10_22H2-LLVM-x64-host'
+    Id: 'windows-10_22h2-llvm'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Clang'
     Features: ['Sccache', 'UseConfigure']
@@ -201,7 +209,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
-    Id: 'Windows11_22H2-LLVM-x64-host'
+    Id: 'windows-11_22h2-llvm'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'Clang'
     Features: ['Sccache', 'UseConfigure']
@@ -215,6 +223,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
+    Id: 'windows-10_22h2-mingw11-developer-build'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
@@ -228,6 +237,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
+    Id: 'windows-11_22h2-mingw11-developer-build'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml
index 76ce1795..a2bba928 100644
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -1,12 +1,12 @@
 Version: 2
 Configurations:
 -
-    Id: 'qemu-armv7-on-ubuntu20.04'
+    Id: 'qemu-armv7-developer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Sccache', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
@@ -18,11 +18,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-arm64-developer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'arm64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Sccache', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
@@ -34,11 +35,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-mips64-developer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'mips64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
index 680c3b34..0d1d732c 100644
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -1,13 +1,13 @@
 Version: 2
 Configurations:
 -
-    Id: 'qnx-x86_64-on-ubuntu20.04'
+    Id: 'qnx-710-x86_64-developer-build-on-linux'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Packaging', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -16,24 +16,26 @@ Configurations:
         'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
     ]
 -
+    Id: 'qnx-710-arm64-on-linux'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
     ]
 -
+    Id: 'qnx-710-armv7-on-linux'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml
index f845019b..4102c5ab 100644
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15-static'
+    Id: 'sles-15_sp4-minimal-static'
     Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
@@ -10,6 +10,7 @@ Configurations:
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
+    Id: 'windows-10_22h2-minimal-static'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
@@ -21,6 +22,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'macos-11-minimal-static'
     Template: 'qtci-macos-11-x86_64-105'
     Compiler: 'Clang'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml
index cccae1be..3623c346 100644
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -7,7 +7,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
@@ -18,12 +18,13 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
+    Id: 'android-armv7-on-windows'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Mingw'
     Target compiler: 'Clang'
-    Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
+    Platform dependency: 'windows-10_22h2-mingw11'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -35,13 +36,13 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Id: 'RHEL-9.0-Android-x86'
+    Id: 'android-x86-on-linux'
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
+    Platform dependency: 'rhel-9.0'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
@@ -52,13 +53,13 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Id: 'RHEL-9.0-Android-x86_64'
+    Id: 'android-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
+    Platform dependency: 'rhel-9.0'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
diff --git a/coin/platform_configs/cmake_platforms_target_android_12.yaml b/coin/platform_configs/cmake_platforms_target_android_12.yaml
index 0e02c872..9065768b 100644
--- a/coin/platform_configs/cmake_platforms_target_android_12.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml
@@ -1,12 +1,13 @@
 Version: 2
 Configurations:
 -
+    Id: 'android-12-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
+    Platform dependency: 'rhel-9.0'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
diff --git a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
index e03fde43..90fe62cd 100644
--- a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
@@ -6,7 +6,7 @@ Configurations:
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
+    Platform dependency: 'rhel-9.0'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml
index cbf5ac37..f26322de 100644
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -5,7 +5,7 @@ Configurations:
     Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
-    Platform dependency: 'OpenSUSE-15.4-host'
+    Platform dependency: 'opensuse-15.4-developer-build'
     Features: ['Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -18,7 +18,7 @@ Configurations:
     Target os: 'WebAssembly'
     Compiler: 'Mingw'
     Target compiler: 'Clang'
-    Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
+    Platform dependency: 'windows-10_22h2-mingw11'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -35,7 +35,7 @@ Configurations:
     Target os: 'WebAssembly'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 5b287447..34c4ea1d 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Configurations:
 -
+    Id: 'ubuntu-20.04-license-check'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml
index ada9081c..b8940201 100644
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -1,11 +1,11 @@
 Version: 2
 Configurations:
     -
-      Id: "integrity-arm64-on-ubuntu20.04"
+      Id: "integrity-arm64"
       Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
       Compiler: 'GCC'
       Target os: 'INTEGRITY'
-      Platform dependency: 'Ubuntu-20.04-host'
+      Platform dependency: 'ubuntu-20.04'
       Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
       Environment variables: [
           'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml
index 46b2a471..20221161 100644
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -1,13 +1,13 @@
 Version: 2
 Configurations:
 -
-    Id: "ios-tests-target"
+    Id: "ios-tests-on-macos"
     Template: 'qtci-macos-12-x86_64-105'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml
index 89c85fe8..fa2c1e0d 100644
--- a/coin/platform_configs/linux_android_tests_developer.yaml
+++ b/coin/platform_configs/linux_android_tests_developer.yaml
@@ -1,12 +1,13 @@
 Version: 2
 Configurations:
 -
+    Id: 'android-x86-developer-build-testrun-on-linux'
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
+    Platform dependency: 'rhel-9.0'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml
index f7857ece..96c7df45 100644
--- a/coin/platform_configs/linux_android_tests_multi_abi.yaml
+++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml
@@ -1,16 +1,16 @@
 Version: 2
 Configurations:
 -
-    Id: 'RHEL_9_Android_Multi'
+    Id: 'rhel_9.0_android_multi'
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'multi'
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: [
-        'RHEL-9.0-host',
-        'RHEL-9.0-Android-x86',
-        'RHEL-9.0-Android-x86_64'
+        'rhel-9.0',
+        'android-x86-on-linux',
+        'android-x86_64-on-linux'
     ]
     Features: [
         'Sccache',
@@ -19,8 +19,8 @@ Configurations:
         'InstallDepsPerPlatformSubdir'
     ]
     Environment variables: [
-        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_RHEL-9.0-host',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_RHEL-9.0-Android-x86',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_RHEL-9.0-Android-x86_64',
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.0',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-x86-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-x86_64-on-linux',
         'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
     ]
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index 1d58e5df..c530730a 100644
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -8,7 +8,7 @@ Configurations:
     # Build on recent macOS version with latest Xcode
 
     -
-        Id: 'macos-latest-xcode-universal-packaging-build'
+        Id: 'macos-universal-on-x86_64'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
@@ -22,7 +22,7 @@ Configurations:
         ]
 
     -
-        Id: 'macos-latest-xcode-arm64-universal-build'
+        Id: 'macos-universal-on-arm64'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
@@ -41,43 +41,43 @@ Configurations:
         Template: 'qtci-macos-11-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-11-arm64-tests'
         Template: 'qtci-macos-11.0-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-12-arm64-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-13-arm64-tests'
         Template: 'qtci-macos-13-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-12-x86_64-tests'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
-        Id: 'macos-12-arm64-arm64-universal-build-tests'
+        Id: 'macos-12-arm-on-arm64-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
+        Platform dependency: 'macos-universal-on-arm64'
     -
-        Id: 'macos-12-x86_64-arm64-universal-build-tests'
+        Id: 'macos-12-arm-on-x86_64-tests'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
+        Platform dependency: 'macos-universal-on-arm64'
 
     # =========================================================================
     # Developer build. Single architecture builds.
@@ -86,7 +86,7 @@ Configurations:
     # Build on recent macOS version with latest Xcode
 
     -
-        Id: 'macos-latest-xcode-x86_64-developer-build'
+        Id: 'macos-12-x86_64-developer-build'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -97,7 +97,7 @@ Configurations:
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
         ]
     -
-        Id: 'macos-latest-xcode-arm64-developer-build'
+        Id: 'macos-12-arm64-developer-build'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -116,28 +116,28 @@ Configurations:
         Template: 'qtci-macos-11-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+        Platform dependency: 'macos-12-x86_64-developer-build'
     -
         Id: 'macos-11-arm64-developer-build-tests'
         Template: 'qtci-macos-11.0-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
     -
         Id: 'macos-12-x86_64-developer-build-tests'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+        Platform dependency: 'macos-12-x86_64-developer-build'
     -
         Id: 'macos-12-arm64-developer-build-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
     -
         Id: 'macos-13-arm64-developer-build-tests'
         Template: 'qtci-macos-13-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
diff --git a/coin/platform_configs/nightly_macos13.yaml b/coin/platform_configs/nightly_macos13.yaml
index 32690750..de917980 100644
--- a/coin/platform_configs/nightly_macos13.yaml
+++ b/coin/platform_configs/nightly_macos13.yaml
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Include: [
     macos.yaml: [
-        "macos-latest-xcode-arm64-developer-build"
+        "macos-12-arm64-developer-build"
     ]
 ]
 Configurations:
@@ -11,4 +11,4 @@ Configurations:
     Template: 'qtci-macos-13-arm64'
     Compiler: 'Clang'
     Features: ['TestOnly']
-    Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+    Platform dependency: 'macos-12-arm64-developer-build'
diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml
index 852b6f78..614a982f 100644
--- a/coin/platform_configs/nightly_qnx710_host_windows.yaml
+++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml
@@ -1,17 +1,18 @@
 Version: 2
 Include: [
     cmake_platforms.yaml: [
-        Windows10_22H2-MSVC2019-x64-host
+        windows-10_22h2-msvc2019-developer-build
     ]
 ]
 Configurations:
 -
+    Id: 'qnx-710-arm64-on-windows'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'MSVC2019'
     Target compiler: 'QCC'
-    Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
     Features: ['DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
diff --git a/coin/platform_configs/nightly_ubuntu_22_04.yaml b/coin/platform_configs/nightly_ubuntu_22_04.yaml
index 845aa338..a27cc758 100644
--- a/coin/platform_configs/nightly_ubuntu_22_04.yaml
+++ b/coin/platform_configs/nightly_ubuntu_22_04.yaml
@@ -2,12 +2,13 @@ Version: 2
 Configurations:
 -
     # cmake_platforms.yaml
+    Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'Documentation', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
-    Id: 'Ubuntu-22.04-host'
+    Id: 'ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
@@ -17,11 +18,12 @@ Configurations:
     ]
 -
     # cmake_platforms_qemu.yaml
+    Id: 'qemu-armv7-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -32,11 +34,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-arm64-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'arm64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -47,11 +50,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-mips64-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'mips64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache', 'DisableTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -63,12 +67,13 @@ Configurations:
     ]
 -
     # cmake_platforms_qemu_qnx710.yaml
+    Id: 'qnx-710-x86_64-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QNX_710'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -77,24 +82,26 @@ Configurations:
         'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
     ]
 -
+    Id: 'qnx-710-arm64-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
     ]
 -
+    Id: 'qnx-710-armv7-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QNX_710'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -102,15 +109,17 @@ Configurations:
     ]
 -
     # default.yaml
+    Id: 'ubuntu-22.04-license-check'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
 -
     # integrity.yaml
+    Id: 'integrity-arm64-on-ubuntu-22.04-x86_64'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Target os: 'INTEGRITY'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml
index 25583ec1..7293660e 100644
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -3,7 +3,7 @@ Module only: True
 Include: [
   cmake_platforms.yaml: [
     "Ubuntu-20.04-host",
-    "Windows10_22H2-MSVC2019-x64-host",
+    "windows-10_22h2-msvc2019-developer-build",
     "ios-universal"
   ],
   macos.yaml: [
@@ -13,10 +13,10 @@ Include: [
     "android-arm64-on-macos"
   ],
   cmake_platforms_qemu.yaml: [
-    "qemu-armv7-on-ubuntu20.04"
+    "qemu-armv7-developer-build"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
-    "qnx-x86_64-on-ubuntu20.04"
+    "qnx-710-x86_64-developer-build-on-linux"
   ]
 ]
 Configurations: []
diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml
index 34b8127b..35485d9c 100644
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -2,13 +2,14 @@ Version: 2
 Include: [ cmake_platforms_target_android.yaml ]
 Configurations:
 -
+    Id: 'automotive-ubuntu-20.04-documentation'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'Windows10_22H2-Mingw11-x64-host'
+    Id: 'automotive-windows-10_22h2-mingw11'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
@@ -20,7 +21,7 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
     ]
 -
-    Id: 'macos-latest-xcode-universal-packaging-build'
+    Id: 'macos-universal-on-x86_64'
     Template: 'qtci-macos-12-x86_64-105'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
@@ -32,7 +33,7 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
     ]
 -
-    Id: 'RHEL-9.0-host'
+    Id: 'rhel-9.0'
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
@@ -42,12 +43,13 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
     ]
 -
+    Id: "automotive-android-x86-on-linux"
     Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
+    Platform dependency: 'rhel-9.0'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
diff --git a/coin/platform_configs/webos.yaml b/coin/platform_configs/webos.yaml
index 277d21e5..200a91b7 100644
--- a/coin/platform_configs/webos.yaml
+++ b/coin/platform_configs/webos.yaml
@@ -1,54 +1,54 @@
 Version: 2
 Module only: true
 Configurations:
-  - Id: 'WebOS-emulator-build'
+  - Id: 'webos-emulator-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_EMULATOR=enabled']
-  - Id: 'WebOS-emulator-qtbase-tests'
+  - Id: 'webos-emulator-qtbase-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtbase']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtdeclarative-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtdeclarative-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtdeclarative']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtwayland-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtwayland-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtwayland']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtshadertools-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtshadertools-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtshadertools']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtgraphicaleffects-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtgraphicaleffects-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtgraphicaleffects']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-raspberry-build'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-raspberry-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_RASPBERRY=enabled']
-  - Id: 'WebOS-NDK-installer-build'
+  - Id: 'webos-ndk-installer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_NDK_INSTALLER=enabled']
-  - Id: 'WebOS-NDK-install'
+  - Id: 'webos-ndk-install'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
-    Platform dependency: ['WebOS-raspberry-build', 'WebOS-NDK-installer-build']
+    Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build']
     Environment variables: ['TEST_INSTALL_NDK=enabled']