Docker: improve tags support