From 5a73b5c4bf4c3da42a3fa57edc59b91a91038190 Mon Sep 17 00:00:00 2001
From: Nadya2502 <fornmer@yandex.ru>
Date: Thu, 23 Apr 2026 09:16:28 +0200
Subject: [PATCH 1/2] elsdoc-209, refactored java libraries

---
 .../apache-commons-lang/README.md             | 121 +++--
 docs/els-for-libraries/apache-cxf/README.md   | 123 +++---
 docs/els-for-libraries/apache-kafka/README.md | 102 ++---
 docs/els-for-libraries/apache-log4j/README.md | 103 ++---
 .../apache-lucene-and-solr/README.md          | 125 +++---
 docs/els-for-libraries/apache-spark/README.md |  94 ++--
 .../els-for-libraries/apache-struts/README.md | 122 +++--
 .../els-for-libraries/apache-tomcat/README.md | 102 ++---
 .../apache-velocity-engine/README.md          |  99 ++---
 docs/els-for-libraries/hibernate/README.md    | 116 +++--
 docs/els-for-libraries/jackson/README.md      | 102 ++---
 .../java-libraries/README.md                  | 128 +++---
 docs/els-for-libraries/jetty/README.md        | 102 ++---
 .../managing-els-repository/README.md         | 418 ++++++++++++++++++
 .../postgresql-driver/README.md               | 102 ++---
 docs/els-for-libraries/protobuf/README.md     | 106 ++---
 docs/els-for-libraries/spring/README.md       | 102 ++---
 17 files changed, 1227 insertions(+), 940 deletions(-)
 create mode 100644 docs/els-for-libraries/managing-els-repository/README.md

diff --git a/docs/els-for-libraries/apache-commons-lang/README.md b/docs/els-for-libraries/apache-commons-lang/README.md
index 7ceaaeffb..87b255cd6 100644
--- a/docs/els-for-libraries/apache-commons-lang/README.md
+++ b/docs/els-for-libraries/apache-commons-lang/README.md
@@ -7,17 +7,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Commons Lang provides secur
 * Apache Commons Lang 2.4, 2.6 
 * Apache Commons Lang3 3.4, 3.8.1, 3.10, 3.12.0, 3.17.0
 
-## Connection to ELS for Apache Commons Lang Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Commons Lang repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache Commons Lang repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -34,7 +36,7 @@ You need a username and password in order to use the TuxCare ELS Apache Commons
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -45,92 +47,72 @@ You need a username and password in order to use the TuxCare ELS Apache Commons
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache Commons Lang repository and plugins to your build configuration:
+   Add the TuxCare Apache Commons Lang repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-* To fully switch from the official Apache Commons Lang repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   * To fully switch from the official Apache Commons Lang repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-### Step 4: Update Dependencies
+4. **Update dependencies**
 
-Replace the Apache Commons Lang dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+   Replace Apache Commons Lang dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
-<TableTabs label="Choose version: " >
+   <TableTabs label="Choose version: " >
 
-<template #Commons_Lang>
+   <template #Commons_Lang>
 
-  <CodeTabs :tabs="[
-{ title: 'Maven (pom.xml)', content: mavenDepsLang },
-{ title: 'Gradle (build.gradle)', content: gradleDepsLang }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenDepsLang },
+     { title: 'Gradle (build.gradle)', content: gradleDepsLang }
+   ]" />
 
-</template>
+   </template>
 
-<template #Commons_Lang3>
+   <template #Commons_Lang3>
 
-  <CodeTabs :tabs="[
-{ title: 'Maven (pom.xml)', content: mavenDepsLang3 },
-{ title: 'Gradle (build.gradle)', content: gradleDepsLang3 }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenDepsLang3 },
+     { title: 'Gradle (build.gradle)', content: gradleDepsLang3 }
+   ]" />
 
-  </template>
+   </template>
 
-</TableTabs>
+   </TableTabs>
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache Commons Lang repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Commons Lang repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache Commons Lang repository into your project. You can now benefit from the secure and vetted Apache Commons Lang libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Commons Lang repository.
 
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
+</ELSSteps>
 
-TuxCare provides VEX for Apache Commons Lang ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/commons-lang/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/commons-lang/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Apache Commons Lang libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/commons-lang/commons-lang/2.6-tuxcare.1/commons-lang-2.6-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/commons-lang/commons-lang/2.6-tuxcare.1/commons-lang-2.6-tuxcare.1-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
 
 ## Resolved CVEs in ELS for Apache Commons Lang
 
@@ -138,6 +120,17 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="commons-lang" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Apache+Commons+Lang) — Patched versions and changelogs
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/commons-lang/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:commons-lang) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <script setup>
 const mavencreds =
 `<?xml version="1.0" encoding="UTF-8"?>
diff --git a/docs/els-for-libraries/apache-cxf/README.md b/docs/els-for-libraries/apache-cxf/README.md
index 5b8377640..20c9b2e94 100644
--- a/docs/els-for-libraries/apache-cxf/README.md
+++ b/docs/els-for-libraries/apache-cxf/README.md
@@ -6,17 +6,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache CXF provides security patch
 
 * Apache CXF 3.5.9, 3.5.11
 
-## Connection to ELS for Apache CXF Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache CXF repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache CXF repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -33,7 +35,7 @@ You need a username and password in order to use the TuxCare ELS Apache CXF repo
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -44,93 +46,72 @@ You need a username and password in order to use the TuxCare ELS Apache CXF repo
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache CXF repository and plugins to your build configuration:
+   Add the TuxCare Apache CXF repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Apache CXF repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Apache CXF repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Apache CXF dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Apache CXF dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<TableTabs label="Choose a version: " >
+   <TableTabs label="Choose a version: " >
 
-  <template #3.5.9>
+   <template #3.5.9>
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps_359 },
-  { title: 'Gradle (build.gradle)', content: gradledeps_359 }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps_359 },
+     { title: 'Gradle (build.gradle)', content: gradledeps_359 }
+   ]" />
 
-  </template>
+   </template>
 
-  <template #3.5.11>
+   <template #3.5.11>
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps_3511 },
-  { title: 'Gradle (build.gradle)', content: gradledeps_3511 }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps_3511 },
+     { title: 'Gradle (build.gradle)', content: gradledeps_3511 }
+   ]" />
 
-  </template>
+   </template>
 
-</TableTabs>
+   </TableTabs>
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache CXF repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache CXF repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache CXF repository into your project. You can now benefit from the secure and vetted Apache CXF libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache CXF repository.
 
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
+</ELSSteps>
 
-TuxCare provides VEX for Apache CXF ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.cxf/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.cxf/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Apache CXF libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/apache/cxf/cxf-core/3.5.9-tuxcare.2/cxf-core-3.5.9-tuxcare.2-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/apache/cxf/cxf-core/3.5.9-tuxcare.2/cxf-core-3.5.9-tuxcare.2-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
 
 ## Resolved CVEs in ELS for Apache CXF
 
@@ -138,6 +119,18 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="apache-cxf" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+CXF) — Track vulnerability fixes and updates
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+CXF) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.cxf/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <script setup>
 const mavencreds =
 `<?xml version="1.0" encoding="UTF-8"?>
diff --git a/docs/els-for-libraries/apache-kafka/README.md b/docs/els-for-libraries/apache-kafka/README.md
index 8601e0fe4..1c5b00ca2 100644
--- a/docs/els-for-libraries/apache-kafka/README.md
+++ b/docs/els-for-libraries/apache-kafka/README.md
@@ -10,17 +10,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Kafka® provides security p
 
 * Apache Kafka® 3.2.3
 
-## Connection to ELS for Apache Kafka® Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Kafka® repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache Kafka® repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -37,7 +39,7 @@ You need a username and password in order to use the TuxCare ELS Apache Kafka®
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -48,82 +50,68 @@ You need a username and password in order to use the TuxCare ELS Apache Kafka®
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache Kafka® repository and plugins to your build configuration:
+   Add the TuxCare Apache Kafka® repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Apache Kafka® repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Apache Kafka® repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Apache Kafka® dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Apache Kafka® dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache Kafka® repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Kafka® repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache Kafka® repository into your project. You can now benefit from the secure and vetted Apache Kafka® libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
-
-TuxCare provides VEX for Apache Kafka® ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.kafka/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.kafka/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Kafka® repository.
 
-## Source Code
+</ELSSteps>
 
-Source code for TuxCare-patched Apache Kafka® libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
 
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/apache/kafka/kafka-clients/3.2.3.tuxcare.1/kafka-clients-3.2.3.tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/apache/kafka/kafka-clients/3.2.3.tuxcare.1/kafka-clients-3.2.3.tuxcare.1-sources.jar).
+## What's next?
 
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+<WhatsNext hide-title>
 
-## Resolved CVEs in ELS for Apache Kafka®
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+Kafka) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Apache+Kafka) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+Kafka) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.kafka/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-<ClientOnly>
-  <ResolvedCveTable project="apache-kafka" />
-</ClientOnly>
+</WhatsNext>
 
 <script setup>
 const mavencreds =
diff --git a/docs/els-for-libraries/apache-log4j/README.md b/docs/els-for-libraries/apache-log4j/README.md
index 7b9bfe704..481bd479c 100644
--- a/docs/els-for-libraries/apache-log4j/README.md
+++ b/docs/els-for-libraries/apache-log4j/README.md
@@ -6,17 +6,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Log4j provides security pat
 
 * Apache Log4j 1.2.17
 
-## Connection to ELS for Apache Log4j Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Log4j repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your Maven and Gradle projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache Log4j repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -33,7 +35,7 @@ You need a username and password in order to use the TuxCare ELS Apache Log4j re
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -44,76 +46,55 @@ You need a username and password in order to use the TuxCare ELS Apache Log4j re
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache Log4j repository and plugins to your build configuration:
+   Add the TuxCare Apache Log4j repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Apache Log4j repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Apache Log4j repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Apache Log4j dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Apache Log4j dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache Log4j repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Log4j repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache Log4j repository into your project. You can now benefit from the secure and vetted Apache Log4j libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Log4j repository.
 
-TuxCare provides VEX for Apache Log4j ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/log4j/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/log4j/).
+</ELSSteps>
 
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Apache Log4j libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/log4j/log4j/1.2.17.tuxcare.1/log4j-1.2.17.tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/log4j/log4j/1.2.17.tuxcare.1/log4j-1.2.17.tuxcare.1-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
 
 ## Resolved CVEs in ELS for Apache Log4j
 
@@ -121,6 +102,18 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="apache-log4j" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+Log4j) — Track vulnerability fixes and updates
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+Log4j) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/log4j/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:log4j) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <script setup>
 const mavencreds =
 `<?xml version="1.0" encoding="UTF-8"?>
diff --git a/docs/els-for-libraries/apache-lucene-and-solr/README.md b/docs/els-for-libraries/apache-lucene-and-solr/README.md
index 8de438963..d274114a8 100644
--- a/docs/els-for-libraries/apache-lucene-and-solr/README.md
+++ b/docs/els-for-libraries/apache-lucene-and-solr/README.md
@@ -11,17 +11,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Lucene® and Apache Solr pr
 * Apache Lucene® 5.5.5
 * Apache Solr 5.5.5
 
-## Connection to ELS Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Lucene® / Apache Solr repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -38,7 +40,7 @@ You need a username and password in order to use the TuxCare ELS repository. Ano
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -49,95 +51,72 @@ You need a username and password in order to use the TuxCare ELS repository. Ano
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare repository and plugins to your build configuration:
+   Add the TuxCare repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-* To fully switch from the official Apache Lucene® / Apache Solr repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   * To fully switch from the official Apache Lucene® / Apache Solr repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-### Step 4: Update Dependencies
+4. **Update dependencies**
 
-Replace the Apache Lucene® or Apache Solr dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+   Replace Apache Lucene® or Apache Solr dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-You can find a specific artifact version in your TuxCare account on Nexus (anonymous access is restricted).
+   <TableTabs label="Choose version: " >
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   <template #Apache_Lucene>
 
-<TableTabs label="Choose version: " >
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-  <template #Apache_Lucene>
-  
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   </template>
 
-  </template>
+   <template #Apache_Solr>
 
-  <template #Apache_Solr>
-  
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps2 },
-  { title: 'Gradle (build.gradle)', content: gradledeps2 }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps2 },
+     { title: 'Gradle (build.gradle)', content: gradledeps2 }
+   ]" />
 
-  </template>
+   </template>
 
-</TableTabs>
+   </TableTabs>
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Lucene® / Apache Solr repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS repository into your project. You can now benefit from the secure and vetted libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Lucene® / Apache Solr repository.
 
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
+</ELSSteps>
 
-TuxCare provides VEX for Apache Lucene® ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.lucene/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.lucene/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Apache Lucene® and Apache Solr libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/apache/lucene/lucene-core/5.5.5-tuxcare.1/lucene-core-5.5.5-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/apache/lucene/lucene-core/5.5.5-tuxcare.1/lucene-core-5.5.5-tuxcare.1-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
 
 ## Resolved CVEs
 
@@ -145,6 +124,18 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="apache-lucene" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+Lucene&product=Apache+Solr) — Track vulnerability fixes and updates
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+Lucene&product=Apache+Solr) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.lucene/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <script setup>
 const mavencreds =
 `<?xml version="1.0" encoding="UTF-8"?>
diff --git a/docs/els-for-libraries/apache-spark/README.md b/docs/els-for-libraries/apache-spark/README.md
index 94635d88b..e85d6f824 100644
--- a/docs/els-for-libraries/apache-spark/README.md
+++ b/docs/els-for-libraries/apache-spark/README.md
@@ -11,17 +11,19 @@ Our ELS for Apache Spark™ service is designed to provide solutions for organiz
 
 * Apache Spark™ 2.4.8
 
-## Connection to ELS for Apache Spark™ Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Spark™ repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache Spark™ repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -38,7 +40,7 @@ You need a username and password in order to use the TuxCare ELS Apache Spark™
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -49,68 +51,55 @@ You need a username and password in order to use the TuxCare ELS Apache Spark™
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache Spark™ repository and plugins to your build configuration:
+   Add the TuxCare Apache Spark™ repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Apache Spark™ repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Apache Spark™ repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Apache Spark™ dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Apache Spark™ dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache Spark™ repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Spark™ repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache Spark™ repository into your project. You can now benefit from the secure and vetted Apache Spark™ libraries it provides.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Spark™ repository.
 
-## How to Upgrade to a Newer Version of TuxCare Packages
+</ELSSteps>
 
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Apache Spark™ libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
 
 ## Resolved CVEs in ELS for Apache Spark™
 
@@ -118,6 +107,17 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="apache-spark" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+Spark) — Track vulnerability fixes and updates
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+Spark) — Full list of product parts covered by ELS
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <!-- data for Apache Spark instructions used in code blocks -->
 
 <script setup>
diff --git a/docs/els-for-libraries/apache-struts/README.md b/docs/els-for-libraries/apache-struts/README.md
index c30957865..b5ac103cd 100644
--- a/docs/els-for-libraries/apache-struts/README.md
+++ b/docs/els-for-libraries/apache-struts/README.md
@@ -11,17 +11,19 @@ Our ELS for Apache Struts™ service is designed to provide solutions for organi
 
 * Apache Struts™ 1.3.5, 2.5.33
 
-## Connection to ELS for Apache Struts™ Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Struts™ repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache Struts™ repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -38,7 +40,7 @@ You need a username and password in order to use the TuxCare ELS Apache Struts
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -49,99 +51,85 @@ You need a username and password in order to use the TuxCare ELS Apache Struts
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache Struts™ repository and plugins to your build configuration:
+   Add the TuxCare Apache Struts™ repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Apache Struts™ repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Apache Struts™ repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Apache Struts™ dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Apache Struts™ dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<TableTabs label="Choose an extension: " >
+   <TableTabs label="Choose an extension: " >
 
-  <template #1.3.5>
+   <template #1.3.5>
 
-  <CodeTabs :tabs="[
-    { title: 'Maven (pom.xml)', content: mavendeps },
-    { title: 'Gradle (build.gradle)', content: gradledeps }
-  ]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-  </template>
+   </template>
 
-  <template #2.5.33>
+   <template #2.5.33>
 
-  <CodeTabs :tabs="[
-    { title: 'Maven (pom.xml)', content: mavendeps2 },
-    { title: 'Gradle (build.gradle)', content: gradledeps2 }
-  ]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps2 },
+     { title: 'Gradle (build.gradle)', content: gradledeps2 }
+   ]" />
 
-  </template>
+   </template>
 
-</TableTabs>
+   </TableTabs>
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache Struts™ repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Struts™ repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache Struts™ repository into your project. You can now benefit from the secure and vetted Apache Struts™ libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
-
-TuxCare provides VEX for Apache Struts™ ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.struts/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.struts/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Struts™ repository.
 
-## Source Code
+</ELSSteps>
 
-Source code for TuxCare-patched Apache Struts™ libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
 
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/apache/struts/struts2-core/2.5.33-tuxcare.1/struts2-core-2.5.33-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/apache/struts/struts2-core/2.5.33-tuxcare.1/struts2-core-2.5.33-tuxcare.1-sources.jar).
+## What's next?
 
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+<WhatsNext hide-title>
 
-## Resolved CVEs in ELS for Apache Struts™
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+Struts) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Apache+Struts) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+Struts) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.struts/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-<ClientOnly>
-  <ResolvedCveTable project="apache-struts" />
-</ClientOnly>
+</WhatsNext>
 
 <!-- data for Apache Struts instructions used in code blocks -->
 
diff --git a/docs/els-for-libraries/apache-tomcat/README.md b/docs/els-for-libraries/apache-tomcat/README.md
index 74e790dd5..cf9f7fca0 100644
--- a/docs/els-for-libraries/apache-tomcat/README.md
+++ b/docs/els-for-libraries/apache-tomcat/README.md
@@ -15,17 +15,19 @@ Apache Tomcat® is also available for installation as a standalone server. You c
 
 * Apache Tomcat® 8.5.100, 9.0.46, 9.0.50, 9.0.75, 9.0.83, 9.0.87, 9.0.90, 9.0.100, 10.1.18, 10.1.42
 
-## Connection to ELS for Apache Tomcat® Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Tomcat® repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache Tomcat® repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -42,7 +44,7 @@ You need a username and password in order to use the TuxCare ELS Apache Tomcat®
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-tomcat-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -53,82 +55,68 @@ You need a username and password in order to use the TuxCare ELS Apache Tomcat®
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache Tomcat® repository and plugins to your build configuration:
+   Add the TuxCare Apache Tomcat® repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Apache Tomcat® repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Apache Tomcat® repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Apache Tomcat® dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Apache Tomcat® dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache Tomcat® repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Tomcat® repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache Tomcat® repository into your project. You can now benefit from the secure and vetted Apache Tomcat® libraries it provides.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Tomcat® repository.
 
-## Vulnerability Exploitability eXchange (VEX)
+</ELSSteps>
 
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
 
-TuxCare provides VEX for Apache Tomcat® ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/).
+## What's next?
 
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Apache Tomcat® libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/apache/tomcat/tomcat-catalina/9.0.75-tuxcare.1/tomcat-catalina-9.0.75-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/apache/tomcat/tomcat-catalina/9.0.75-tuxcare.1/tomcat-catalina-9.0.75-tuxcare.1-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+<WhatsNext hide-title>
 
-## Resolved CVEs in ELS for Apache Tomcat®
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+Tomcat) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Apache+Tomcat) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+Tomcat) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-<ClientOnly>
-  <ResolvedCveTable project="apache-tomcat" />
-</ClientOnly>
+</WhatsNext>
 
 <!-- data for Apache Tomcat instructions used in code blocks -->
 
diff --git a/docs/els-for-libraries/apache-velocity-engine/README.md b/docs/els-for-libraries/apache-velocity-engine/README.md
index d1fbc4916..b0a039ae0 100644
--- a/docs/els-for-libraries/apache-velocity-engine/README.md
+++ b/docs/els-for-libraries/apache-velocity-engine/README.md
@@ -10,17 +10,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Velocity Engine™ provides
 
 * Apache Velocity Engine™ 1.7
 
-## Connection to ELS for Apache Velocity Engine™ Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Apache Velocity Engine™ repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Apache Velocity Engine™ repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -37,7 +39,7 @@ You need a username and password in order to use the TuxCare ELS Apache Velocity
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -48,76 +50,73 @@ You need a username and password in order to use the TuxCare ELS Apache Velocity
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Apache Velocity Engine™ repository and plugins to your build configuration:
+   Add the TuxCare Apache Velocity Engine™ repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Apache Velocity Engine™ repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Apache Velocity Engine™ repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Apache Velocity Engine™ dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Apache Velocity Engine™ dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Apache Velocity Engine™ repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Apache Velocity Engine™ repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Apache Velocity Engine™ repository into your project. You can now benefit from the secure and vetted Apache Velocity Engine™ libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Apache Velocity Engine™ repository.
 
-TuxCare provides VEX for Apache Velocity Engine™ ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.velocity/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.velocity/).
+</ELSSteps>
 
-## How to Upgrade to a Newer Version of TuxCare Packages
+## Resolved CVEs in ELS for Apache Velocity Engine™
 
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
+<ClientOnly>
+  <ResolvedCveTable project="apache-velocity" />
+</ClientOnly>
 
-## Source Code
+## What's next?
 
-Source code for TuxCare-patched Apache Velocity Engine™ libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
+<WhatsNext hide-title>
 
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/apache/velocity/velocity/1.7.tuxcare.1/velocity-1.7.tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/apache/velocity/velocity/1.7.tuxcare.1/velocity-1.7.tuxcare.1-sources.jar).
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Apache+Velocity) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Apache+Velocity) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Apache+Velocity) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.apache.velocity/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+</WhatsNext>
 
 <script setup>
 const mavencreds =
diff --git a/docs/els-for-libraries/hibernate/README.md b/docs/els-for-libraries/hibernate/README.md
index 39ba86ffb..82a320e65 100644
--- a/docs/els-for-libraries/hibernate/README.md
+++ b/docs/els-for-libraries/hibernate/README.md
@@ -7,17 +7,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Hibernate provides security patche
 * Hibernate ORM 5.4.32.Final, 5.6.15.Final
 * Hibernate Search 5.11.10.Final
 
-## Connection to ELS for Hibernate Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Hibernate repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your Maven and Gradle projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Hibernate repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -34,7 +36,7 @@ You need a username and password in order to use the TuxCare ELS Hibernate repos
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -45,93 +47,85 @@ You need a username and password in order to use the TuxCare ELS Hibernate repos
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Hibernate repository and plugins to your build configuration:
+   Add the TuxCare Hibernate repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Hibernate repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Hibernate repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Hibernate dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Hibernate dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<TableTabs label="Choose an extension: " >
+   <TableTabs label="Choose an extension: " >
 
-  <template #Hibernate_ORM>
+   <template #Hibernate_ORM>
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-  </template>
+   </template>
 
-  <template #Hibernate_Search>
+   <template #Hibernate_Search>
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps2 },
-  { title: 'Gradle (build.gradle)', content: gradledeps2 }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps2 },
+     { title: 'Gradle (build.gradle)', content: gradledeps2 }
+   ]" />
 
-  </template>
+   </template>
 
-</TableTabs>
+   </TableTabs>
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Hibernate repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Hibernate repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Hibernate repository into your project. You can now benefit from the secure and vetted Hibernate libraries it provides.
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Hibernate repository.
 
-## Source Code
+</ELSSteps>
 
-Source code for TuxCare-patched Hibernate libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
 
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/hibernate/hibernate-core/5.6.15.Final-tuxcare.1/hibernate-core-5.6.15.Final-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/hibernate/hibernate-core/5.6.15.Final-tuxcare.1/hibernate-core-5.6.15.Final-tuxcare.1-sources.jar).
+## What's next?
 
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+<WhatsNext hide-title>
 
-## Resolved CVEs in ELS for Hibernate
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Hibernate) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Hibernate) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Hibernate) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.hibernate/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-<ClientOnly>
-  <ResolvedCveTable project="hibernate" />
-</ClientOnly>
+</WhatsNext>
 
 <script setup>
 const mavencreds =
diff --git a/docs/els-for-libraries/jackson/README.md b/docs/els-for-libraries/jackson/README.md
index 0fdf9ae99..f57cfd10d 100644
--- a/docs/els-for-libraries/jackson/README.md
+++ b/docs/els-for-libraries/jackson/README.md
@@ -6,17 +6,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Jackson provides security patches
 
 * Jackson 1.9.13
 
-## Connection to ELS for Jackson Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Jackson repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your Maven and Gradle projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Jackson repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -33,7 +35,7 @@ You need a username and password in order to use the TuxCare ELS Jackson reposit
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -44,82 +46,68 @@ You need a username and password in order to use the TuxCare ELS Jackson reposit
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Jackson repository and plugins to your build configuration:
+   Add the TuxCare Jackson repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Jackson repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Jackson repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Jackson dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Jackson dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Jackson repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Jackson repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Jackson repository into your project. You can now benefit from the secure and vetted Jackson libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
-
-TuxCare provides VEX for Jackson ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.codehaus.jackson/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.codehaus.jackson/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Jackson repository.
 
-## Source Code
+</ELSSteps>
 
-Source code for TuxCare-patched Jackson libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
 
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/codehaus/jackson/jackson-mapper-asl/1.9.13-tuxcare.1/jackson-mapper-asl-1.9.13-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/codehaus/jackson/jackson-mapper-asl/1.9.13-tuxcare.1/jackson-mapper-asl-1.9.13-tuxcare.1-sources.jar).
+## What's next?
 
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+<WhatsNext hide-title>
 
-## Resolved CVEs in ELS for Jackson
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Jackson) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Jackson) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Jackson) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.codehaus.jackson/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-<ClientOnly>
-  <ResolvedCveTable project="jackson" />
-</ClientOnly>
+</WhatsNext>
 
 <script setup>
 const mavencreds =
diff --git a/docs/els-for-libraries/java-libraries/README.md b/docs/els-for-libraries/java-libraries/README.md
index 5d11b54d3..ecd148534 100644
--- a/docs/els-for-libraries/java-libraries/README.md
+++ b/docs/els-for-libraries/java-libraries/README.md
@@ -58,17 +58,20 @@ Endless Lifecycle Support (ELS) for Libraries from TuxCare provides security fix
 
 Other libraries upon request.
 
-## Connection to ELS for Java Libraries Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Java Libraries repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Java Libraries repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
+
+1. **Navigate to the build tool directory**
 
-1. Navigate to the directory depending on your operating system.
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -85,98 +88,76 @@ You need a username and password in order to use the TuxCare ELS Java Libraries
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
    :::
 
-<CodeTabs :tabs="[
-  { title: 'Maven (~/.m2/settings.xml)', content: mavencreds },
-  { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
-]" />
-
-Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   <CodeTabs :tabs="[
+     { title: 'Maven (~/.m2/settings.xml)', content: mavencreds },
+     { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
+   ]" />
 
-### Step 3: Update Build Configuration
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-Add the TuxCare Java Libraries repository and plugins to your build configuration:
+3. **Add the TuxCare repository**
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
+   Add the TuxCare Java Libraries repository and plugins to your build configuration.
 
-* To fully switch from the official Java Libraries repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Java Libraries repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-**Replace your dependencies (both direct and transitive, as needed) with the TuxCare-maintained ones, then rebuild your project.**
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace your dependencies (both direct and transitive, as needed) with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-If a BOM (Bill of Materials) is available, it's recommended to use it to manage versions.
+   If a BOM (Bill of Materials) is available, it's recommended to use it to manage versions.
 
-* Example of **BOM (Bill of Materials)** usage:
+   * Example of **BOM (Bill of Materials)** usage:
 
-  <CodeTabs :tabs="[
-    { title: 'Maven (pom.xml)', content: mavendeps2 },
-    { title: 'Gradle (build.gradle)', content: gradledeps2 }
-  ]" />
+     <CodeTabs :tabs="[
+       { title: 'Maven (pom.xml)', content: mavendeps2 },
+       { title: 'Gradle (build.gradle)', content: gradledeps2 }
+     ]" />
 
-* If no BOM is provided, **update dependency versions directly** using the latest `.tuxcare` patches for your dependency versions.
+   * If no BOM is provided, **update dependency versions directly** using the latest `.tuxcare` patches for your dependency versions.
 
-  <CodeTabs :tabs="[
-    { title: 'Maven (pom.xml)', content: mavendeps },
-    { title: 'Gradle (build.gradle)', content: gradledeps }
-  ]" />
+     <CodeTabs :tabs="[
+       { title: 'Maven (pom.xml)', content: mavendeps },
+       { title: 'Gradle (build.gradle)', content: gradledeps }
+     ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Java Libraries repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Java Libraries repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Java Libraries repository into your project. You can now benefit from the secure and vetted Java libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Java Libraries repository.
 
-TuxCare provides VEX for Java Libraries ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Java libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/io/netty/netty-handler/4.1.115.Final-tuxcare.2/netty-handler-4.1.115.Final-tuxcare.2-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/io/netty/netty-handler/4.1.115.Final-tuxcare.2/netty-handler-4.1.115.Final-tuxcare.2-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+</ELSSteps>
 
 ## Resolved CVEs in ELS for Java Libraries
 
@@ -184,6 +165,19 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="java-libraries" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products) — Full list of product parts covered by ELS 
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <!-- data for Java Libraries instructions used in code blocks -->
 
 <script setup>
diff --git a/docs/els-for-libraries/jetty/README.md b/docs/els-for-libraries/jetty/README.md
index 0fc95e6ed..e53173826 100644
--- a/docs/els-for-libraries/jetty/README.md
+++ b/docs/els-for-libraries/jetty/README.md
@@ -6,17 +6,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Eclipse Jetty provides security pa
 
 * Eclipse Jetty 8.2.0.v20160908, 9.4.24.v20191120, 9.4.48.v20220622, 9.4.53.v20231009, 9.4.59, 9.4.60, 10.0.27, 10.0.28, 11.0.19, 11.0.27, 11.0.28
 
-## Connection to ELS for Eclipse Jetty Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Eclipse Jetty repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Eclipse Jetty repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -33,7 +35,7 @@ You need a username and password in order to use the TuxCare ELS Eclipse Jetty r
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -44,82 +46,68 @@ You need a username and password in order to use the TuxCare ELS Eclipse Jetty r
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Eclipse Jetty repository and plugins to your build configuration:
+   Add the TuxCare Eclipse Jetty repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Eclipse Jetty repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Eclipse Jetty repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Eclipse Jetty dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Eclipse Jetty dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Eclipse Jetty repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Eclipse Jetty repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Eclipse Jetty repository into your project. You can now benefit from the secure and vetted Eclipse Jetty libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
-
-TuxCare provides VEX for Eclipse Jetty ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.eclipse.jetty/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.eclipse.jetty/).
-
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Eclipse Jetty repository.
 
-## Source Code
+</ELSSteps>
 
-Source code for TuxCare-patched Eclipse Jetty libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
 
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/eclipse/jetty/jetty-server/9.4.53.v20231009-tuxcare.1/jetty-server-9.4.53.v20231009-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/eclipse/jetty/jetty-server/9.4.53.v20231009-tuxcare.1/jetty-server-9.4.53.v20231009-tuxcare.1-sources.jar).
+## What's next?
 
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+<WhatsNext hide-title>
 
-## Resolved CVEs in ELS for Eclipse Jetty
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Eclipse+Jetty) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Eclipse+Jetty) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Eclipse+Jetty) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.eclipse.jetty/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-<ClientOnly>
-  <ResolvedCveTable project="jetty" />
-</ClientOnly>
+</WhatsNext>
 
 <script setup>
 const mavencreds =
diff --git a/docs/els-for-libraries/managing-els-repository/README.md b/docs/els-for-libraries/managing-els-repository/README.md
new file mode 100644
index 000000000..19fa16c54
--- /dev/null
+++ b/docs/els-for-libraries/managing-els-repository/README.md
@@ -0,0 +1,418 @@
+# Managing the ELS repository
+
+This page provides instructions for upgrading to newer TuxCare package versions and accessing source code for ELS-patched libraries.
+
+## Upgrading to a newer TuxCare version
+
+To update to a newer TuxCare-patched release, follow the instructions for your ecosystem.
+
+### Java libraries
+
+<TableTabs label="Choose library: ">
+
+<template #Apache_Commons_Lang>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_CXF>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_Kafka>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_Log4j>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_Lucene_and_Solr>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_Spark>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_Struts>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_Tomcat>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Apache_Velocity_Engine>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Hibernate>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Jackson>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Jetty>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #PostgreSQL_Driver>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Protobuf>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
+
+</template>
+
+<template #Spring>
+
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version string in your Maven or Gradle build file.
+
+</template>
+
+</TableTabs>
+
+### PHP libraries
+
+<TableTabs label="Choose library: ">
+
+<template #AWS_SDK_for_PHP>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require aws/aws-sdk-php:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Browsershot>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require spatie/browsershot:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #CakePHP>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require cakephp/cakephp:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Carbon>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require nesbot/carbon:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #CraftCMS>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require craftcms/cms:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #CraftCMS_Feed_Me>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require craftcms/feed-me:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Dompdf>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require dompdf/dompdf:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Firebase_PHP_JWT>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require firebase/php-jwt:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Laravel>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require laravel/framework:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #League_CommonMark>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require league/commonmark:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Livewire>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require livewire/livewire:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #PHP_SVG_Lib>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require phenx/php-svg-lib:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #PHPMailer>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require phpmailer/phpmailer:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #PhpSpreadsheet>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require phpoffice/phpspreadsheet:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #PHPUnit>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require sebastianbergmann/phpunit:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #SwiftMailer>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require swiftmailer/swiftmailer:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Symfony>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require symfony/process:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+<template #Zend_Framework>
+
+Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+
+```text
+composer require zendframework/zendframework1:VERSION-pN+tuxcare
+```
+
+Then run `composer update` to apply the changes:
+
+```text
+composer update
+```
+
+</template>
+
+</TableTabs>
+
+### Python libraries
+
+To upgrade to a newer TuxCare release (e.g., from `version.post1+tuxcare` to `version.post2+tuxcare`), use the same installation method you used during setup and specify the newer package version.
+
+### JavaScript libraries
+
+To upgrade to a newer TuxCare release (for example, from `tuxcare.1` to `tuxcare.3`), remove `node_modules`, clear the npm cache to avoid conflicts, and then run the installation command:
+
+```text
+rm -rf node_modules package-lock.json && npm cache clean --force
+npm install
+```
+
+## Source code
+
+TuxCare provides source code for patched applications in the [Nexus repository](https://nexus.repo.tuxcare.com/#browse/browse). Source archives and JARs follow the standard naming conventions with a `-sources` classifier or suffix.
+
+:::tip
+If a source archive is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+:::
diff --git a/docs/els-for-libraries/postgresql-driver/README.md b/docs/els-for-libraries/postgresql-driver/README.md
index 3f49ba33f..bba169c62 100644
--- a/docs/els-for-libraries/postgresql-driver/README.md
+++ b/docs/els-for-libraries/postgresql-driver/README.md
@@ -6,17 +6,19 @@ TuxCare's Endless Lifecycle Support (ELS) for PostgreSQL driver provides securit
 
 * PostgreSQL driver  42.2.16, 42.5.0
 
-## Connection to ELS for PostgreSQL driver Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for PostgreSQL driver repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS PostgreSQL driver repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -33,7 +35,7 @@ You need a username and password in order to use the TuxCare ELS PostgreSQL driv
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -44,76 +46,55 @@ You need a username and password in order to use the TuxCare ELS PostgreSQL driv
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare PostgreSQL driver repository and plugins to your build configuration:
+   Add the TuxCare PostgreSQL driver repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official PostgreSQL driver repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official PostgreSQL driver repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the PostgreSQL driver dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace PostgreSQL driver dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare PostgreSQL driver repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for PostgreSQL driver repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for PostgreSQL driver repository into your project. You can now benefit from the secure and vetted PostgreSQL driver libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for PostgreSQL driver repository.
 
-TuxCare provides VEX for PostgreSQL driver ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/org.postgresql/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.postgresql/).
+</ELSSteps>
 
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched PostgreSQL driver libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/postgresql/postgresql/42.5.0-tuxcare.1/postgresql-42.5.0-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/postgresql/postgresql/42.5.0-tuxcare.1/postgresql-42.5.0-tuxcare.1-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
 
 ## Resolved CVEs in ELS for PostgreSQL Driver
 
@@ -121,6 +102,17 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="postgresql-driver" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=PostgreSQL+driver) — Patched versions and changelogs
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/org.postgresql/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <!-- data for PostgreSQL driver instructions used in code blocks -->
 
 <script setup>
diff --git a/docs/els-for-libraries/protobuf/README.md b/docs/els-for-libraries/protobuf/README.md
index 9c4e49833..2109af817 100644
--- a/docs/els-for-libraries/protobuf/README.md
+++ b/docs/els-for-libraries/protobuf/README.md
@@ -6,17 +6,19 @@ TuxCare's Endless Lifecycle Support (ELS) for Protobuf provides security patches
 
 * Protobuf 2.5.0, 2.6.1
 
-## Connection to ELS for Protobuf Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Protobuf repository into your Java application. The repository provides trusted Java libraries that can be easily integrated into your **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Protobuf repository. Anonymous access is disabled. To receive a username and password, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -33,7 +35,7 @@ You need a username and password in order to use the TuxCare ELS Protobuf reposi
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -44,76 +46,55 @@ You need a username and password in order to use the TuxCare ELS Protobuf reposi
      { title: 'Gradle (~/.gradle/gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in the [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Protobuf repository and plugins to your build configuration:
+   Add the TuxCare Protobuf repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Protobuf repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   * To fully switch from the official Protobuf repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
 
-Replace the Protobuf dependencies in your build file with the TuxCare-maintained versions to cover both direct and transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Protobuf dependencies with TuxCare-maintained versions. You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Protobuf repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Protobuf repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Protobuf repository into your project. You can now benefit from the secure and vetted Protobuf libraries it provides.
-
-## Vulnerability Exploitability eXchange (VEX)
-
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives, helps prioritize real risks.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Protobuf repository.
 
-TuxCare provides VEX for Protobuf ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/com.google.protobuf/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/com.google.protobuf/).
+</ELSSteps>
 
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update version strings in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Protobuf libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/com/google/protobuf/protobuf-java/2.5.0-tuxcare.1/protobuf-java-2.5.0-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/com/google/protobuf/protobuf-java/2.5.0-tuxcare.1/protobuf-java-2.5.0-tuxcare.1-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
 
 ## Resolved CVEs in ELS for Protocol Buffers
 
@@ -121,6 +102,17 @@ If a source JAR is not available for a specific package, please contact [sales@t
   <ResolvedCveTable project="protobuf" />
 </ClientOnly>
 
+## What's next?
+
+<WhatsNext hide-title>
+
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Protobuf) — Patched versions and changelogs
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/com.google.protobuf/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:com%2Fgoogle) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
+
+</WhatsNext>
+
 <!-- data for Protobuf instructions used in code blocks -->
 
 <script setup>
@@ -138,8 +130,8 @@ const mavencreds =
 
 const gradlecreds =
 `tuxcare_registry_url=https://nexus.repo.tuxcare.com/repository/els_java/
-+tuxcare_registry_user=USERNAME
-+tuxcare_registry_password=PASSWORD`
+tuxcare_registry_user=USERNAME
+tuxcare_registry_password=PASSWORD`
 
 const mavenrepo =
 `<repositories>
diff --git a/docs/els-for-libraries/spring/README.md b/docs/els-for-libraries/spring/README.md
index f0b0e788d..dbd734e05 100644
--- a/docs/els-for-libraries/spring/README.md
+++ b/docs/els-for-libraries/spring/README.md
@@ -379,17 +379,19 @@ ELS for Spring® also patches transitive dependencies at no extra cost, includin
 
 </TableTabs>
 
-## Connection to ELS for Spring® Repository
+## Installation
 
-This guide outlines the steps needed to integrate the TuxCare ELS for Spring® repository into your Java application. The repository provides trusted Java libraries that can be easily used with both **Maven** and **Gradle** projects.
+<ELSPrerequisites>
 
-### Step 1: Get user credentials
+* **Maven** or **Gradle** build tool installed
+* Nexus repository access credentials (username and password) — contact [sales@tuxcare.com](mailto:sales@tuxcare.com) 
+* To browse available artifacts, visit TuxCare [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) and click Sign in in the top right corner. You may need to refresh the page after logging in.
 
-You need a username and password in order to use the TuxCare ELS Spring® repository. Anonymous access is disabled. To receive a username and password please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+</ELSPrerequisites>
 
-### Step 2: Configure Registry
+<ELSSteps>
 
-1. Navigate to the directory depending on your operating system.
+1. **Navigate to the build tool directory**
    * Windows
    ```text
    Maven: C:\Users\{username}\.m2
@@ -406,7 +408,7 @@ You need a username and password in order to use the TuxCare ELS Spring® reposi
    Gradle: /home/{username}/.gradle
    ```
 
-2. Add the TuxCare repository and plugin repository to your build configuration.
+2. **Configure credentials**
 
    :::tip
    For Maven, you may choose any valid `<id>` value instead of `tuxcare-registry`, but the same value must be used in both `settings.xml` and `pom.xml`.
@@ -417,82 +419,68 @@ You need a username and password in order to use the TuxCare ELS Spring® reposi
      { title: 'Gradle (gradle.properties)', content: gradlecreds }
    ]" />
 
-   Here `USERNAME` and `PASSWORD` are your credentials mentioned in [Step 1](#step-1-get-user-credentials).
+   Here `USERNAME` and `PASSWORD` are your Tuxcare credentials.
 
-### Step 3: Update Build Configuration
+3. **Add the TuxCare repository**
 
-Add the TuxCare Spring® repository and plugins to your build configuration:
+   Add the TuxCare Spring® repository and plugins to your build configuration.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavenrepo },
-  { title: 'Gradle (build.gradle)', content: gradlerepo }
-]" />
-
-* To fully switch from the official Spring® repository, replace it with the TuxCare repository.
-* To keep both, add TuxCare after the official one.
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavenrepo },
+     { title: 'Gradle (build.gradle)', content: gradlerepo }
+   ]" />
 
-Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-* [Maven](https://github.com/cloudlinux/securechain-java/blob/main/examples/maven)
-* [Gradle](https://github.com/cloudlinux/securechain-java/blob/main/examples/gradle)
+   * To fully switch from the official Spring® repository, replace it with the TuxCare repository.
+   * To keep both, add TuxCare after the official one.
 
-### Step 4: Update Dependencies
+   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
+   * [Maven](https://github.com/cloudlinux/securechain-java/blob/main/examples/maven)
+   * [Gradle](https://github.com/cloudlinux/securechain-java/blob/main/examples/gradle)
 
-Replace the Spring® build dependencies in your build file with the TuxCare-maintained versions. Set the TuxCare release as the parent version. Your build tool will fetch the TuxCare versions of both your dependencies and their transitive dependencies.
+4. **Update dependencies**
 
-You can find a specific artifact version in your TuxCare account on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java). Click **Sign In** in the top right corner to authenticate with your TuxCare credentials. After logging in, you may need to refresh or reopen the link to browse artifacts due to Nexus routing behavior.
+   Replace Spring® build dependencies with TuxCare-maintained versions (set the TuxCare release as the parent or BOM as needed). You can find artifact versions on [Nexus](https://nexus.repo.tuxcare.com/#browse/browse:els_java) — sign in with your TuxCare credentials.
 
-<CodeTabs :tabs="[
-  { title: 'Maven (pom.xml)', content: mavendeps },
-  { title: 'Gradle (build.gradle)', content: gradledeps }
-]" />
+   <CodeTabs :tabs="[
+     { title: 'Maven (pom.xml)', content: mavendeps },
+     { title: 'Gradle (build.gradle)', content: gradledeps }
+   ]" />
 
-### Step 5: Verify and Build
+5. **Verify the setup**
 
-1. To confirm the TuxCare Spring® repository is set up correctly, use your build tool to list the project's dependencies. It shows both direct and transitive dependencies in the classpath.
+   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-2. After reviewing the dependencies, include any library from the repository into your project and then run a build:
+6. **Build the project**
+
+   Include any library from the repository and run a build.
 
    <CodeTabs :tabs="[
-    { title: 'Maven', content: `mvn clean install` },
-    { title: 'Gradle', content: `./gradlew build` }
+     { title: 'Maven', content: `mvn clean install` },
+     { title: 'Gradle', content: `./gradlew build` }
    ]" />
 
-The build tool you're using should be able to identify and resolve dependencies from the TuxCare ELS for Spring® repository.
-
-### Conclusion
-
-You've successfully integrated the TuxCare ELS for Spring® repository into your project. You can now benefit from the secure and vetted Spring® libraries it provides.
+   The build tool should be able to identify and resolve dependencies from the TuxCare ELS for Spring® repository.
 
-## Vulnerability Exploitability eXchange (VEX)
+</ELSSteps>
 
-VEX is a machine-readable format that tells you if a known vulnerability is actually exploitable in your product. It reduces false positives and helps prioritize real risks.
 
-TuxCare provides VEX for Spring® ELS versions: [security.tuxcare.com/vex/cyclonedx/els_lang_java/](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/).
+## What's next?
 
-## How to Upgrade to a Newer Version of TuxCare Packages
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), you need to update the version string in your Maven or Gradle build file.
-
-## Source Code
-
-Source code for TuxCare-patched Spring® libraries is available in the repository. Source JARs follow the standard Maven naming convention with a `-sources` classifier.
-
-For example: [https://nexus.repo.tuxcare.com/repository/els_java/org/springframework/spring-core/5.3.39-tuxcare.9/spring-core-5.3.39-tuxcare.9-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/org/springframework/spring-core/5.3.39-tuxcare.9/spring-core-5.3.39-tuxcare.9-sources.jar).
-
-:::tip
-If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com) to report the issue.
-:::
+<WhatsNext hide-title>
 
-## Resolved CVEs in ELS for Spring®
+* ![](/images/eye.webp) [CVE tracker](https://tuxcare.com/cve-tracker/?product=Spring) — Track vulnerability fixes and updates
+* ![](/images/shield.webp) [Available fixes](https://tuxcare.com/cve-tracker/fixes?product=Spring) — Patched versions and changelogs
+* ![](/images/clipboard-notes.webp) [Supported components](https://tuxcare.com/cve-tracker/products?product=Spring) — Full list of product parts covered by ELS
+* ![](/images/shield-alert.webp) [VEX feed](https://security.tuxcare.com/vex/cyclonedx/els_lang_java/) — Vulnerability Exploitability eXchange feed
+* ![](/images/unlock-alt.webp) [Source code](https://nexus.repo.tuxcare.com/#browse/browse:els_java:org) — Nexus repository (credentials required)
+* ![](/images/wrench.webp) [Managing the ELS repository](/els-for-libraries/managing-els-repository/) — Update to newer versions
 
-<ClientOnly>
-  <ResolvedCveTable project="spring-els" />
-</ClientOnly>
+</WhatsNext>
 
 <!-- data for spring instructions used in code blocks -->
 

From 8663ac696a771ce5c614c5b4ab49a54845a3844d Mon Sep 17 00:00:00 2001
From: Nadya2502 <fornmer@yandex.ru>
Date: Thu, 30 Apr 2026 16:00:16 +0200
Subject: [PATCH 2/2] updated java pages

---
 .../apache-commons-lang/README.md             |  16 +-
 docs/els-for-libraries/apache-cxf/README.md   |  16 +-
 docs/els-for-libraries/apache-kafka/README.md |  16 +-
 docs/els-for-libraries/apache-log4j/README.md |  16 +-
 .../apache-lucene-and-solr/README.md          |  16 +-
 docs/els-for-libraries/apache-spark/README.md |  16 +-
 .../els-for-libraries/apache-struts/README.md |  16 +-
 .../els-for-libraries/apache-tomcat/README.md |  16 +-
 .../apache-velocity-engine/README.md          |  22 +-
 docs/els-for-libraries/hibernate/README.md    |  16 +-
 docs/els-for-libraries/jackson/README.md      |  16 +-
 .../java-libraries/README.md                  |  16 +-
 docs/els-for-libraries/jetty/README.md        |  16 +-
 .../managing-els-repository/README.md         | 444 ++----------------
 .../postgresql-driver/README.md               |  16 +-
 docs/els-for-libraries/protobuf/README.md     |  16 +-
 docs/els-for-libraries/spring/README.md       |  16 +-
 17 files changed, 141 insertions(+), 565 deletions(-)

diff --git a/docs/els-for-libraries/apache-commons-lang/README.md b/docs/els-for-libraries/apache-commons-lang/README.md
index 87b255cd6..f82d042c9 100644
--- a/docs/els-for-libraries/apache-commons-lang/README.md
+++ b/docs/els-for-libraries/apache-commons-lang/README.md
@@ -61,9 +61,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Commons Lang provides secur
    * To fully switch from the official Apache Commons Lang repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -91,18 +91,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Commons Lang provides secur
 
    </TableTabs>
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -120,7 +118,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Commons Lang provides secur
   <ResolvedCveTable project="commons-lang" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-cxf/README.md b/docs/els-for-libraries/apache-cxf/README.md
index 20c9b2e94..cf3e25f14 100644
--- a/docs/els-for-libraries/apache-cxf/README.md
+++ b/docs/els-for-libraries/apache-cxf/README.md
@@ -60,9 +60,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache CXF provides security patch
    * To fully switch from the official Apache CXF repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -90,18 +90,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache CXF provides security patch
 
    </TableTabs>
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -119,7 +117,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache CXF provides security patch
   <ResolvedCveTable project="apache-cxf" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-kafka/README.md b/docs/els-for-libraries/apache-kafka/README.md
index 1c5b00ca2..6445dca48 100644
--- a/docs/els-for-libraries/apache-kafka/README.md
+++ b/docs/els-for-libraries/apache-kafka/README.md
@@ -64,9 +64,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Kafka® provides security p
    * To fully switch from the official Apache Kafka® repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -77,18 +77,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Kafka® provides security p
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -100,7 +98,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Kafka® provides security p
 </ELSSteps>
 
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-log4j/README.md b/docs/els-for-libraries/apache-log4j/README.md
index 481bd479c..7118dd537 100644
--- a/docs/els-for-libraries/apache-log4j/README.md
+++ b/docs/els-for-libraries/apache-log4j/README.md
@@ -60,9 +60,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Log4j provides security pat
    * To fully switch from the official Apache Log4j repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -73,18 +73,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Log4j provides security pat
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -102,7 +100,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Log4j provides security pat
   <ResolvedCveTable project="apache-log4j" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-lucene-and-solr/README.md b/docs/els-for-libraries/apache-lucene-and-solr/README.md
index d274114a8..597b5225e 100644
--- a/docs/els-for-libraries/apache-lucene-and-solr/README.md
+++ b/docs/els-for-libraries/apache-lucene-and-solr/README.md
@@ -65,9 +65,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Lucene® and Apache Solr pr
    * To fully switch from the official Apache Lucene® / Apache Solr repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -95,18 +95,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Lucene® and Apache Solr pr
 
    </TableTabs>
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -124,7 +122,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Lucene® and Apache Solr pr
   <ResolvedCveTable project="apache-lucene" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-spark/README.md b/docs/els-for-libraries/apache-spark/README.md
index e85d6f824..d7fa7c98f 100644
--- a/docs/els-for-libraries/apache-spark/README.md
+++ b/docs/els-for-libraries/apache-spark/README.md
@@ -65,9 +65,9 @@ Our ELS for Apache Spark™ service is designed to provide solutions for organiz
    * To fully switch from the official Apache Spark™ repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -78,18 +78,16 @@ Our ELS for Apache Spark™ service is designed to provide solutions for organiz
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -107,7 +105,7 @@ Our ELS for Apache Spark™ service is designed to provide solutions for organiz
   <ResolvedCveTable project="apache-spark" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-struts/README.md b/docs/els-for-libraries/apache-struts/README.md
index b5ac103cd..3d6d8e01d 100644
--- a/docs/els-for-libraries/apache-struts/README.md
+++ b/docs/els-for-libraries/apache-struts/README.md
@@ -65,9 +65,9 @@ Our ELS for Apache Struts™ service is designed to provide solutions for organi
    * To fully switch from the official Apache Struts™ repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -95,18 +95,16 @@ Our ELS for Apache Struts™ service is designed to provide solutions for organi
 
    </TableTabs>
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -118,7 +116,7 @@ Our ELS for Apache Struts™ service is designed to provide solutions for organi
 </ELSSteps>
 
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-tomcat/README.md b/docs/els-for-libraries/apache-tomcat/README.md
index cf9f7fca0..f04df569a 100644
--- a/docs/els-for-libraries/apache-tomcat/README.md
+++ b/docs/els-for-libraries/apache-tomcat/README.md
@@ -69,9 +69,9 @@ Apache Tomcat® is also available for installation as a standalone server. You c
    * To fully switch from the official Apache Tomcat® repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -82,18 +82,16 @@ Apache Tomcat® is also available for installation as a standalone server. You c
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -105,7 +103,7 @@ Apache Tomcat® is also available for installation as a standalone server. You c
 </ELSSteps>
 
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/apache-velocity-engine/README.md b/docs/els-for-libraries/apache-velocity-engine/README.md
index b0a039ae0..cf3df6e49 100644
--- a/docs/els-for-libraries/apache-velocity-engine/README.md
+++ b/docs/els-for-libraries/apache-velocity-engine/README.md
@@ -64,9 +64,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Velocity Engine™ provides
    * To fully switch from the official Apache Velocity Engine™ repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -77,18 +77,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Velocity Engine™ provides
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -99,13 +97,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Apache Velocity Engine™ provides
 
 </ELSSteps>
 
-## Resolved CVEs in ELS for Apache Velocity Engine™
-
-<ClientOnly>
-  <ResolvedCveTable project="apache-velocity" />
-</ClientOnly>
-
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/hibernate/README.md b/docs/els-for-libraries/hibernate/README.md
index 82a320e65..efafeb1e0 100644
--- a/docs/els-for-libraries/hibernate/README.md
+++ b/docs/els-for-libraries/hibernate/README.md
@@ -61,9 +61,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Hibernate provides security patche
    * To fully switch from the official Hibernate repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -91,18 +91,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Hibernate provides security patche
 
    </TableTabs>
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -114,7 +112,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Hibernate provides security patche
 </ELSSteps>
 
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/jackson/README.md b/docs/els-for-libraries/jackson/README.md
index f57cfd10d..53f9940f0 100644
--- a/docs/els-for-libraries/jackson/README.md
+++ b/docs/els-for-libraries/jackson/README.md
@@ -60,9 +60,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Jackson provides security patches
    * To fully switch from the official Jackson repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -73,18 +73,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Jackson provides security patches
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -96,7 +94,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Jackson provides security patches
 </ELSSteps>
 
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/java-libraries/README.md b/docs/els-for-libraries/java-libraries/README.md
index ecd148534..dc8ddaded 100644
--- a/docs/els-for-libraries/java-libraries/README.md
+++ b/docs/els-for-libraries/java-libraries/README.md
@@ -113,9 +113,9 @@ Other libraries upon request.
    * To fully switch from the official Java Libraries repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -137,18 +137,16 @@ Other libraries upon request.
        { title: 'Gradle (build.gradle)', content: gradledeps }
      ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -165,7 +163,7 @@ Other libraries upon request.
   <ResolvedCveTable project="java-libraries" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/jetty/README.md b/docs/els-for-libraries/jetty/README.md
index e53173826..0c1f19b1c 100644
--- a/docs/els-for-libraries/jetty/README.md
+++ b/docs/els-for-libraries/jetty/README.md
@@ -60,9 +60,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Eclipse Jetty provides security pa
    * To fully switch from the official Eclipse Jetty repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -73,18 +73,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Eclipse Jetty provides security pa
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -96,7 +94,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Eclipse Jetty provides security pa
 </ELSSteps>
 
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/managing-els-repository/README.md b/docs/els-for-libraries/managing-els-repository/README.md
index 2ded6114a..5dc7720bd 100644
--- a/docs/els-for-libraries/managing-els-repository/README.md
+++ b/docs/els-for-libraries/managing-els-repository/README.md
@@ -2,455 +2,69 @@
 
 This page provides instructions for upgrading to newer TuxCare package versions and accessing source code for ELS-patched libraries.
 
-## Upgrading to a newer TuxCare version
-
-To update to a newer TuxCare-patched release, follow the instructions for your ecosystem.
-
-### Java libraries
-
-<TableTabs label="Choose library: ">
-
-<template #Apache_Commons_Lang>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_CXF>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_Kafka>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_Log4j>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_Lucene_and_Solr>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_Spark>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_Struts>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_Tomcat>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Apache_Velocity_Engine>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Hibernate>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Jackson>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Jetty>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #PostgreSQL_Driver>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Protobuf>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version strings in your Maven or Gradle build file.
-
-</template>
-
-<template #Spring>
-
-If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version string in your Maven or Gradle build file.
-
-</template>
-
-</TableTabs>
-
-### PHP libraries
-
-<TableTabs label="Choose library: ">
-
-<template #AWS_SDK_for_PHP>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require aws/aws-sdk-php:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #Browsershot>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require spatie/browsershot:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #CakePHP>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require cakephp/cakephp:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #Carbon>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require nesbot/carbon:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #CraftCMS>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require craftcms/cms:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #CraftCMS_Feed_Me>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require craftcms/feed-me:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #Dompdf>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require dompdf/dompdf:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #Firebase_PHP_JWT>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require firebase/php-jwt:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #Laravel>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require laravel/framework:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #League_CommonMark>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require league/commonmark:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #Livewire>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require livewire/livewire:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #PHP_SVG_Lib>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require phenx/php-svg-lib:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #PHPMailer>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require phpmailer/phpmailer:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
-
-```text
-composer update
-```
-
-</template>
-
-<template #PhpSpreadsheet>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+## How to Upgrade to a Newer Version
 
-```text
-composer require phpoffice/phpspreadsheet:VERSION-pN+tuxcare
-```
+<TableTabs label="Choose the Ecosystem: " >
 
-Then run `composer update` to apply the changes:
+<template #Java>
 
-```text
-composer update
-```
+If you have already installed a package with a `tuxcare.1` suffix and want to upgrade to a newer release (for example, `tuxcare.3`), update the version string in your Maven or Gradle build file with the version listed in your TuxCare Nexus account.
 
 </template>
 
-<template #PHPUnit>
+<template #PHP>
 
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+If you have already installed a TuxCare-patched package and want to upgrade to a newer release, update the version string in your `composer.json` file or run the `composer require` command with the new version.
 
-```text
-composer require sebastianbergmann/phpunit:VERSION-pN+tuxcare
-```
+<ELSSteps>
 
-Then run `composer update` to apply the changes:
+1. Update the required version
 
-```text
-composer update
-```
+   Replace `VENDOR/PACKAGE` with the package name and `VERSION-pN+tuxcare` with the version listed in your TuxCare Nexus account:
 
-</template>
+   ```text
+   composer require VENDOR/PACKAGE:VERSION-pN+tuxcare
+   ```
 
-<template #SwiftMailer>
+2. Apply the changes
 
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
+   Run `composer update` to resolve dependencies and install the new release:
 
-```text
-composer require swiftmailer/swiftmailer:VERSION-pN+tuxcare
-```
+   ```text
+   composer update
+   ```
 
-Then run `composer update` to apply the changes:
+</ELSSteps>
 
-```text
-composer update
-```
+**Check the exact version listed in your TuxCare Nexus account to ensure you receive the most recent patched release.**
 
 </template>
 
-<template #Symfony>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require symfony/process:VERSION-pN+tuxcare
-```
-
-Then run `composer update` to apply the changes:
+<template #Python>
 
-```text
-composer update
-```
+To upgrade to a newer TuxCare release (for example, from `version.post1+tuxcare` to `version.post2+tuxcare`), use the same installation method you used during setup and specify the newer package version listed in your TuxCare Nexus account.
 
 </template>
 
-<template #Zend_Framework>
-
-Update the version string in your `composer.json` file or run the `composer require` command with the new version:
-
-```text
-composer require zendframework/zendframework1:VERSION-pN+tuxcare
-```
+<template #JavaScript>
 
-Then run `composer update` to apply the changes:
+To upgrade to a newer TuxCare release (for example, from `tuxcare.1` to `tuxcare.3`), remove `node_modules`, clear the npm cache to avoid conflicts, and then run the installation command:
 
 ```text
-composer update
+rm -rf node_modules package-lock.json && npm cache clean --force
+npm install
 ```
 
 </template>
 
 </TableTabs>
 
-### Python libraries
-
-To upgrade to a newer TuxCare release (e.g., from `version.post1+tuxcare` to `version.post2+tuxcare`), use the same installation method you used during setup and specify the newer package version.
-
-### JavaScript libraries
-
-To upgrade to a newer TuxCare release (for example, from `tuxcare.1` to `tuxcare.3`), remove `node_modules`, clear the npm cache to avoid conflicts, and then run the installation command:
-
-```text
-rm -rf node_modules package-lock.json && npm cache clean --force
-npm install
-```
-
 ## Source code
 
-TuxCare provides source code for patched applications in the [Nexus repository](https://nexus.repo.tuxcare.com/#browse/browse). Source archives and JARs follow the standard naming conventions with a `-sources` classifier or suffix.
+Source code is currently available for TuxCare-patched **Java** libraries. Source JARs follow the standard Maven naming convention with a `-sources` classifier and are published to the [Nexus repository](https://nexus.repo.tuxcare.com/#browse/browse:els_java).
+
+For example: [https://nexus.repo.tuxcare.com/repository/els_java/commons-lang/commons-lang/2.6-tuxcare.1/commons-lang-2.6-tuxcare.1-sources.jar](https://nexus.repo.tuxcare.com/repository/els_java/commons-lang/commons-lang/2.6-tuxcare.1/commons-lang-2.6-tuxcare.1-sources.jar).
 
 :::tip
-If a source archive is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
+If a source JAR is not available for a specific package, please contact [sales@tuxcare.com](mailto:sales@tuxcare.com).
 :::
-
----
-
-This page provides instructions for upgrading to newer TuxCare-patched library versions delivered through the ELS for Libraries repository.
-
-## How to Upgrade to a Newer Version
-
-<TableTabs label="Choose the Ecosystem: " >
-
-<template #PHP>
-
-If you have already installed a TuxCare-patched package and want to upgrade to a newer release, update the version string in your `composer.json` file or run the `composer require` command with the new version.
-
-<ELSSteps>
-
-1. Update the required version
-
-   Replace `VENDOR/PACKAGE` with the package name and `VERSION-pN+tuxcare` with the version listed in your TuxCare Nexus account:
-
-   ```text
-   composer require VENDOR/PACKAGE:VERSION-pN+tuxcare
-   ```
-
-2. Apply the changes
-
-   Run `composer update` to resolve dependencies and install the new release:
-
-   ```text
-   composer update
-   ```
-
-</ELSSteps>
-
-**Check the exact version listed in your TuxCare Nexus account to ensure you receive the most recent patched release.**
-
-</template>
-
-</TableTabs>
diff --git a/docs/els-for-libraries/postgresql-driver/README.md b/docs/els-for-libraries/postgresql-driver/README.md
index bba169c62..fb513c9ea 100644
--- a/docs/els-for-libraries/postgresql-driver/README.md
+++ b/docs/els-for-libraries/postgresql-driver/README.md
@@ -60,9 +60,9 @@ TuxCare's Endless Lifecycle Support (ELS) for PostgreSQL driver provides securit
    * To fully switch from the official PostgreSQL driver repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -73,18 +73,16 @@ TuxCare's Endless Lifecycle Support (ELS) for PostgreSQL driver provides securit
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -102,7 +100,7 @@ TuxCare's Endless Lifecycle Support (ELS) for PostgreSQL driver provides securit
   <ResolvedCveTable project="postgresql-driver" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/protobuf/README.md b/docs/els-for-libraries/protobuf/README.md
index 2109af817..852d9d491 100644
--- a/docs/els-for-libraries/protobuf/README.md
+++ b/docs/els-for-libraries/protobuf/README.md
@@ -60,9 +60,9 @@ TuxCare's Endless Lifecycle Support (ELS) for Protobuf provides security patches
    * To fully switch from the official Protobuf repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/tree/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/tree/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -73,18 +73,16 @@ TuxCare's Endless Lifecycle Support (ELS) for Protobuf provides security patches
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -102,7 +100,7 @@ TuxCare's Endless Lifecycle Support (ELS) for Protobuf provides security patches
   <ResolvedCveTable project="protobuf" />
 </ClientOnly>
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>
 
diff --git a/docs/els-for-libraries/spring/README.md b/docs/els-for-libraries/spring/README.md
index 0e1e7b16b..17c87b9da 100644
--- a/docs/els-for-libraries/spring/README.md
+++ b/docs/els-for-libraries/spring/README.md
@@ -433,9 +433,9 @@ ELS for Spring® also patches transitive dependencies at no extra cost, includin
    * To fully switch from the official Spring® repository, replace it with the TuxCare repository.
    * To keep both, add TuxCare after the official one.
 
-   Example Maven and Gradle projects are available on GitHub. Remember to set the required environment variables.
-   * [Maven](https://github.com/cloudlinux/securechain-java/blob/main/examples/maven)
-   * [Gradle](https://github.com/cloudlinux/securechain-java/blob/main/examples/gradle)
+   :::tip
+   Example **[Maven](https://github.com/cloudlinux/securechain-java/blob/main/examples/maven)** and **[Gradle](https://github.com/cloudlinux/securechain-java/blob/main/examples/gradle)** projects are available on GitHub. Ensure the required environment variables are set.
+   :::
 
 4. **Update dependencies**
 
@@ -446,18 +446,16 @@ ELS for Spring® also patches transitive dependencies at no extra cost, includin
      { title: 'Gradle (build.gradle)', content: gradledeps }
    ]" />
 
-5. **Verify the setup**
+5. **Verify and build**
 
-   Use your build tool to list the project's dependencies and confirm TuxCare packages are resolved correctly.
+   Verify the setup:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn dependency:tree -Dverbose` },
      { title: 'Gradle', content: `./gradlew dependencies --configuration runtimeClasspath` }
    ]" />
 
-6. **Build the project**
-
-   Include any library from the repository and run a build.
+   Build the project:
 
    <CodeTabs :tabs="[
      { title: 'Maven', content: `mvn clean install` },
@@ -469,7 +467,7 @@ ELS for Spring® also patches transitive dependencies at no extra cost, includin
 </ELSSteps>
 
 
-## What's next?
+## What's Next?
 
 <WhatsNext hide-title>