Fix wrong count and tagging of Docker containers