diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d5bb5e3..1b1e1f9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -62,6 +62,11 @@ jobs:
             odoo_version: "17.0"
             odoo_org_repo: "odoo/odoo"
             image_name: py3.10-odoo17.0
+          - python_version: "3.10"
+            codename: jammy
+            odoo_version: "18.0"
+            odoo_org_repo: "odoo/odoo"
+            image_name: py3.10-odoo18.0
           # oca/ocb
           - python_version: "3.6"
             codename: focal
@@ -105,9 +110,14 @@ jobs:
             odoo_version: "17.0"
             odoo_org_repo: "oca/ocb"
             image_name: py3.10-ocb17.0
+          - python_version: "3.10"
+            codename: jammy
+            odoo_version: "18.0"
+            odoo_org_repo: "oca/ocb"
+            image_name: py3.10-ocb18.0
     services:
       postgres:
-        image: postgres:9.6
+        image: postgres:12
         env:
           POSTGRES_USER: odoo
           POSTGRES_PASSWORD: odoo