Fix repo branch conflict(s) so that we can build and deploy a prod container

[korlaxxalrok]

We are currently running the prod version of this site via a non-prod container. Though it is largely dormant at the moment, it would be good to fix this. Additional reference here.

[korlaxxalrok]

#44 needs to be resolved.