diff --git a/content/graphics-switch-pop.md b/content/graphics-switch-pop.md
index a0ce1f97b1..abf69d6f47 100644
--- a/content/graphics-switch-pop.md
+++ b/content/graphics-switch-pop.md
@@ -5,13 +5,9 @@ description: >
 keywords:
   - System76
   - Pop
-  - 18.04
-  - 19.10
   - 20.04
-  - 20.10
-  - 21.04
-  - 21.10
   - 22.04
+  - 24.04
   - NVIDIA
   - Hybrid
   - Integrated
@@ -28,12 +24,12 @@ tableOfContents: true
 Many modern laptops with NVIDIA graphics cards have switchable graphics, which allows users to switch their primary GPU between the CPU's integrated graphics processor and the dedicated NVIDIA graphics card.
 The following System76 laptops have these switchable graphics capabilities:
 
-- Adder WS (addw1, addw2, addw3)
+- Adder WS (addw1 and newer)
 - Bonobo WS (bonw15)
 - Galago Pro (galp5 - NVIDIA models only)
-- Gazelle (gaze14, gaze15, gaze16, gaze17, gaze18)
+- Gazelle (gaze14 and newer)
 - Kudu (kudu6)
-- Oryx Pro (oryp4, oryp4-b, oryp5, oryp6, oryp7, oryp8, oryp9, oryp10, oryp11)
+- Oryx Pro (oryp4 and newer)
 - Serval WS (serw13)
 
 Pop!\_OS includes utilities for switching between these modes, which you can learn more about below.
diff --git a/content/graphics-switch-ubuntu.md b/content/graphics-switch-ubuntu.md
index 37a18828b2..37c61d34cf 100644
--- a/content/graphics-switch-ubuntu.md
+++ b/content/graphics-switch-ubuntu.md
@@ -5,13 +5,9 @@ description: >
 keywords:
   - System76
   - Ubuntu
-  - 18.04
-  - 19.10
   - 20.04
-  - 20.10
-  - 21.04
-  - 21.10
   - 22.04
+  - 24.04
   - NVIDIA
   - Hybrid
   - Integrated
@@ -27,12 +23,12 @@ tableOfContents: true
 
 Many modern laptops with NVIDIA graphics cards have switchable graphics, which allows users to switch their primary GPU between the CPU's integrated graphics processor and the dedicated NVIDIA graphics card. The following System76 laptops have these switchable graphics capabilities:
 
-- Adder WS (addw1, addw2, addw3)
+- Adder WS (addw1 and newer)
 - Bonobo WS (bonw15)
 - Galago Pro (galp5 - NVIDIA models only)
-- Gazelle (gaze14, gaze15, gaze16, gaze17, gaze18)
+- Gazelle (gaze14 and newer)
 - Kudu (kudu6)
-- Oryx Pro (oryp4, oryp4-b, oryp5, oryp6, oryp7, oryp8, oryp9, oryp10, oryp11)
+- Oryx Pro (oryp4 and newer)
 - Serval WS (serw13)
 
 ## Graphics modes