diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc42f1b..3e930d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,12 +26,10 @@ RPM:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-36-x86_64
-          - aws/fedora-36-aarch64
-          - aws/fedora-37-x86_64
-          - aws/fedora-37-aarch64
-          - aws/rhel-8.6-ga-x86_64
-          - aws/rhel-8.6-ga-aarch64
+          - aws/fedora-40-aarch64
+          - aws/fedora-40-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
 
 Testing:
   stage: test
@@ -46,10 +44,9 @@ Testing:
     matrix:
       # https://quay.io/repository/osbuild/postgres available only for x86_64
       - RUNNER:
-          - aws/fedora-36-x86_64
-          - aws/fedora-37-x86_64
+          - aws/fedora-40-x86_64
       - RUNNER:
-          - aws/rhel-8.6-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
         INTERNAL_NETWORK: ["true"]
 
 finish: