diff --git a/.github/workflows/apt-arm-packages.yaml b/.github/workflows/apt-arm-packages.yaml
index c13cb2a543b..c0f9b953b62 100644
--- a/.github/workflows/apt-arm-packages.yaml
+++ b/.github/workflows/apt-arm-packages.yaml
@@ -16,9 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Debian images:  10 (buster), 11 (bullseye)
-        # Ubuntu images:  20.04 LTS (focal), 22.04 (jammy)
-        image: [ "debian:10-slim","debian:11-slim","ubuntu:focal", "ubuntu:jammy"]
+        image: [ "debian:10-slim","debian:11-slim","ubuntu:20.04", "ubuntu:22.04"]
         pg: [ 13, 14, 15 ]
 
     steps:
diff --git a/.github/workflows/apt-packages.yaml b/.github/workflows/apt-packages.yaml
index 75daddc161b..20cac3c6831 100644
--- a/.github/workflows/apt-packages.yaml
+++ b/.github/workflows/apt-packages.yaml
@@ -20,9 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Debian images:  10 (buster), 11 (bullseye), 12 (bookworm)
-        # Ubuntu images:  18.04 LTS (bionic), 20.04 LTS (focal), 21.10 (impish), 22.04 (jammy), 22.10 (kinetic)
-        image: [ "debian:10-slim", "debian:11-slim", "debian:12-slim", "ubuntu:focal", "ubuntu:jammy", "ubuntu:kinetic"]
+        image: [ "debian:10-slim", "debian:11-slim", "debian:12-slim", "ubuntu:20.04", "ubuntu:22.04" ]
         pg: [ 13, 14, 15 ]
         license: [ "TSL", "Apache"]
         include: