diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 5ed7ad44496..38ceffc3309 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -532,7 +532,7 @@ jobs:
 
     services:
       ibm_db2:
-        image: "ibmcom/db2:11.5.0.0"
+        image: "icr.io/db2_community/db2:11.5.8.0"
         env:
           DB2INST1_PASSWORD: "Doctrine2018"
           LICENSE: "accept"
@@ -548,22 +548,29 @@ jobs:
         run: "docker logs -f ${{ job.services.ibm_db2.id }} | sed '/(*) Setup has completed./ q'"
 
       - name: "Create temporary tablespace"
-        run: "docker exec ${{ job.services.ibm_db2.id }} su - db2inst1 -c 'db2 CONNECT TO doctrine && db2 CREATE USER TEMPORARY TABLESPACE doctrine_tbsp PAGESIZE 4 K'"
+        run: "docker exec ${{ job.services.ibm_db2.id }} su - db2inst1 -c 'db2 -t CONNECT TO doctrine; db2 -t CREATE USER TEMPORARY TABLESPACE doctrine_tbsp PAGESIZE 4 K;'"
 
       - name: "Checkout"
         uses: "actions/checkout@v3"
         with:
           fetch-depth: 2
 
+      - name: "Install IBM DB2 CLI driver"
+        working-directory: /tmp
+        run: |
+          wget https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/linuxx64_odbc_cli.tar.gz
+          tar xf linuxx64_odbc_cli.tar.gz
+          rm linuxx64_odbc_cli.tar.gz
+
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
+          extensions: "ibm_db2"
           coverage: "pcov"
-          ini-values: "zend.assertions=1, extension=ibm_db2.so, ibm_db2.instance_name=db2inst1"
-
-      - name: "Install ibm_db2 extension"
-        run: "ci/github/ext/install-ibm_db2.sh ${{ matrix.php-version }}"
+          ini-values: "zend.assertions=1, ibm_db2.instance_name=db2inst1"
+        env:
+          IBM_DB2_CONFIGURE_OPTS: "--with-IBM_DB2=/tmp/clidriver"
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v2"
diff --git a/ci/github/ext/install-ibm_db2.sh b/ci/github/ext/install-ibm_db2.sh
deleted file mode 100755
index 00336dd59a7..00000000000
--- a/ci/github/ext/install-ibm_db2.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-echo "Installing extension"
-(
-    cd /tmp
-
-    wget https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/linuxx64_odbc_cli.tar.gz
-
-    tar xf linuxx64_odbc_cli.tar.gz
-
-    pecl download ibm_db2
-    tar xf ibm_db2-*
-    rm ibm_db2-*.tgz
-    cd ibm_db2-*
-    phpize
-    ./configure --with-IBM_DB2=/tmp/clidriver
-    make -j "$(nproc)"
-    sudo make install
-)
diff --git a/docs/en/reference/introduction.rst b/docs/en/reference/introduction.rst
index 9f66a2b44d5..ea104dd1252 100644
--- a/docs/en/reference/introduction.rst
+++ b/docs/en/reference/introduction.rst
@@ -13,10 +13,12 @@ the oci8 extension under the hood.
 
 The following database vendors are currently supported:
 
-- MySQL
+- DB2 (IBM)
+- MariaDB
+- MySQL (Oracle)
 - Oracle
-- Microsoft SQL Server
 - PostgreSQL
+- SQL Server (Microsoft)
 - SQLite
 
 The Doctrine DBAL can be used independently of the