Updated so container has knowledge of key store