Could we set this based on amd64-usr vs amd64-generic images? I don't want to mistakenly screw up amd64-generic until we are actually ready to commit to amd64-usr for our releases.