diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index 42f3e3aeed04..723860db2371 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -82,10 +82,8 @@ int CameraHalConfig::Private::parseConfigFile(File &file,
 	if (!yamlObjectCameras.isDictionary())
 		return -EINVAL;
 
-	std::vector<std::string> cameraIds = yamlObjectCameras.memberNames();
-	for (const std::string &cameraId : cameraIds) {
-		if (parseCameraConfigData(cameraId,
-					  yamlObjectCameras[cameraId]))
+	for (const auto &[cameraId, configData] : yamlObjectCameras.asDict()) {
+		if (parseCameraConfigData(cameraId, configData))
 			return -EINVAL;
 	}