diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index eeba4d4..f38b272 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Ruby
+      - name: Setup Ruby 2.4
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.4
@@ -27,75 +27,20 @@ jobs:
           gem install bundler
           bundle install --jobs 4 --retry 3
           bundle exec rake
-  test-ruby-2-5-x:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.5
-          bundler-cache: true
-      - name: Build and run tests
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
-  test-ruby-2-6-x:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-          bundler-cache: true
-      - name: Build and run tests
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
-  test-ruby-2-7-x:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-      - name: Build and run tests
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
-  test-ruby-3-0-x:
-    runs-on: ubuntu-latest
+  test-ruby:
+    runs-on: ${{ matrix.os }}-latest
 
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0
-          bundler-cache: true
-      - name: Build and run tests
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
-  test-ruby-3-1-x:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu]
+        ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1]
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Ruby
+      - name: Setup Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
       - name: Build and run tests
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a30b33d..40036ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## main [(unreleased)](https://github.com/fastruby/skunk/compare/v0.5.2...HEAD)
 
 * <INSERT YOUR FEATURE OR BUGFIX HERE>
+* [FEATURE: Improve main workflow](https://github.com/fastruby/skunk/pull/99)
 * [BUGFIX: Fix analized module test](https://github.com/fastruby/skunk/pull/98)
 
 ## v0.5.2 / 2022-04-27 [(commits)](https://github.com/fastruby/skunk/compare/v0.5.1...v0.5.2)