There are options to define how container numbering is handled. Right in the General Tab. These settings work for me...

Container Number: Reuse available numbers

Delete no longer needed Temporary Containers: After the last tab in it closes