Fixes for multi-env ringtail deploy