diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dded58d..4418f7b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,18 @@ jobs:
         ports:
           - 1518:1521
         env:
-          ORACLE_PASSWORD: my_pass
+          ORACLE_PASSWORD: my_pass_18
+        options: >-
+          --health-cmd healthcheck.sh
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+      oracle-21:
+        image: gvenzl/oracle-xe:21-slim-faststart
+        ports:
+          - 1521:1521
+        env:
+          ORACLE_PASSWORD: my_pass_21
         options: >-
           --health-cmd healthcheck.sh
           --health-interval 10s
@@ -44,7 +55,7 @@ jobs:
         ports:
           - 1523:1521
         env:
-          ORACLE_PASSWORD: my_pass
+          ORACLE_PASSWORD: my_pass_23
         options: >-
           --health-cmd healthcheck.sh
           --health-interval 10s
@@ -97,14 +108,21 @@ jobs:
         run: php php-src/run-tests.php --show-diff --show-slow 1000 --set-timeout 120 tests
         env:
           PHP_OCI8_TEST_USER: system
-          PHP_OCI8_TEST_PASS: my_pass
-          PHP_OCI8_TEST_DB: 0.0.0.0:1518/FREEPDB1
+          PHP_OCI8_TEST_PASS: my_pass_18
+          PHP_OCI8_TEST_DB: 0.0.0.0:1518/XE
+      - name: Run tests /w Oracle 21
+        if: success() || failure()
+        run: php php-src/run-tests.php --show-diff --show-slow 1000 --set-timeout 120 tests
+        env:
+          PHP_OCI8_TEST_USER: system
+          PHP_OCI8_TEST_PASS: my_pass_21
+          PHP_OCI8_TEST_DB: 0.0.0.0:1521/XE
       - name: Run tests /w Oracle 23
         if: success() || failure()
         run: php php-src/run-tests.php --show-diff --show-slow 1000 --set-timeout 120 tests
         env:
           PHP_OCI8_TEST_USER: system
-          PHP_OCI8_TEST_PASS: my_pass
+          PHP_OCI8_TEST_PASS: my_pass_23
           PHP_OCI8_TEST_DB: 0.0.0.0:1523/FREEPDB1
 
   windows-matrix: