Add custom configuration
Merge branch 'add-options'
Add env variables for semaphore