diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index f54860b296d6afae9fa425d3ac881087418fbca3..27ad6a9c9bb7a440b78d5dcc800d77457354c589 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -154,6 +154,7 @@
     "sns.set_context(\"paper\", font_scale=1.4)\n",
     "sns.set_style(\"ticks\")\n",
     "\n",
+    "import cal_tools.restful_config as rest_cfg\n",
     "from calibration_client import CalibrationClient\n",
     "from cal_tools import agipdalgs as calgs\n",
     "from cal_tools.agipdlib import (\n",
@@ -559,26 +560,6 @@
     "module_index_to_karabo_da = {mod: da for (mod, da) in zip(modules, karabo_da)}"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Connect to CalCat.\n",
-    "calcat_config = restful_config['calcat']\n",
-    "client = CalibrationClient(\n",
-    "    base_api_url=calcat_config['base-api-url'],\n",
-    "    use_oauth2=calcat_config['use-oauth2'],\n",
-    "    client_id=calcat_config['user-id'],\n",
-    "    client_secret=calcat_config['user-secret'],\n",
-    "    user_email=calcat_config['user-email'],\n",
-    "    token_url=calcat_config['token-url'],\n",
-    "    refresh_url=calcat_config['refresh-url'],\n",
-    "    auth_url=calcat_config['auth-url'],\n",
-    "    scope='')"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -616,7 +597,7 @@
     "            integration_time=integration_time,\n",
     "            gain_mode=gain_mode,\n",
     "            module_idx=mod,\n",
-    "            client=client,\n",
+    "            client=rest_cfg.calibration_client(),\n",
     "        )\n",
     "        print(f\"Queried CalCat for {k_da}\")\n",
     "    return mod, when, k_da\n",
diff --git a/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb b/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
index ee782ac7ff145a843037cb27076c4474cad455e8..91f180d8477edba7fa0dae09d945c8e36ffda948 100644
--- a/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
+++ b/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
@@ -89,6 +89,7 @@
     "from dateutil import parser\n",
     "from extra_data import RunDirectory\n",
     "\n",
+    "import cal_tools.restful_config as rest_cfg\n",
     "from calibration_client import CalibrationClient\n",
     "from cal_tools.agipdlib import AgipdCtrl, SnowResolution\n",
     "from cal_tools.calcat_interface import AGIPD_CalibrationData, CalCatError\n",
@@ -270,26 +271,6 @@
     "acq_rate = all_acq_rates.pop()"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Connect to CalCat.\n",
-    "calcat_config = restful_config['calcat']\n",
-    "client = CalibrationClient(\n",
-    "    base_api_url=calcat_config['base-api-url'],\n",
-    "    use_oauth2=calcat_config['use-oauth2'],\n",
-    "    client_id=calcat_config['user-id'],\n",
-    "    client_secret=calcat_config['user-secret'],\n",
-    "    user_email=calcat_config['user-email'],\n",
-    "    token_url=calcat_config['token-url'],\n",
-    "    refresh_url=calcat_config['refresh-url'],\n",
-    "    auth_url=calcat_config['auth-url'],\n",
-    "    scope='')"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -309,7 +290,7 @@
     "    gain_mode=gain_mode,\n",
     "    gain_setting=gain_setting,\n",
     "    event_at=creation_time,\n",
-    "    client=client,\n",
+    "    client=rest_cfg.calibration_client(),\n",
     ")\n",
     "\n",
     "dark_constants = [\"Offset\", \"Noise\", \"BadPixelsDark\"] if gain_mode else [\"ThresholdsDark\", \"Offset\", \"Noise\", \"BadPixelsDark\"]\n",