Fix keys being stuck in keyring container