diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b97e539fb..6526ed299 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,12 +6,12 @@ jobs:
   jruby-gem-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: jruby-9.1.17
+          ruby-version: jruby-9.4.1
           bundler-cache: true
       - uses: actions/setup-java@v2
         with:
@@ -30,12 +30,12 @@ jobs:
   rubygems-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.3
+          ruby-version: 3.2.1
           bundler-cache: true
       - name: Run gem release
         run: |
@@ -47,20 +47,15 @@ jobs:
     needs: [jruby-gem-release, rubygems-release]
     strategy:
       matrix:
-        ruby-version: [2.3, jruby-9.1.17]
+        ruby-version: [3.2.1, jruby-9.4.1]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
-      - uses: actions/setup-java@v2
-        if: ${{ matrix.ruby-version == 'jruby-9.1.17' }}
-        with:
-          java-version: '8'
-          distribution: 'adopt'
       - run: |
           gem install gooddata
           ruby -e "require 'gooddata';GoodData.version"
diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml
index 5b43a859f..306cdea8f 100644
--- a/.github/workflows/pre-merge.yml
+++ b/.github/workflows/pre-merge.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7.6, 3.2.1, jruby-9.1.17, jruby-9.4.1]
+        ruby-version: [2.5, 2.6, 2.7.6, 3.2.1, jruby-9.2.21, jruby-9.3.14, jruby-9.4.1]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -19,19 +19,13 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
       - run: bundle exec rake test:unit
-        if: ${{ matrix.ruby-version != 'jruby-9.1.17' }}
       - run: bundle exec rake test:unit
-        if: ${{ matrix.ruby-version == 'jruby-9.1.17' }}
         continue-on-error: true
   unit-tests-OSX:
     runs-on: macos-latest
     strategy:
       matrix:
         include:
-          - ruby-version: 2.3
-            xcode-version: 7.3
-          - ruby-version: 2.4.3
-            xcode-version: 9.4
           - ruby-version: 2.5
             xcode-version: 9
           - ruby-version: 2.6
@@ -40,7 +34,7 @@ jobs:
             xcode-version: 9
           - ruby-version: 3.2.1
             xcode-version: 9
-          - ruby-version: jruby-9.1.17
+          - ruby-version: jruby-9.2.9
             xcode-version: latest
           - ruby-version: jruby-9.4.1
             xcode-version: latest