diff --git a/dev/doc-import-tool/src/import.ts b/dev/doc-import-tool/src/import.ts
index 2e2a1aa2b06..4d3f753cd0e 100644
--- a/dev/doc-import-tool/src/import.ts
+++ b/dev/doc-import-tool/src/import.ts
@@ -86,6 +86,7 @@ async function createDocument (
     seqNumber: 0,
     major: 1,
     minor: 0,
+    patch: 0,
     commentSequence: 0,
     template: templateId,
     state: DocumentState.Draft,
@@ -170,6 +171,7 @@ async function createTemplateIfNotExist (
     category,
     major: 0,
     minor: 1,
+    patch: 0,
     commentSequence: 0,
     state: DocumentState.Draft,
     author: owner,
diff --git a/models/controlled-documents/src/migration.ts b/models/controlled-documents/src/migration.ts
index d9be18a1579..7466ee95af0 100644
--- a/models/controlled-documents/src/migration.ts
+++ b/models/controlled-documents/src/migration.ts
@@ -151,6 +151,7 @@ async function createProductChangeControlTemplate (tx: TxOperations): Promise<vo
         seqNumber: 0,
         major: 1,
         minor: 0,
+        patch: 0,
         state: DocumentState.Effective,
         commentSequence: 0,
         content: null
@@ -527,6 +528,19 @@ async function migrateExternalApprovers (client: MigrationClient): Promise<void>
   )
 }
 
+async function migratePatchVersion (client: MigrationClient): Promise<void> {
+  await client.update(
+    DOMAIN_DOCUMENTS,
+    {
+      _class: documents.class.ControlledDocument,
+      patch: { $exists: false }
+    },
+    {
+      patch: 0
+    }
+  )
+}
+
 export const documentsOperation: MigrateOperation = {
   async migrate (client: MigrationClient, mode): Promise<void> {
     await tryMigrate(mode, client, documentsId, [
@@ -568,6 +582,10 @@ export const documentsOperation: MigrateOperation = {
       {
         state: 'migrateExternalApprovers',
         func: migrateExternalApprovers
+      },
+      {
+        state: 'migratePatchVersion',
+        func: migratePatchVersion
       }
     ])
   },
diff --git a/models/controlled-documents/src/types.ts b/models/controlled-documents/src/types.ts
index 1974b9a6ee7..3d3cec12e3b 100644
--- a/models/controlled-documents/src/types.ts
+++ b/models/controlled-documents/src/types.ts
@@ -250,6 +250,9 @@ export class TDocument extends TDoc implements Document {
   @Prop(TypeNumber(), documents.string.Minor)
     minor!: number
 
+  @Prop(TypeNumber(), documents.string.Patch)
+    patch!: number
+
   @Prop(TypeRef(documents.class.DocumentCategory), documents.string.Category)
     category?: Ref<DocumentCategory>
 
diff --git a/models/products/src/index.ts b/models/products/src/index.ts
index 46c7bb19fdf..b18e2bc94b2 100644
--- a/models/products/src/index.ts
+++ b/models/products/src/index.ts
@@ -115,6 +115,10 @@ export class TProductVersion extends TProject implements ProductVersion {
   @ReadOnly()
     minor!: number
 
+  @Prop(TypeNumber(), products.string.Patch)
+  @ReadOnly()
+    patch!: number
+
   @Prop(TypeString(), products.string.Codename)
     codename?: string
 
diff --git a/models/products/src/migration.ts b/models/products/src/migration.ts
index d887359231e..6fda6290770 100644
--- a/models/products/src/migration.ts
+++ b/models/products/src/migration.ts
@@ -13,9 +13,36 @@
 // limitations under the License.
 //
 
-import { type MigrateOperation, type MigrationClient, type MigrationUpgradeClient } from '@hcengineering/model'
+import {
+  type MigrateOperation,
+  type MigrationClient,
+  type MigrationUpgradeClient,
+  tryMigrate
+} from '@hcengineering/model'
+import { DOMAIN_DOCUMENTS } from '@hcengineering/model-controlled-documents'
+import products, { productsId } from '@hcengineering/products'
+
+async function migratePatchVersion (client: MigrationClient): Promise<void> {
+  await client.update(
+    DOMAIN_DOCUMENTS,
+    {
+      _class: products.class.ProductVersion,
+      patch: { $exists: false }
+    },
+    {
+      patch: 0
+    }
+  )
+}
 
 export const productsOperation: MigrateOperation = {
-  async migrate (client: MigrationClient): Promise<void> {},
+  async migrate (client: MigrationClient, mode): Promise<void> {
+    await tryMigrate(mode, client, productsId, [
+      {
+        state: 'migratePatchVersion',
+        func: migratePatchVersion
+      }
+    ])
+  },
   async upgrade (state: Map<string, Set<string>>, client: () => Promise<MigrationUpgradeClient>): Promise<void> {}
 }
diff --git a/packages/importer/src/huly/huly.ts b/packages/importer/src/huly/huly.ts
index 9a272711e6c..b14fa488ce4 100644
--- a/packages/importer/src/huly/huly.ts
+++ b/packages/importer/src/huly/huly.ts
@@ -692,6 +692,7 @@ export class HulyFormatImporter {
       code: codeMatch?.[1],
       major: 0,
       minor: 1,
+      patch: 0,
       state: DocumentState.Draft,
       category,
       author,
@@ -735,6 +736,7 @@ export class HulyFormatImporter {
       code: codeMatch?.[1],
       major: 0,
       minor: 1,
+      patch: 0,
       state: DocumentState.Draft,
       category,
       author,
diff --git a/packages/importer/src/importer/builder.ts b/packages/importer/src/importer/builder.ts
index d53ec7bf016..8633a6b8d6f 100644
--- a/packages/importer/src/importer/builder.ts
+++ b/packages/importer/src/importer/builder.ts
@@ -740,6 +740,7 @@ export class ImportWorkspaceBuilder {
     // Validate numbers are positive
     if (!this.validatePossitiveNumber(doc.major)) errors.push('invalid value for field "major"')
     if (!this.validatePossitiveNumber(doc.minor)) errors.push('invalid value for field "minor"')
+    if (!this.validatePossitiveNumber(doc.patch)) errors.push('invalid value for field "patch"')
 
     // Validate arrays
     errors.push(...this.validateArray(doc.reviewers, 'string', 'reviewers'))
@@ -822,6 +823,7 @@ export class ImportWorkspaceBuilder {
     // Validate numbers are positive
     if (!this.validatePossitiveNumber(template.major)) errors.push('invalid value for field "major"')
     if (!this.validatePossitiveNumber(template.minor)) errors.push('invalid value for field "minor"')
+    if (!this.validatePossitiveNumber(template.patch)) errors.push('invalid value for field "patch"')
 
     // Validate arrays
     errors.push(...this.validateArray(template.reviewers, 'string', 'reviewers'))
diff --git a/packages/importer/src/importer/importer.ts b/packages/importer/src/importer/importer.ts
index 73bdd7bb3b0..9843fb00af9 100644
--- a/packages/importer/src/importer/importer.ts
+++ b/packages/importer/src/importer/importer.ts
@@ -197,6 +197,7 @@ export interface ImportControlledDocumentTemplate extends ImportDoc {
   code?: string
   major: number
   minor: number
+  patch: number
   state: DocumentState
   category: Ref<DocumentCategory>
   author?: Ref<Employee>
@@ -220,6 +221,7 @@ export interface ImportControlledDocument extends ImportDoc {
   code?: string
   major: number
   minor: number
+  patch: number
   state: DocumentState
   category?: Ref<DocumentCategory>
   reviewers?: Ref<Employee>[]
@@ -994,6 +996,7 @@ export class WorkspaceImporter {
         title: template.title,
         major: template.major,
         minor: template.minor,
+        patch: template.patch,
         state: template.state,
         author: template.author,
         owner: template.owner,
@@ -1115,6 +1118,7 @@ export class WorkspaceImporter {
         title: document.title,
         major: document.major,
         minor: document.minor,
+        patch: document.patch,
         state: document.state,
         author: document.author,
         owner: document.owner,
diff --git a/plugins/controlled-documents-assets/lang/cs.json b/plugins/controlled-documents-assets/lang/cs.json
index 8b05536cd9e..b7e2234aaa2 100644
--- a/plugins/controlled-documents-assets/lang/cs.json
+++ b/plugins/controlled-documents-assets/lang/cs.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "Začněte psát...",
     "Version": "Verze",
     "TemplateVersion": "Verze šablony",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Vyhledat dokument...",
     "CreateEnVersion": "Vytvořit verzi pro revizi",
     "Approvers": "Schvalovatelé",
diff --git a/plugins/controlled-documents-assets/lang/de.json b/plugins/controlled-documents-assets/lang/de.json
index f3f17d047a3..a5ab215cbd5 100644
--- a/plugins/controlled-documents-assets/lang/de.json
+++ b/plugins/controlled-documents-assets/lang/de.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "Tippen Sie, um mit der Bearbeitung zu beginnen...",
     "Version": "Version",
     "TemplateVersion": "Vorlagenversion",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Dokument suchen...",
     "CreateEnVersion": "Version zur Überprüfung erstellen",
     "Approvers": "Genehmiger",
diff --git a/plugins/controlled-documents-assets/lang/en.json b/plugins/controlled-documents-assets/lang/en.json
index dd9f4ff9fbb..7d95226b67f 100644
--- a/plugins/controlled-documents-assets/lang/en.json
+++ b/plugins/controlled-documents-assets/lang/en.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "type to start editing...",
     "Version": "Version",
     "TemplateVersion": "Template version",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Search document...",
     "CreateEnVersion": "Create version for review",
     "Approvers": "Approvers",
diff --git a/plugins/controlled-documents-assets/lang/fr.json b/plugins/controlled-documents-assets/lang/fr.json
index 652e566a1ee..326f13775ae 100644
--- a/plugins/controlled-documents-assets/lang/fr.json
+++ b/plugins/controlled-documents-assets/lang/fr.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "tapez pour commencer à éditer...",
     "Version": "Version",
     "TemplateVersion": "Version du modèle",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Rechercher un document...",
     "CreateEnVersion": "Créer une version pour révision",
     "Approvers": "Approuveurs",
diff --git a/plugins/controlled-documents-assets/lang/it.json b/plugins/controlled-documents-assets/lang/it.json
index a1eb5cdd65d..b28d4b47c9a 100644
--- a/plugins/controlled-documents-assets/lang/it.json
+++ b/plugins/controlled-documents-assets/lang/it.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "digita per iniziare a modificare...",
     "Version": "Versione",
     "TemplateVersion": "Versione del modello",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Cerca documento...",
     "CreateEnVersion": "Crea versione per revisione",
     "Approvers": "Approvatori",
diff --git a/plugins/controlled-documents-assets/lang/ja.json b/plugins/controlled-documents-assets/lang/ja.json
index 68b54bcce76..60ba83c15c6 100644
--- a/plugins/controlled-documents-assets/lang/ja.json
+++ b/plugins/controlled-documents-assets/lang/ja.json
@@ -37,7 +37,7 @@
     "EditorPlaceholder": "入力して編集を開始...",
     "Version": "バージョン",
     "TemplateVersion": "テンプレートバージョン",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "ドキュメントを検索...",
     "CreateEnVersion": "レビュー用バージョンを作成",
     "Approvers": "承認者",
diff --git a/plugins/controlled-documents-assets/lang/pt.json b/plugins/controlled-documents-assets/lang/pt.json
index e9229faa9e6..c5b2f72fd56 100644
--- a/plugins/controlled-documents-assets/lang/pt.json
+++ b/plugins/controlled-documents-assets/lang/pt.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "Digite para começar a editar...",
     "Version": "Versão",
     "TemplateVersion": "Versão do modelo",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Buscar documento...",
     "CreateEnVersion": "Criar versão para revisão",
     "Approvers": "Aprovadores",
diff --git a/plugins/controlled-documents-assets/lang/ru.json b/plugins/controlled-documents-assets/lang/ru.json
index 17bb1293ccd..3957f47d1ad 100644
--- a/plugins/controlled-documents-assets/lang/ru.json
+++ b/plugins/controlled-documents-assets/lang/ru.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "введите для начала...",
     "Version": "Версия",
     "TemplateVersion": "Версия шаблона",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Найти документ...",
     "CreateEnVersion": "Создать версию для оценки",
     "Approvers": "Утверждающие",
diff --git a/plugins/controlled-documents-assets/lang/tr.json b/plugins/controlled-documents-assets/lang/tr.json
index 08eaab7955f..f830e2821c0 100644
--- a/plugins/controlled-documents-assets/lang/tr.json
+++ b/plugins/controlled-documents-assets/lang/tr.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "düzenlemeye başlamak için yazın...",
     "Version": "Sürüm",
     "TemplateVersion": "Şablon sürümü",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "Doküman ara...",
     "CreateEnVersion": "İnceleme için sürüm oluştur",
     "Approvers": "Onaylayanlar",
diff --git a/plugins/controlled-documents-assets/lang/zh.json b/plugins/controlled-documents-assets/lang/zh.json
index 511ffe0cc1f..9554c6214d9 100644
--- a/plugins/controlled-documents-assets/lang/zh.json
+++ b/plugins/controlled-documents-assets/lang/zh.json
@@ -38,7 +38,7 @@
     "EditorPlaceholder": "开始编辑...",
     "Version": "版本",
     "TemplateVersion": "模板版本",
-    "VersionValue": "v{major}.{minor}",
+    "VersionValue": "v{major}.{minor}.{patch}",
     "SearchDocument": "搜索文档...",
     "CreateEnVersion": "创建审核版本",
     "Approvers": "批准人",
diff --git a/plugins/controlled-documents-resources/src/components/CreateDocument.svelte b/plugins/controlled-documents-resources/src/components/CreateDocument.svelte
index 99aed0f4dc5..e9df72a13d6 100644
--- a/plugins/controlled-documents-resources/src/components/CreateDocument.svelte
+++ b/plugins/controlled-documents-resources/src/components/CreateDocument.svelte
@@ -56,6 +56,7 @@
     labels: 0,
     major: 1,
     minor: 0,
+    patch: 0,
     commentSequence: 0,
     author: currentUser,
     owner: currentUser,
diff --git a/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte b/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte
index 8d692546e4e..9c12e132f1f 100644
--- a/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte
+++ b/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte
@@ -242,7 +242,7 @@
       }
 
       const latest = $documentLatestVersion
-      const version = { major: latest.major, minor: latest.minor + 1 }
+      const version = { major: latest.major, minor: latest.minor + 1, patch: 0 }
       const project = await getLatestProjectId($controlledDocument.space)
 
       if (project === undefined) {
diff --git a/plugins/controlled-documents-resources/src/components/create-doc/QmsDocumentWizard.svelte b/plugins/controlled-documents-resources/src/components/create-doc/QmsDocumentWizard.svelte
index 7e5eda32424..3750e13b161 100644
--- a/plugins/controlled-documents-resources/src/components/create-doc/QmsDocumentWizard.svelte
+++ b/plugins/controlled-documents-resources/src/components/create-doc/QmsDocumentWizard.svelte
@@ -106,6 +106,7 @@
     labels: 0,
     major: 1,
     minor: 0,
+    patch: 0,
     seqNumber: 0,
     commentSequence: 0,
     category: '' as Ref<DocumentCategory>,
diff --git a/plugins/controlled-documents-resources/src/components/create-doc/QmsTemplateWizard.svelte b/plugins/controlled-documents-resources/src/components/create-doc/QmsTemplateWizard.svelte
index 69e13bde400..2f4930b2d1c 100644
--- a/plugins/controlled-documents-resources/src/components/create-doc/QmsTemplateWizard.svelte
+++ b/plugins/controlled-documents-resources/src/components/create-doc/QmsTemplateWizard.svelte
@@ -101,6 +101,7 @@
     labels: 0,
     major: 1,
     minor: 0,
+    patch: 0,
     commentSequence: 0,
     seqNumber: 0,
     category: undefined,
diff --git a/plugins/controlled-documents-resources/src/components/document/DocumentDiffViewer.svelte b/plugins/controlled-documents-resources/src/components/document/DocumentDiffViewer.svelte
index cb1586a28d5..ab58e989ec6 100644
--- a/plugins/controlled-documents-resources/src/components/document/DocumentDiffViewer.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/DocumentDiffViewer.svelte
@@ -72,7 +72,7 @@
     }
 
     if (isDocument(document)) {
-      return `v${document.major}.${document.minor} | ${translatedStates ? translatedStates[state] : ''}`
+      return `v${document.major}.${document.minor}.${document.patch} | ${translatedStates ? translatedStates[state] : ''}`
     } else {
       return `${document.name} | ${translatedStates ? translatedStates[state] : ''}`
     }
diff --git a/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte b/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte
index df566182612..eced09ed8a8 100644
--- a/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte
@@ -51,7 +51,10 @@
 
       return (
         doc.major < $controlledDocument.major ||
-        (doc.major === $controlledDocument.major && doc.minor <= $controlledDocument.minor)
+        (doc.major === $controlledDocument.major && doc.minor < $controlledDocument.minor) ||
+        (doc.major === $controlledDocument.major &&
+          doc.minor === $controlledDocument.minor &&
+          doc.patch <= $controlledDocument.patch)
       )
     })
     .sort(documentCompareFn)
diff --git a/plugins/controlled-documents-resources/src/components/document/EditDocRelease.svelte b/plugins/controlled-documents-resources/src/components/document/EditDocRelease.svelte
index fabe6acc65e..60d5bf81f40 100644
--- a/plugins/controlled-documents-resources/src/components/document/EditDocRelease.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/EditDocRelease.svelte
@@ -52,6 +52,7 @@
   } from '../../stores/editors/document/editor'
 
   enum Severity {
+    Patch = 'patch',
     Minor = 'minor',
     Major = 'major'
   }
@@ -154,7 +155,10 @@
     allVersionsDesc: ControlledDocument[]
   ): ControlledDocument | undefined {
     return allVersionsDesc.find(
-      (d) => (d.major === document.major && d.minor < document.minor) || d.major < document.major
+      (d) =>
+        (d.major === document.major && d.minor === document.minor && d.patch < document.patch) ||
+        (d.major === document.major && d.minor < document.minor) ||
+        d.major < document.major
     )
   }
 
@@ -166,13 +170,17 @@
     const prevDocument = getPreviousDocument(document, allVersionsDesc)
 
     if (prevDocument == null) {
-      return document.major > 0 ? Severity.Major : Severity.Minor
+      return document.major > 0 ? Severity.Major : document.minor > 0 ? Severity.Minor : Severity.Patch
     } else {
-      return prevDocument.major < document.major ? Severity.Major : Severity.Minor
+      return prevDocument.major < document.major
+        ? Severity.Major
+        : prevDocument.minor < document.minor
+          ? Severity.Minor
+          : Severity.Patch
     }
   }
 
-  function getVersionForSeverity (severity: Severity): { major: number, minor: number } | undefined {
+  function getVersionForSeverity (severity: Severity): { major: number, minor: number, patch: number } | undefined {
     if ($controlledDocument == null) {
       return
     }
@@ -182,12 +190,20 @@
     if (severity === Severity.Major) {
       return {
         major: (prevDocument?.major ?? 0) + 1,
-        minor: 0
+        minor: 0,
+        patch: 0
+      }
+    } else if (severity === Severity.Minor) {
+      return {
+        major: prevDocument?.major ?? 0,
+        minor: (prevDocument?.minor ?? 0) + 1,
+        patch: 0
       }
     } else {
       return {
         major: prevDocument?.major ?? 0,
-        minor: (prevDocument?.minor ?? 0) + 1
+        minor: prevDocument?.minor ?? 0,
+        patch: (prevDocument?.patch ?? 0) + 1
       }
     }
   }
@@ -218,6 +234,18 @@
         <Label label={documentsRes.string.ChangeSeverity} />
       </header>
       <div class="flex-col">
+        <RadioButton
+          group={severity}
+          id={Severity.Patch}
+          labelIntl={documentsRes.string.Patch}
+          labelGap="large"
+          value={Severity.Patch}
+          disabled={!canEdit}
+          action={() => {
+            void handleSeverityChanged(Severity.Patch)
+          }}
+          gap="large"
+        />
         <RadioButton
           group={severity}
           id={Severity.Minor}
diff --git a/plugins/controlled-documents-resources/src/components/document/presenters/DocumentVersionPresenter.svelte b/plugins/controlled-documents-resources/src/components/document/presenters/DocumentVersionPresenter.svelte
index 95454eecb3b..30b6072a30d 100644
--- a/plugins/controlled-documents-resources/src/components/document/presenters/DocumentVersionPresenter.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/presenters/DocumentVersionPresenter.svelte
@@ -8,5 +8,5 @@
 </script>
 
 {#if value}
-  <Label label={document.string.VersionValue} params={{ major: value.major, minor: value.minor }} />
+  <Label label={document.string.VersionValue} params={{ major: value.major, minor: value.minor, patch: value.patch }} />
 {/if}
diff --git a/plugins/controlled-documents-resources/src/docutils.ts b/plugins/controlled-documents-resources/src/docutils.ts
index b28baa17b98..40a29ebc46e 100644
--- a/plugins/controlled-documents-resources/src/docutils.ts
+++ b/plugins/controlled-documents-resources/src/docutils.ts
@@ -77,7 +77,7 @@ export async function createNewDraftForControlledDoc (
   client: TxOperations,
   document: ControlledDocument,
   space: Ref<DocumentSpace>,
-  version: { major: number, minor: number },
+  version: { major: number, minor: number, patch: number },
   project: Ref<Project>,
   newDraftDocId?: Ref<ControlledDocument>
 ): Promise<{ success: boolean, id: Ref<ControlledDocument> }> {
@@ -118,6 +118,7 @@ export async function createNewDraftForControlledDoc (
     seqNumber: document.seqNumber,
     major: version.major,
     minor: version.minor,
+    patch: version.patch,
     commentSequence: 0,
     abstract: document.abstract ?? '',
     reviewers: document.reviewers,
diff --git a/plugins/controlled-documents-resources/src/stores/editors/document/query.ts b/plugins/controlled-documents-resources/src/stores/editors/document/query.ts
index 351f302e842..2d026663bb6 100644
--- a/plugins/controlled-documents-resources/src/stores/editors/document/query.ts
+++ b/plugins/controlled-documents-resources/src/stores/editors/document/query.ts
@@ -103,7 +103,8 @@ const queryDocumentVersionsFx = createEffect((payload: ControlledDocument) => {
     {
       sort: {
         major: SortingOrder.Descending,
-        minor: SortingOrder.Descending
+        minor: SortingOrder.Descending,
+        patch: SortingOrder.Descending
       }
     }
   )
diff --git a/plugins/controlled-documents-resources/src/utils.ts b/plugins/controlled-documents-resources/src/utils.ts
index 2da76d330e4..0542abb834c 100644
--- a/plugins/controlled-documents-resources/src/utils.ts
+++ b/plugins/controlled-documents-resources/src/utils.ts
@@ -156,7 +156,8 @@ export async function getDocumentMetaLinkFragment (document: Doc): Promise<Locat
     {
       sort: {
         major: SortingOrder.Descending,
-        minor: SortingOrder.Descending
+        minor: SortingOrder.Descending,
+        patch: SortingOrder.Descending
       }
     }
   )
@@ -879,11 +880,15 @@ export async function projectDocumentReferenceObjectProvider (
 }
 
 export function documentCompareFn (doc1: Document, doc2: Document): number {
-  return doc1.major - doc2.major !== 0 ? doc1.major - doc2.major : doc1.minor - doc2.minor
+  return doc1.major - doc2.major !== 0
+    ? doc1.major - doc2.major
+    : doc1.minor - doc2.minor !== 0
+      ? doc1.minor - doc2.minor
+      : doc1.patch - doc2.patch
 }
 
 export function getDocumentVersionString (doc: Document): string {
-  return `v${doc.major}.${doc.minor}`
+  return `v${doc.major}.${doc.minor}.${doc.patch}`
 }
 
 export async function getControlledDocumentTitle (
diff --git a/plugins/controlled-documents/src/types.ts b/plugins/controlled-documents/src/types.ts
index 8780cae3156..e27147ecfcd 100644
--- a/plugins/controlled-documents/src/types.ts
+++ b/plugins/controlled-documents/src/types.ts
@@ -121,6 +121,7 @@ export interface Document extends Doc<DocumentSpace> {
   seqNumber: number
   major: number
   minor: number
+  patch: number
   category?: Ref<DocumentCategory>
   author?: Ref<Employee> // Employee who created/released the document
   owner?: Ref<Employee> // Employee responsible for working on the document
diff --git a/plugins/controlled-documents/src/utils.ts b/plugins/controlled-documents/src/utils.ts
index 17ae446c589..5a39381c2cd 100644
--- a/plugins/controlled-documents/src/utils.ts
+++ b/plugins/controlled-documents/src/utils.ts
@@ -155,7 +155,7 @@ export function isFolder (doc: ProjectDocument | undefined): boolean {
 }
 
 function getDocumentSortSequence (doc: ControlledDocument | undefined): number[] {
-  return doc !== undefined ? [doc.seqNumber, doc.major, doc.minor, doc.createdOn ?? 0] : [0, 0, 0, 0]
+  return doc !== undefined ? [doc.seqNumber, doc.major, doc.minor, doc.patch, doc.createdOn ?? 0] : [0, 0, 0, 0, 0]
 }
 
 export function compareDocumentVersions (
diff --git a/plugins/products-assets/lang/cs.json b/plugins/products-assets/lang/cs.json
index 2fcdc278c90..0e76f3f1441 100644
--- a/plugins/products-assets/lang/cs.json
+++ b/plugins/products-assets/lang/cs.json
@@ -20,6 +20,7 @@
     "Description": "Popis",
     "Major": "Hlavní",
     "Minor": "Vedlejší",
+    "Patch": "Oprava",
     "Codename": "Kódové označení",
     "ProductVersionStateActive": "Aktivní",
     "ProductVersionStateReleased": "Vydáno",
diff --git a/plugins/products-assets/lang/de.json b/plugins/products-assets/lang/de.json
index 42708ac5793..ad5896c29c4 100644
--- a/plugins/products-assets/lang/de.json
+++ b/plugins/products-assets/lang/de.json
@@ -20,6 +20,7 @@
     "Description": "Beschreibung",
     "Major": "Major",
     "Minor": "Minor",
+    "Patch": "Patch",
     "Codename": "Codename",
     "ProductVersionStateActive": "Aktiv",
     "ProductVersionStateReleased": "Veröffentlicht",
diff --git a/plugins/products-assets/lang/en.json b/plugins/products-assets/lang/en.json
index 366e619eeb1..822c7c9d535 100644
--- a/plugins/products-assets/lang/en.json
+++ b/plugins/products-assets/lang/en.json
@@ -20,6 +20,7 @@
     "Description": "Description",
     "Major": "Major",
     "Minor": "Minor",
+    "Patch": "Patch",
     "Codename": "Codename",
     "ProductVersionStateActive": "Active",
     "ProductVersionStateReleased": "Released",
diff --git a/plugins/products-assets/lang/fr.json b/plugins/products-assets/lang/fr.json
index 1fc25e91519..1ea5f6682ed 100644
--- a/plugins/products-assets/lang/fr.json
+++ b/plugins/products-assets/lang/fr.json
@@ -20,6 +20,7 @@
     "Description": "Description",
     "Major": "Majeure",
     "Minor": "Mineure",
+    "Patch": "Corrective",
     "Codename": "Nom de code",
     "ProductVersionStateActive": "Active",
     "ProductVersionStateReleased": "Publié",
diff --git a/plugins/products-assets/lang/it.json b/plugins/products-assets/lang/it.json
index d40d86f5c87..7fffc6d06c6 100644
--- a/plugins/products-assets/lang/it.json
+++ b/plugins/products-assets/lang/it.json
@@ -20,6 +20,7 @@
     "Description": "Descrizione",
     "Major": "Maggiore",
     "Minor": "Minore",
+    "Patch": "Correttiva",
     "Codename": "Nome in codice",
     "ProductVersionStateActive": "Attivo",
     "ProductVersionStateReleased": "Rilasciato",
diff --git a/plugins/products-assets/lang/ja.json b/plugins/products-assets/lang/ja.json
index deac7e8c159..302f1e9ca0f 100644
--- a/plugins/products-assets/lang/ja.json
+++ b/plugins/products-assets/lang/ja.json
@@ -20,6 +20,7 @@
     "Description": "説明",
     "Major": "メジャー",
     "Minor": "マイナー",
+    "Patch": "パッチ",
     "Codename": "コードネーム",
     "ProductVersionStateActive": "アクティブ",
     "ProductVersionStateReleased": "リリース済み",
diff --git a/plugins/products-assets/lang/pt.json b/plugins/products-assets/lang/pt.json
index 14cf3665d00..9a73d978606 100644
--- a/plugins/products-assets/lang/pt.json
+++ b/plugins/products-assets/lang/pt.json
@@ -20,6 +20,7 @@
     "Description": "Descrição",
     "Major": "Principal",
     "Minor": "Secundária",
+    "Patch": "Correção",
     "Codename": "Codinome",
     "ProductVersionStateActive": "Ativo",
     "ProductVersionStateReleased": "Publicado",
diff --git a/plugins/products-assets/lang/ru.json b/plugins/products-assets/lang/ru.json
index bb7b17b0ba8..b987e15b5af 100644
--- a/plugins/products-assets/lang/ru.json
+++ b/plugins/products-assets/lang/ru.json
@@ -20,6 +20,7 @@
     "Description": "Описание",
     "Major": "Мажорная",
     "Minor": "Минорная",
+    "Patch": "Патч",
     "Codename": "Название",
     "ProductVersionStateActive": "Активная",
     "ProductVersionStateReleased": "Релизная",
diff --git a/plugins/products-assets/lang/tr.json b/plugins/products-assets/lang/tr.json
index 104d0ee5cfc..4e01c929306 100644
--- a/plugins/products-assets/lang/tr.json
+++ b/plugins/products-assets/lang/tr.json
@@ -20,6 +20,7 @@
     "Description": "Açıklama",
     "Major": "Majör",
     "Minor": "Minör",
+    "Patch": "Yama",
     "Codename": "Kod adı",
     "ProductVersionStateActive": "Aktif",
     "ProductVersionStateReleased": "Yayınlandı",
diff --git a/plugins/products-assets/lang/zh.json b/plugins/products-assets/lang/zh.json
index 0abca9f2b3d..c06e450c313 100644
--- a/plugins/products-assets/lang/zh.json
+++ b/plugins/products-assets/lang/zh.json
@@ -20,6 +20,7 @@
     "Description": "描述",
     "Major": "主要",
     "Minor": "次要",
+    "Patch": "补丁",
     "Codename": "代码名",
     "ProductVersionStateActive": "活跃",
     "ProductVersionStateReleased": "已发布",
diff --git a/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte b/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte
index 74553bfe652..dd05046f52b 100644
--- a/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte
+++ b/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte
@@ -34,7 +34,7 @@
 
   import products from '../../plugin'
 
-  type Severity = 'major' | 'minor'
+  type Severity = 'major' | 'minor' | 'patch'
   type ProductVersionDraft = Omit<Data<ProductVersion>, 'parent' | 'name'>
 
   export let space: Ref<Product> | undefined
@@ -70,18 +70,20 @@
 
   $: updateSeverity(parent, severity)
 
-  function updateSeverity (parent: ProductVersion | undefined, severity: Severity): void {
+  function updateSeverity (parent: ProductVersion | null | undefined, severity: Severity): void {
     if (parent != null) {
       object.major = severity === 'major' ? parent.major + 1 : parent.major
       object.minor = severity === 'minor' ? parent.minor + 1 : 0
+      object.patch = severity === 'patch' ? parent.patch + 1 : 0
     } else {
       object.major = 1
       object.minor = 0
+      object.patch = 0
     }
   }
 
   function formatProductVersion (object: ProductVersionDraft): string {
-    return `${object.major}.${object.minor}`
+    return `${object.major}.${object.minor}.${object.patch}`
   }
 
   function formatProductVersionName (object: ProductVersionDraft): string {
@@ -144,6 +146,7 @@
       readonly: false,
       major: 1,
       minor: 0,
+      patch: 0,
       codename: '',
       description: '',
       state: ProductVersionState.Active
@@ -157,6 +160,8 @@
     object.major >= 0 &&
     object.minor !== undefined &&
     object.minor >= 0 &&
+    object.patch !== undefined &&
+    object.patch >= 0 &&
     (parent == null || object.changeControl !== undefined)
 </script>
 
@@ -217,6 +222,7 @@
       <DropdownLabelsIntl
         label={products.string.ChangeSeverity}
         items={[
+          { id: 'patch', label: products.string.Patch },
           { id: 'minor', label: products.string.Minor },
           { id: 'major', label: products.string.Major }
         ]}
diff --git a/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte b/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte
index bede5431557..ee500ea7960 100644
--- a/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte
+++ b/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte
@@ -34,7 +34,7 @@
   export let shouldShowAvatar: boolean = true
 
   function getProductVersionName (value: ProductVersion): string {
-    const version = `${value.major}.${value.minor}`
+    const version = `${value.major}.${value.minor}.${value.patch}`
     const codename = value.codename ?? ''
     return codename !== '' ? `${version} ${codename}` : version
   }
diff --git a/plugins/products-resources/src/components/product/CreateProduct.svelte b/plugins/products-resources/src/components/product/CreateProduct.svelte
index f4a83045f2f..272ea9113d0 100644
--- a/plugins/products-resources/src/components/product/CreateProduct.svelte
+++ b/plugins/products-resources/src/components/product/CreateProduct.svelte
@@ -172,7 +172,8 @@
       readonly: false,
       major: 1,
       minor: 0,
-      name: '1.0',
+      patch: 0,
+      name: '1.0.0',
       codename: '',
       description: '',
       parent: products.ids.NoParentVersion,
diff --git a/plugins/products-resources/src/plugin.ts b/plugins/products-resources/src/plugin.ts
index 78551fe0956..06095b769f6 100644
--- a/plugins/products-resources/src/plugin.ts
+++ b/plugins/products-resources/src/plugin.ts
@@ -55,6 +55,7 @@ export default mergeIds(productsId, products, {
     Color: '' as IntlString,
     Major: '' as IntlString,
     Minor: '' as IntlString,
+    Patch: '' as IntlString,
     Codename: '' as IntlString,
     Private: '' as IntlString,
     Public: '' as IntlString,
diff --git a/plugins/products-resources/src/utils.ts b/plugins/products-resources/src/utils.ts
index 539eb8edc1b..bcbf1532a7b 100644
--- a/plugins/products-resources/src/utils.ts
+++ b/plugins/products-resources/src/utils.ts
@@ -27,7 +27,7 @@ import products, { ProductVersionState, type Product, type ProductVersion } from
 
 export function getProductVersionVersion (doc: ProductVersion): string {
   const codename = doc.codename ?? ''
-  const version = `${doc.major}.${doc.minor}`
+  const version = `${doc.major}.${doc.minor}.${doc.patch}`
 
   return codename !== '' ? `${version} ${codename}` : version
 }
diff --git a/plugins/products/src/types.ts b/plugins/products/src/types.ts
index 35859f8765b..d2c95a77ead 100644
--- a/plugins/products/src/types.ts
+++ b/plugins/products/src/types.ts
@@ -37,6 +37,7 @@ export interface Product extends ExternalSpace, IconProps {
 export interface ProductVersion extends Project<Product> {
   major: number
   minor: number
+  patch: number
   codename?: string
   description: Markup
   state: ProductVersionState
diff --git a/qms-tests/sanity/tests/documents/ES-20.spec.ts b/qms-tests/sanity/tests/documents/ES-20.spec.ts
index 45acf93c2db..34f1a6ebfdc 100644
--- a/qms-tests/sanity/tests/documents/ES-20.spec.ts
+++ b/qms-tests/sanity/tests/documents/ES-20.spec.ts
@@ -39,7 +39,7 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -72,7 +72,7 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
diff --git a/qms-tests/sanity/tests/documents/ES-50.spec.ts b/qms-tests/sanity/tests/documents/ES-50.spec.ts
index 88df84d8915..297bb7a6da8 100644
--- a/qms-tests/sanity/tests/documents/ES-50.spec.ts
+++ b/qms-tests/sanity/tests/documents/ES-50.spec.ts
@@ -50,7 +50,7 @@ test.describe('QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -90,7 +90,7 @@ test.describe('QMS. PDF Download and Preview', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -135,7 +135,7 @@ test.describe('QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -199,7 +199,7 @@ test.describe('QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -253,7 +253,7 @@ test.describe('QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
diff --git a/qms-tests/sanity/tests/documents/REQ-03.spec.ts b/qms-tests/sanity/tests/documents/REQ-03.spec.ts
index 03986ca63de..af8e4ef6ddf 100644
--- a/qms-tests/sanity/tests/documents/REQ-03.spec.ts
+++ b/qms-tests/sanity/tests/documents/REQ-03.spec.ts
@@ -47,7 +47,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents, ensure that the current re
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -63,7 +63,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents, ensure that the current re
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.IN_APPROVAL,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
     })
@@ -80,7 +80,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents, ensure that the current re
       await documentContentPageSecond.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPageSecond.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -92,7 +92,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents, ensure that the current re
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -104,98 +104,98 @@ test.describe('ISO 13485, 4.2.4 Control of documents, ensure that the current re
       await documentHistoryPage.checkHistoryEventExist('New document creation')
       await attachScreenshot('TESTS-325_check_history_tab.png', page)
     })
-    await test.step('6. Send for Approval v1.1', async () => {
+    await test.step('6. Send for Approval v1.1.0', async () => {
       await documentContentPage.sendForApproval(
         'Minor',
-        'v1.1',
-        'Reason 1.1',
-        'impact 1.1',
-        'v1.0',
-        'v1.1',
+        'v1.1.0',
+        'Reason 1.1.0',
+        'impact 1.1.0',
+        'v1.0.0',
+        'v1.1.0',
         userSecondPage,
         completeDocument,
         documentDetails
       )
     })
 
-    await test.step('7. Send for Approval minor v1.2', async () => {
+    await test.step('7. Send for Approval minor v1.2.0', async () => {
       await documentContentPage.sendForApproval(
         'Minor',
-        'v1.2',
-        'Reason 1.2',
-        'impact 1.2',
-        'v1.1',
-        'v1.2',
+        'v1.2.0',
+        'Reason 1.2.0',
+        'impact 1.2.0',
+        'v1.1.0',
+        'v1.2.0',
         userSecondPage,
         completeDocument,
         documentDetails
       )
     })
 
-    await test.step('8. Send for Approval major v2.0', async () => {
+    await test.step('8. Send for Approval major v2.0.0', async () => {
       await documentContentPage.sendForApproval(
         'Major',
-        'v2.0',
-        'Reason 2.0',
-        'impact 2.0',
-        'v1.2',
-        'v2.0',
+        'v2.0.0',
+        'Reason 2.0.0',
+        'impact 2.0.0',
+        'v1.2.0',
+        'v2.0.0',
         userSecondPage,
         completeDocument,
         documentDetails
       )
     })
 
-    await test.step('9. Send for Approval major v3.0', async () => {
+    await test.step('9. Send for Approval major v3.0.0', async () => {
       await documentContentPage.sendForApproval(
         'Major',
-        'v3.0',
-        'Reason 3.0',
-        'impact 3.0',
-        'v2.0',
-        'v3.0',
+        'v3.0.0',
+        'Reason 3.0.0',
+        'impact 3.0.0',
+        'v2.0.0',
+        'v3.0.0',
         userSecondPage,
         completeDocument,
         documentDetails
       )
     })
 
-    await test.step('10. Send for Approval minor v3.1', async () => {
+    await test.step('10. Send for Approval minor v3.1.0', async () => {
       await documentContentPage.sendForApproval(
         'Minor',
-        'v3.1',
-        'Reason 3.1',
-        'impact 3.1',
-        'v3.0',
-        'v3.1',
+        'v3.1.0',
+        'Reason 3.1.0',
+        'impact 3.1.0',
+        'v3.0.0',
+        'v3.1.0',
         userSecondPage,
         completeDocument,
         documentDetails
       )
     })
 
-    await test.step('11. Send for Approval minor v3.2', async () => {
+    await test.step('11. Send for Approval minor v3.2.0', async () => {
       await documentContentPage.sendForApproval(
         'Minor',
-        'v3.2',
-        'Reason 3.2',
-        'impact 3.2',
-        'v3.1',
-        'v3.2',
+        'v3.2.0',
+        'Reason 3.2.0',
+        'impact 3.2.0',
+        'v3.1.0',
+        'v3.2.0',
         userSecondPage,
         completeDocument,
         documentDetails
       )
     })
 
-    await test.step('12. Send for Approval minor v3.3', async () => {
+    await test.step('12. Send for Approval minor v3.3.0', async () => {
       await documentContentPage.sendForApproval(
         'Minor',
-        'v3.3',
-        'Reason 3.3',
-        'impact 3.3',
-        'v3.2',
-        'v3.3',
+        'v3.3.0',
+        'Reason 3.3.0',
+        'impact 3.3.0',
+        'v3.2.0',
+        'v3.3.0',
         userSecondPage,
         completeDocument,
         documentDetails
diff --git a/qms-tests/sanity/tests/documents/REQ-04-01.spec.ts b/qms-tests/sanity/tests/documents/REQ-04-01.spec.ts
index ae69ca19060..e735ec087ad 100644
--- a/qms-tests/sanity/tests/documents/REQ-04-01.spec.ts
+++ b/qms-tests/sanity/tests/documents/REQ-04-01.spec.ts
@@ -37,7 +37,7 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -65,7 +65,7 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -94,7 +94,7 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -122,7 +122,7 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -162,7 +162,7 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -185,7 +185,11 @@ test.describe('@PDF. QMS. PDF Download and Preview', () => {
 
     await test.step('4. Check the document and status', async () => {
       await documentContentPage.checkDocumentStatus(DocumentStatus.EFFECTIVE)
-      await documentContentPage.checkDocument({ ...documentDetails, status: DocumentStatus.EFFECTIVE, version: 'v1.0' })
+      await documentContentPage.checkDocument({
+        ...documentDetails,
+        status: DocumentStatus.EFFECTIVE,
+        version: 'v1.0.0'
+      })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
       await documentContentPage.openApprovals()
diff --git a/qms-tests/sanity/tests/documents/REQ-04.spec.ts b/qms-tests/sanity/tests/documents/REQ-04.spec.ts
index f867d713e1a..1ae00875561 100644
--- a/qms-tests/sanity/tests/documents/REQ-04.spec.ts
+++ b/qms-tests/sanity/tests/documents/REQ-04.spec.ts
@@ -44,7 +44,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -63,7 +63,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.IN_APPROVAL,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
     })
@@ -80,7 +80,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
       await documentContentPageSecond.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPageSecond.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -113,7 +113,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -131,7 +131,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.IN_APPROVAL,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
     })
@@ -148,7 +148,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
       await documentContentPageSecond.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPageSecond.checkCurrentRights(DocumentRights.VIEWING)
 
diff --git a/qms-tests/sanity/tests/documents/REQ-05-1.spec.ts b/qms-tests/sanity/tests/documents/REQ-05-1.spec.ts
index b5946ec79a4..f9be2e07604 100644
--- a/qms-tests/sanity/tests/documents/REQ-05-1.spec.ts
+++ b/qms-tests/sanity/tests/documents/REQ-05-1.spec.ts
@@ -74,7 +74,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
       await documentContentPage.checkDocument({
         type: 'N/A',
         category: newTemplate.category ?? '',
-        version: 'v1.0',
+        version: 'v1.0.0',
         status: DocumentStatus.DRAFT,
         owner: 'Appleseed John',
         author: 'Appleseed John'
@@ -181,7 +181,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents', () => {
         await documentContentPage.checkDocument({
           type: 'N/A',
           category: newTemplate.category ?? '',
-          version: 'v1.0',
+          version: 'v1.0.0',
           status: DocumentStatus.EFFECTIVE,
           owner: 'Appleseed John',
           author: 'Appleseed John'
diff --git a/qms-tests/sanity/tests/documents/REQ-10.spec.ts b/qms-tests/sanity/tests/documents/REQ-10.spec.ts
index 2242ad3c19d..d19af4e19ff 100644
--- a/qms-tests/sanity/tests/documents/REQ-10.spec.ts
+++ b/qms-tests/sanity/tests/documents/REQ-10.spec.ts
@@ -70,7 +70,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents ensure that documents of ex
       const documentDetails: DocumentDetails = {
         type: 'HR',
         category: 'Human Resources',
-        version: 'v1.0',
+        version: 'v1.0.0',
         status: DocumentStatus.DRAFT,
         owner: 'Dirak Kainin',
         author: 'Dirak Kainin'
@@ -78,7 +78,7 @@ test.describe('ISO 13485, 4.2.4 Control of documents ensure that documents of ex
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.DRAFT,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.clickLeaveFolder(folderName)
       await attachScreenshot('TESTS-347_manager_document_created.png', page)
diff --git a/qms-tests/sanity/tests/documents/REQ-14.spec.ts b/qms-tests/sanity/tests/documents/REQ-14.spec.ts
index 05ef8f2c7b2..22e0c0aa1b0 100644
--- a/qms-tests/sanity/tests/documents/REQ-14.spec.ts
+++ b/qms-tests/sanity/tests/documents/REQ-14.spec.ts
@@ -44,7 +44,7 @@ test.describe('QMS. Documents tests for Control of documents ISO 13485, 4.2.4 FS
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -60,7 +60,7 @@ test.describe('QMS. Documents tests for Control of documents ISO 13485, 4.2.4 FS
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.IN_APPROVAL,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
     })
@@ -77,7 +77,7 @@ test.describe('QMS. Documents tests for Control of documents ISO 13485, 4.2.4 FS
       await documentContentPageSecond.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPageSecond.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -89,7 +89,7 @@ test.describe('QMS. Documents tests for Control of documents ISO 13485, 4.2.4 FS
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -101,14 +101,14 @@ test.describe('QMS. Documents tests for Control of documents ISO 13485, 4.2.4 FS
       await documentHistoryPage.checkHistoryEventExist('New document creation')
       await attachScreenshot('TESTS-384_check_history_tab.png', page)
     })
-    await test.step('6. Send for Approval v1.1', async () => {
+    await test.step('6. Send for Approval v1.1.0', async () => {
       await documentContentPage.sendForApproval(
         'Minor',
-        'v1.1',
-        'Reason 1.1',
-        'impact 1.1',
-        'v1.0',
-        'v1.1',
+        'v1.1.0',
+        'Reason 1.1.0',
+        'impact 1.1.0',
+        'v1.0.0',
+        'v1.1.0',
         userSecondPage,
         completeDocument,
         documentDetails
@@ -116,12 +116,12 @@ test.describe('QMS. Documents tests for Control of documents ISO 13485, 4.2.4 FS
     })
     await test.step('7. Check archived status', async () => {
       const documentContentPageSecond = new DocumentContentPage(userSecondPage)
-      await documentContentPage.clickPreviousVersionHeader(userSecondPage, completeDocument, 'v1.1')
-      await documentContentPage.clickPreviousVersionHeader(userSecondPage, completeDocument, 'v1.0')
+      await documentContentPage.clickPreviousVersionHeader(userSecondPage, completeDocument, 'v1.1.0')
+      await documentContentPage.clickPreviousVersionHeader(userSecondPage, completeDocument, 'v1.0.0')
       await documentContentPageSecond.checkDocument({
         ...documentDetails,
         status: DocumentStatus.ARCHIVED,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await attachScreenshot('TESTS-384_archived_status.png', page)
     })
diff --git a/qms-tests/sanity/tests/documents/categories.spec.ts b/qms-tests/sanity/tests/documents/categories.spec.ts
index a3bad9a8215..7140738ca05 100644
--- a/qms-tests/sanity/tests/documents/categories.spec.ts
+++ b/qms-tests/sanity/tests/documents/categories.spec.ts
@@ -142,7 +142,7 @@ test.describe('QMS. Categories tests', () => {
       await documentContentPage.checkDocument({
         type: 'N/A',
         category: canNotDeleteCategoryTemplate.category ?? '',
-        version: 'v1.0',
+        version: 'v1.0.0',
         status: DocumentStatus.DRAFT,
         owner: 'Appleseed John',
         author: 'Appleseed John'
diff --git a/qms-tests/sanity/tests/documents/documents.spec.ts b/qms-tests/sanity/tests/documents/documents.spec.ts
index 2b38a0c68f1..978290c3ee6 100644
--- a/qms-tests/sanity/tests/documents/documents.spec.ts
+++ b/qms-tests/sanity/tests/documents/documents.spec.ts
@@ -144,7 +144,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -179,7 +179,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -218,7 +218,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -257,7 +257,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -320,7 +320,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.DRAFT,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await attachScreenshot('TESTS-136_check_edit_document_flow.png', page)
     })
@@ -337,7 +337,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -365,7 +365,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -388,7 +388,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -436,7 +436,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -505,7 +505,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.DRAFT,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await attachScreenshot('TESTS-139_check_document.png', page)
     })
@@ -522,7 +522,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -567,7 +567,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.DRAFT,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
 
       await documentContentPage.replaceContent(updateContentFirst)
@@ -592,7 +592,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -697,7 +697,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -728,7 +728,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPageQara.checkDocument({
         ...documentDetails,
         owner: newDocumentOwner,
-        version: 'v1.0',
+        version: 'v1.0.0',
         status: DocumentStatus.EFFECTIVE
       })
       await attachScreenshot('TESTS-155_change_document_owner.png', page)
@@ -738,7 +738,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         owner: newDocumentOwner,
-        version: 'v1.0',
+        version: 'v1.0.0',
         status: DocumentStatus.EFFECTIVE
       })
       await expect(documentContentPage.buttonDraftNewVersion).toBeVisible({ visible: false })
@@ -757,7 +757,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPageSecond.checkDocument({
         ...documentDetails,
         owner: newDocumentOwner,
-        version: 'v1.0',
+        version: 'v1.0.0',
         status: DocumentStatus.EFFECTIVE
       })
       await attachScreenshot('TESTS-155_new_owner.png', page)
@@ -775,7 +775,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -833,7 +833,7 @@ test.describe('QMS. Documents tests', () => {
     const documentDetails: DocumentDetails = {
       type: 'HR',
       category: 'Human Resources',
-      version: 'v1.0',
+      version: 'v1.0.0',
       status: DocumentStatus.DRAFT,
       owner: 'Appleseed John',
       author: 'Appleseed John'
@@ -921,7 +921,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.DRAFT,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await attachScreenshot('TESTS-206_check_document.png', page)
     })
@@ -955,7 +955,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.IN_APPROVAL,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
     })
@@ -972,7 +972,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPageSecond.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPageSecond.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -984,7 +984,7 @@ test.describe('QMS. Documents tests', () => {
       await documentContentPage.checkDocument({
         ...documentDetails,
         status: DocumentStatus.EFFECTIVE,
-        version: 'v1.0'
+        version: 'v1.0.0'
       })
       await documentContentPage.checkCurrentRights(DocumentRights.VIEWING)
 
@@ -1065,7 +1065,7 @@ test.describe('QMS. Documents tests', () => {
       id: 'HR-1',
       type: 'HR',
       category: 'N/A',
-      version: 'v0.0',
+      version: 'v0.0.2',
       status: DocumentStatus.IN_REVIEW,
       owner: 'Appleseed John',
       author: 'Appleseed John'
diff --git a/qms-tests/sanity/tests/documents/templates.spec.ts b/qms-tests/sanity/tests/documents/templates.spec.ts
index be3cf4cf99d..d245d8b7fb0 100644
--- a/qms-tests/sanity/tests/documents/templates.spec.ts
+++ b/qms-tests/sanity/tests/documents/templates.spec.ts
@@ -48,7 +48,7 @@ test.describe('QMS. Templates tests', () => {
       await documentContentPage.checkDocument({
         type: 'N/A',
         category: newTemplate.category ?? '',
-        version: 'v1.0',
+        version: 'v1.0.0',
         status: DocumentStatus.DRAFT,
         owner: 'Appleseed John',
         author: 'Appleseed John'
diff --git a/qms-tests/sanity/tests/model/documents/document-content-page.ts b/qms-tests/sanity/tests/model/documents/document-content-page.ts
index b9b417876f4..87416eae663 100644
--- a/qms-tests/sanity/tests/model/documents/document-content-page.ts
+++ b/qms-tests/sanity/tests/model/documents/document-content-page.ts
@@ -690,7 +690,7 @@ export class DocumentContentPage extends DocumentCommonPage {
   async checkIfHistoryVersionExists (description: string): Promise<void> {
     await this.page.waitForTimeout(200)
     await expect(this.page.getByText(description)).toBeVisible()
-    await expect(this.page.getByText('v1.0', { exact: true })).toBeVisible()
+    await expect(this.page.getByText('v1.0.0', { exact: true })).toBeVisible()
   }
 
   async checkDocumentStatus (status: DocumentStatus): Promise<void> {