Remove hardcoded variables in atom.xml