A method and a device for buffering containers in a container treatment system are disclosed. The containers enter into storage on an infeed conveyor belt in the infeed direction, are moved in a single row onto a transversely adjoining buffer area by rail-guided and individually driven shuttles with row pushers in a buffering direction running transverse to the infeed direction, and are removed from storage on an outfeed conveyor belt transversely adjoining in the buffering direction. The shuttles and the infeed/outfeed conveyor belts are controlled in dependence of target positions, target speeds and/or target accelerations stored specifically for the container type, and/or the shuttles are controlled in dependence of target positions, target distances and/or target speeds stored specifically for modes of operation for initializing and reading out the shuttles, for following preceding shuttles, and for moving to route positions.