This makes deployment easier in hetrogenous environments. Updates ENG-4274 Signed-off-by: James Tucker <[email protected]>