Merge pull request #24064 from G-M0N3Y-2503/docker-update