diff --git a/DB-Mariadb.md b/DB-Mariadb.md
index e57879289a5a8966615be8973aecc7fcc116faf4..3d5b328cf5cce6e3b7c3d58fa382f60bfaf04662 100644
--- a/DB-Mariadb.md
+++ b/DB-Mariadb.md
@@ -11,28 +11,28 @@
 
 ## MariaDB in Ubuntu
 
-| Ubuntu   | Shipped MariaDB   |
-|---------:|------------------:|
-| 16.04    | 10.0              |
-| 18.04    | 10.1              |
-| 20.04    | 10.3              |
+| Ubuntu   | Shipped MariaDB   | Distro EOL   |  
+|---------:|------------------:|-------------:|  
+| 16.04    | 10.0              | 2021-04      |  
+| 18.04    | 10.1              | 2023-04      |  
+| 20.04    | 10.3              | 2025-04      |  
 
 (See also [Ubuntu EOL](OS-Ubuntu.md))
 
 ## MariaDB in Debian
 
-| Debian                   | Shipped MariaDB   |
-|-------------------------:|------------------:|
-| 9 *Stretch*  (oldstable) | 10.1              |
-| 10 *Buster*  (stable)    | 10.3              |
+| Debian                   | Shipped MariaDB   | Distro EOL               |
+|-------------------------:|------------------:|-------------------------:|
+| 9 *Stretch*  (oldstable) | 10.1              | ~2022                    |
+| 10 *Buster*  (stable)    | 10.3              | unknown yet (by 2020-06) |
 
 (See also [Debian EOL](OS-Debian.md))
 
 ## MariaDB in CentOS
 
-| CentOS                   | Shipped MariaDB   |
-|-------------------------:|------------------:|
-| 7                        | 5.5               |
-| 8                        | 10.3              |
+| CentOS                   | Shipped MariaDB   | Distro EOL  |
+|-------------------------:|------------------:|------------:|
+| 7                        | 5.5               | 2024-06     | 
+| 8                        | 10.3              | 2029-05     | 
 
 (See also [CentOS EOL](OS-Centos.md))
diff --git a/DB-Postgresql.md b/DB-Postgresql.md
index 3ad3e655260ca63a64b9919292f996dd66fdc8bf..777f929c592d0947ad4c34649fecc110b31f8922 100644
--- a/DB-Postgresql.md
+++ b/DB-Postgresql.md
@@ -12,20 +12,20 @@
 
 ## Postgresql in Ubuntu
 
-| Ubuntu   | Shipped Postgresql |
-|---------:|-------------------:|
-| 16.04    | 9.5                |
-| 18.04    | 10                 |
-| 20.04    | 12                 |
+| Ubuntu   | Shipped Postgresql | Distro EOL   |
+|---------:|-------------------:|-------------:|
+| 16.04    | 9.5                | 2021-04      |
+| 18.04    | 10                 | 2023-04      |
+| 20.04    | 12                 | 2025-04      |
 
 (See also [Ubuntu EOL](OS-Ubuntu.md))
 
 ## Postgresql in Debian
 
-| Debian                   | Shipped Postgresql |
-|-------------------------:|-------------------:|
-| 9 *Stretch*  (oldstable) | 9.6                |
-| 10 *Buster*  (stable)    | 11                 |
+| Debian                   | Shipped Postgresql | Distro EOL               | 
+|-------------------------:|-------------------:|-------------------------:| 
+| 9 *Stretch*  (oldstable) | 9.6                | ~2022                    | 
+| 10 *Buster*  (stable)    | 11                 | unknown yet (by 2020-06) | 
 
 (See also [Debian EOL](OS-Debian.md))
 
diff --git a/Java.md b/Java.md
index 79da1f6e4e412203d1ac76280a159399d745a693..50b33e1e49bb43c8aa99d9c90de3ae770ba7d350 100644
--- a/Java.md
+++ b/Java.md
@@ -10,19 +10,19 @@
 
 ## OpenJDK in Ubuntu
 
-| Ubuntu   | Shipped OpenJDK |
-|---------:|----------------:|
-| 16.04    | 8               |
-| 18.04    | 11              |
-| 20.04    | 11              |
+| Ubuntu   | Shipped OpenJDK | Distro EOL   |
+|---------:|----------------:|-------------:|
+| 16.04    | 8               | 2021-04      |
+| 18.04    | 11              | 2023-04      |
+| 20.04    | 11              | 2025-04      |
 
 (See also [Ubuntu EOL](OS-Ubuntu.md))
 
 ## OpenJDK in Debian
 
-| Debian                   | Shipped OpenJDK |
-|-------------------------:|----------------:|
-| 9 *Stretch*  (oldstable) | 8               |
-| 10 *Buster*  (stable)    | 11              |
+| Debian                   | Shipped OpenJDK | Distro EOL               | 
+|-------------------------:|----------------:|-------------------------:| 
+| 9 *Stretch*  (oldstable) | 8               | ~2022                    | 
+| 10 *Buster*  (stable)    | 11              | unknown yet (by 2020-06) | 
 
 (See also [Debian EOL](OS-Debian.md))