Feature/deploy key support