We should update all parts in the code where we still have broker.id, f.e.,
StrimziKafkaContainer brokerContainer = new StrimziKafkaContainer()
.withBrokerId(brokerId)
.withKafkaConfigurationMap(kafkaConfiguration)
.withNetwork(this.network)
.withProxyContainer(proxyContainer)
.withKafkaVersion(kafkaVersion == null ? KafkaVersionService.getInstance().latestRelease().getVersion() : kafkaVersion)
.withNodeId(brokerId)
.withClusterId(this.clusterId)
.withNodeRole(KafkaNodeRole.BROKER)
.waitForRunning();
with just using .withNodeId(nodeId). Also, remove a few checks in the StrimziKafkaContainer related to that specific variable.