diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
index ccb1ca703..6f9bec4c0 100644
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@@ -79,7 +79,7 @@ pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz,openjdk-16-jre,rng-tools
+pz,openjdk-17-jre,rng-tools
 q2
 q3
 ql
@@ -88,7 +88,7 @@ ricochet
 ro
 rtcw
 rust,lib32z1
-rw,openjdk-16-jre
+rw,openjdk-17-jre
 samp
 sb
 sbots
diff --git a/lgsm/data/ubuntu-21.04.csv b/lgsm/data/ubuntu-21.04.csv
index b2a277306..678c06f28 100644
--- a/lgsm/data/ubuntu-21.04.csv
+++ b/lgsm/data/ubuntu-21.04.csv
@@ -79,7 +79,7 @@ pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz,openjdk-16-jre,rng-tools
+pz,openjdk-17-jre,rng-tools
 q2
 q3
 ql
@@ -88,7 +88,7 @@ ricochet
 ro
 rtcw
 rust,lib32z1
-rw,openjdk-16-jre
+rw,openjdk-17-jre
 samp
 sb
 sbots
diff --git a/lgsm/data/ubuntu-21.10.csv b/lgsm/data/ubuntu-21.10.csv
index 836dfe53f..f99d2f46d 100644
--- a/lgsm/data/ubuntu-21.10.csv
+++ b/lgsm/data/ubuntu-21.10.csv
@@ -77,7 +77,7 @@ pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz,openjdk-16-jre,rng-tools
+pz,openjdk-17-jre,rng-tools
 q2
 q3
 ql
@@ -86,7 +86,7 @@ ricochet
 ro
 rtcw
 rust,lib32z1
-rw,openjdk-16-jre
+rw,openjdk-17-jre
 samp
 sb
 sbots
diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
index 836dfe53f..18af1192f 100644
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@@ -77,7 +77,7 @@ pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz,openjdk-16-jre,rng-tools
+pz,openjdk-17-jre,rng-tools5
 q2
 q3
 ql
@@ -86,7 +86,7 @@ ricochet
 ro
 rtcw
 rust,lib32z1
-rw,openjdk-16-jre
+rw,openjdk-17-jre
 samp
 sb
 sbots