Change secrets.yml and refactoring