Working to align GEM with best practice config.