These labels need to be reverted to from jboss.container.product to jboss.product, which were the labels used previously. They also need to be declared in the openjdk image files as opposed to the modules, as they pollute other product images.