Better use of ansible variables should make this more portable across releases