Revert "Revert "Add keystore to system group""

This reverts commit 40ebb9c596e757fbe5331ba5f286af34297caa2b.