diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a930131e..ca16e1a3f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
             matrix:
                 browser: [Chrome, Firefox]
                 python-version: ['3.10']
-                aiida-core-version: [2.1.2, 2.4.3]          # test on the latest and the oldest supported version
+                aiida-core-version: [2.1.2, 2.5.0]          # test on the latest and the oldest supported version
             fail-fast: false
 
         runs-on: ubuntu-latest
@@ -108,7 +108,7 @@ jobs:
         strategy:
             matrix:
                 python-version: ['3.9', '3.10']
-                aiida-core-version: [2.2.2, 2.4.3]          # test on the latest and the oldest supported version
+                aiida-core-version: [2.2.2, 2.5.0]          # test on the latest and the oldest supported version
             fail-fast: false
 
         runs-on: ubuntu-latest
diff --git a/aiidalab_widgets_base/databases.py b/aiidalab_widgets_base/databases.py
index 5ca7b41e3..c3b57a5b4 100644
--- a/aiidalab_widgets_base/databases.py
+++ b/aiidalab_widgets_base/databases.py
@@ -157,7 +157,7 @@ def __init__(
         **kwargs,
     ) -> None:
         try:
-            from optimade_client import default_parameters, query_filter, query_provider
+            from ipyoptimade import default_parameters, query_filter, query_provider
         except ImportError:
             super().__init__(
                 [
diff --git a/pyproject.toml b/pyproject.toml
index 3cd85f0ad..a8dcabc80 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ filterwarnings = [
     'ignore:Creating AiiDA configuration:UserWarning:aiida',
     'ignore:crystal system:UserWarning:ase.io.cif',
     'ignore::DeprecationWarning:ase.atoms',
-    # TODO: This comes from a transitive dependency of optimade_client
+    # TODO: This comes from a transitive dependency of ipyoptimade
     # Remove this when this issue is addressed:
     # https://github.com/CasperWA/ipywidgets-extended/issues/85
     'ignore::DeprecationWarning:ipywidgets_extended',
diff --git a/setup.cfg b/setup.cfg
index fb72f8d5e..ce7b0736b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,7 +56,7 @@ dev =
     selenium~=4.7.0
     webdriver-manager~=3.8
 optimade =
-    optimade-client==2022.9.19
+    ipyoptimade~=0.1
 smiles =
     rdkit>=2021.09.2
     scikit-learn~=1.0.0