diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index c036bdade7..23b3d3c3b9 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ 'jruby-9.2.9.0', 'ruby-head', '2.6', '2.5', '2.4' ]
+        ruby: [ 'jruby-9.2', 'head', '3.0', '2.7', '2.6', '2.5', '2.4' ]
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index bdd891d449..e46f34ca92 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ 'head', '3.0', '2.7', '2.6', '2.5', '2.4' ]
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Set up Bundler