diff --git a/docs/docs/.vitepress/sidebar.ts b/docs/docs/.vitepress/sidebar.ts
index 95d3f3f60..7231535ee 100644
--- a/docs/docs/.vitepress/sidebar.ts
+++ b/docs/docs/.vitepress/sidebar.ts
@@ -188,14 +188,11 @@ export const sidebar = [
             {
                 text: "FAQ",
                 items: [
+                    { text: "General", link: "/self-hosting/faq/" },
                     {
                         text: "Verification code",
                         link: "/self-hosting/faq/otp",
                     },
-                    {
-                        text: "Increase storage space",
-                        link: "/self-hosting/faq/storage-space",
-                    },
                 ],
             },
             {
diff --git a/docs/docs/self-hosting/faq/index.md b/docs/docs/self-hosting/faq/index.md
new file mode 100644
index 000000000..622e74a24
--- /dev/null
+++ b/docs/docs/self-hosting/faq/index.md
@@ -0,0 +1,33 @@
+---
+title: FAQ - Self hosting
+description: Frequently asked questions about self hosting Ente
+---
+
+# Frequently Asked Questions
+
+### Do Ente Photos and Ente Auth share the same backend?
+
+Yes. The apps share the same backend, the same database and the same object
+storage namespace. The same user account works for both of them.
+
+### Can I just self host Ente Auth?
+
+Yes, if you wish, you can self-host the server and use it only for the 2FA auth
+app. The starter Docker compose will work fine for either Photos or Auth (or
+both!)
+
+### Can I use the server with _X_ as the object storage?
+
+Yes. As long as whatever X you're using provides an S3 compatible API, you can
+use it as the underlying object storage. For example, the starter self-hosting
+Docker compose file we offer uses MinIO, and on our production deployments we
+use Backblaze/Wasabi/Scaleway. But that's not the full list - as long as the
+service you intend to use has a S3 compatible API, it can be used.
+
+### How do I increase storage space for users on my self hosted instance?
+
+See the [guide for administering your server](/self-hosting/guides/admin). In
+particular, you can use the `ente admin update-subscription` CLI command to
+increase the
+[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
+of accounts on your instance.
diff --git a/docs/docs/self-hosting/faq/storage-space.md b/docs/docs/self-hosting/faq/storage-space.md
deleted file mode 100644
index f1ad78c71..000000000
--- a/docs/docs/self-hosting/faq/storage-space.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Increase storage space
-description: Increasing the storage quota for users on your self hosted instance
----
-
-# Increase storage space
-
-See the [guide for administering your server](/self-hosting/guides/admin). In
-particular, you can use the `ente admin update-subscription` CLI command to
-increase the
-[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
-of accounts on your instance.