Move h play into gateway playbook
Consolidate secrets