I propose to build both images in the https://github.com/jenkinsci/docker-agent/ repository, for faster releases and easier maintenance.
(Opening an issue here for your information/visibility)
See jenkinsci/docker-agents#569 for more details.
Corresponding pull request, ready for review: jenkinsci/docker-agents#570