ADD: Custom keystore

Fixed authorization issues.