diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 396b5aab..8f1affff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-11
           - macos-12
+          - macos-arm-oss
           - ubuntu-latest
           - windows-latest
         ruby:
@@ -29,6 +29,7 @@ jobs:
           - { os: windows-latest , ruby: mingw }
           - { os: windows-latest , ruby: mswin }
         exclude:
+          - { os: macos-arm-oss  , ruby: '2.5' }
           - { os: windows-latest , ruby: '3.0' }
           - { os: windows-latest , ruby: debug }
 
@@ -80,7 +81,7 @@ jobs:
       fail-fast: false
       matrix:
         service:
-          - fedora-33
+          - fedora-latest
 
     steps:
       - uses: actions/checkout@v4
diff --git a/docker-compose.yml b/docker-compose.yml
index 819a3e7a..96946eb6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,10 @@
 version: "3.5"
 
 services:
-  fedora-33:
+  fedora-latest:
     build:
       context: .
-      dockerfile: dockerfiles/fedora-33.dockerfile
+      dockerfile: dockerfiles/fedora-latest.dockerfile
     volumes:
       - .:/source:delegated
     command:
diff --git a/dockerfiles/fedora-33.dockerfile b/dockerfiles/fedora-latest.dockerfile
similarity index 94%
rename from dockerfiles/fedora-33.dockerfile
rename to dockerfiles/fedora-latest.dockerfile
index 555a2b1e..49163ad0 100644
--- a/dockerfiles/fedora-33.dockerfile
+++ b/dockerfiles/fedora-latest.dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:latest
 
 RUN \
   dnf install -y \