Change hardcoded 'riak' to template variable