diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 00000000..b5e7ad32
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1,18 @@
+# Frequently Asked Questions
+
+This FAQ answers common questions about using Percona Server for PostgreSQL 17.
+
+If you're looking for help with errors or runtime issues, see the [Troubleshooting guide](troubleshooting.md).
+
+## Does MINOR cover both upstream feature and patch releases?
+
+Yes, if we ship a future minor of PG17+ this always includes the patchset from Percona as well.
+
+## When upstream bumps MINOR, should PATCH always reset to 1?
+
+The first release will always be `MAJOR.MINOR.1`.
+
+!!! note
+    Don’t see your question here? Feel free to click the link below to get free database assistance or contact our experts for personalized support.
+
+    [**Get help from Percona**](get-help.md)
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 9663c2fe..e2e7c1b1 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -1,10 +1,14 @@
 # Troubleshooting guide
 
+This guide helps you identify and resolve common issues when installing, configuring, or running Percona Server for PostgreSQL 17.
+
+If you're looking for general information or usage tips, check the [FAQ](faq.md).
+
 ## Cannot create a table. Permission denied in schema `public`
 
 Every database in PostgreSQL has a default schema called `public`. A schema stores database objects like tables, views, indexes and allows organizing them into logical groups.
 
-When you create a table without specifying a schema name, it ends up in the `public` schema by default. 
+When you create a table without specifying a schema name, it ends up in the `public` schema by default.
 
 Starting with PostgreSQL 15, non-database owners cannot access the `public` schema. Therefore, you can either grant privileges to the database for your user using the [GRANT](https://www.postgresql.org/docs/{{pgvesrion}}/sql-grant.html) command or create your own schema to insert the data.
 
diff --git a/docs/versioning.md b/docs/versioning.md
new file mode 100644
index 00000000..1a5db560
--- /dev/null
+++ b/docs/versioning.md
@@ -0,0 +1,29 @@
+# Version Numbering
+
+Starting with PostgreSQL {{pgversion}}, Percona uses the following format:
+
+`MAJOR.MINOR.PATCH`
+
+For example:
+
+`{{pspgversion}}`
+
+Where:
+
+- **MAJOR** = The upstream PostgreSQL major version (e.g. 17 → PostgreSQL 17)
+- **MINOR** = The upstream PostgreSQL release number
+- **PATCH** = Percona's internal build number (specific to packaging or Percona-only updates)
+
+| **Release type** | **Version example** | **What changes?** |
+| --- | --- | --- |
+| **First Percona build** | 17.0.1 | Initial Percona build on upstream 17.0, build #1 |
+| **Percona-only update** | 17.0.2 | Build #2 on the same upstream 17.0 |
+| **Upstream patch/feature** | 17.1.1 | Upstream release → MINOR bump to 1, PATCH reset to 1 |
+| **Next Percona build** | 17.1.2 | Build #2 on upstream 17.1 |
+
+The above versioning is only applicable to PSP 17.x.x as it is the only Percona forked server. The **third digit** is **always** PSP’s build number, never an upstream patch. If you see it go from …1 → …2 this means a PSP-specific update was shipped.
+
+Since PPG 13 to 16 are pure community versions, only the first 2 digits scheme is used for them.
+
+!!! note
+    If you're looking for more information, check the [FAQ](faq.md#does-minor-cover-both-upstream-feature-and-patch-releases).
diff --git a/mkdocs.yml b/mkdocs.yml
index 6b6cf247..636d3331 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,6 +82,7 @@ nav:
       - "Major upgrade": major-upgrade.md
       - minor-upgrade.md
       - migration.md
+  - FAQ: faq.md  
   - Troubleshooting guide: troubleshooting.md
   - Uninstall: uninstalling.md
   - Release notes:
@@ -96,4 +97,5 @@ nav:
   - Reference:
       - Telemetry: telemetry.md
       - Licensing: licensing.md
+      - Versioning: versioning.md
       - Trademark policy: trademark-policy.md