fix current_user
always build image when needed