diff --git a/docs/cli/commands/vault.mdx b/docs/cli/commands/vault.mdx
index 7ffec4e91..a111b1500 100644
--- a/docs/cli/commands/vault.mdx
+++ b/docs/cli/commands/vault.mdx
@@ -34,8 +34,8 @@ To ensure secure storage of your login credentials when using the CLI, Infisical
 If a password manager is not available, your credentials are stored in an encrypted text file. 
 
 
-<Accordion title="Supported password managers" defaultOpen="true">
-  By default, the most appropriate password manager is chosen to store your login credentials. 
+<Accordion title="Supported vaults">
+  By default, the most appropriate vault is chosen to store your login credentials. 
   For example, if you are on macOS, KeyChain will be automatically selected.
 
 - [macOS Keychain](https://support.apple.com/en-au/guide/keychain-access/welcome/mac)
diff --git a/docs/cli/faq.mdx b/docs/cli/faq.mdx
new file mode 100644
index 000000000..600386e81
--- /dev/null
+++ b/docs/cli/faq.mdx
@@ -0,0 +1,15 @@
+---
+title: "FAQ"
+---
+
+Frequently asked questions about the CLI can be found on this page. 
+If you can't find the answer you're looking for, please create an issue on our GitHub repository or join our Slack channel for additional support.
+
+<Accordion title="I'm getting a Keyring related error message when trying to login" defaultOpen="true">
+By default, the CLI will choose the most suitable store available on your system. 
+If you experience issues with the default store, you can switch to a different one. 
+If none of the available stores work for you, you can try using the `file` store type by running `infisical vault set file`, which should work in most cases. 
+If you are still experiencing trouble, please seek support. 
+
+[Learn more about vault command](./commands/vault)
+</Accordion>
\ No newline at end of file
diff --git a/docs/mint.json b/docs/mint.json
index 57beea626..cbac56d5a 100644
--- a/docs/mint.json
+++ b/docs/mint.json
@@ -97,7 +97,8 @@
             "cli/commands/export",
             "cli/commands/vault"
           ]
-        }
+        },
+        "cli/faq"
       ]
     },
     {