Revert "Revert "Update image tree""

This reverts commit a7cce5f0a39ba2d218a6a41952c4a5720dd8a7dc.