Merge branch 'derekenos/dockerfile-for-v2.1.1' into 'main'

Minor fixes and Dockerfile update for v2.1.1

See merge request webgroup/arch!4

Version 2.0.0

Final pre-2.0 commit

move hard-coded URLs to config