diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61eb022b2b..b31dd3ce00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,9 +11,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Stay on the oldest Ubuntu version that's still supported by Github Actions
-        # to avoid glibc incompatibilities as far as possible.
-        os: [macos-latest, ubuntu-20.04, windows-latest, macos-arm]
+        # Use ubuntu-18.04 for glibc compatibility with older Linux distributions.
+        # Note that this will only be supported by Github until April 1st, 2023,
+        # see https://github.com/actions/runner-images/issues/6002.
+        os: [macos-latest, ubuntu-18.04, windows-latest, macos-arm]
         ocaml_compiler: [4.14.0]
 
     runs-on: ${{matrix.os}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 637b2f2a8c..a25e4b254d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 #### :bug: Bug Fix
 
 - Prevent inlining of async functions in additional cases https://github.com/rescript-lang/rescript-compiler/issues/5860
+- Revert to ubuntu-18.04 in CI to support Linux versions with older glibc https://github.com/rescript-lang/rescript-compiler/issues/5868
 
 # 10.1.0