diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 857ea049..cac831bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,8 +62,8 @@ Composer Tests:
       - RUNNER:
           - aws/fedora-35-x86_64
           - aws/fedora-35-aarch64
-          - aws/rhel-8.5-ga-x86_64
-          - aws/rhel-8.5-ga-aarch64
+          - aws/rhel-8.6-ga-x86_64
+          - aws/rhel-8.6-ga-aarch64
           #- aws/rhel-8.6-nightly-x86_64
           #- aws/rhel-8.6-nightly-aarch64
           # See https://github.com/osbuild/osbuild-composer/issues/1819 and related issues
@@ -81,7 +81,7 @@ OSTree Images:
     matrix:
       - RUNNER:
           - aws/fedora-35-x86_64
-          - aws/rhel-8.5-ga-x86_64
+          - aws/rhel-8.6-ga-x86_64
           #- aws/rhel-8.6-nightly-x86_64
           #- aws/rhel-9.0-nightly-x86_64
         INTERNAL_NETWORK: "true"