Proper fix for dockerized builds (and restore some flags set in jk-setup)