Add more secrets
Only require secure state in prod
Change secret loading to something compatible in prod