Proper fix for jdk base image