[KARAF-3006] Align with KARAF-3207