diff --git a/notebooks/LPD/LPD_Correct_Fast.ipynb b/notebooks/LPD/LPD_Correct_Fast.ipynb
index 7ee0acd4e37c701efb04e4053c7d8a32999ea654..51ecd1c7c6ed36a409edbb5177cfa694ec839a10 100644
--- a/notebooks/LPD/LPD_Correct_Fast.ipynb
+++ b/notebooks/LPD/LPD_Correct_Fast.ipynb
@@ -290,18 +290,13 @@
     "        event_at=creation_time,\n",
     "        client=rest_cfg.calibration_client(),\n",
     "    )\n",
-    "    # Initialize const_data in case no constants were retrieved.\n",
-    "    const_data = {mod: {\"no-constants-retrieved\": None} for mod in karabo_da}\n",
+    "    constant_data = lpd_cal.ndarray_map([\"Offset\", \"BadPixelsDark\"])\n",
     "    try:\n",
-    "        const_data = lpd_cal.ndarray_map(\n",
-    "            [\n",
-    "                \"Offset\", \"BadPixelsDark\",\n",
-    "                \"BadPixelsFF\", \"GainAmpMap\",\n",
-    "                \"FFMap\", \"RelativeGain\",\n",
-    "            ]\n",
-    "        )\n",
-    "    except CalCatError as e:  # TODO: remove when API errors are improved.\n",
-    "        warning(f\"CaLCaTError: {e}\")\n",
+    "        illum_const_data = lpd_cal.ndarray_map(lpd_cal.illuminated_calibrations)\n",
+    "        for key, value in illum_const_data.items():\n",
+    "            const_data.setdefault(key, {}).update(value)\n",
+    "    except CalCatError as e:  # TODO: replace when API errors are improved.\n",
+    "        warning(f\"CalCatError: {e}\")\n",
     "total_time = perf_counter() - start\n",
     "print(f'Loading constants {total_time:.1f}s')"
    ]
diff --git a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
index 584be0a916b251c445dbe7f058947d6877c91220..27b78bc715629114466f4dd7e6e845c494cc3381 100644
--- a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
+++ b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
@@ -133,18 +133,17 @@
     "    event_at=creation_time,\n",
     "    client=rest_cfg.calibration_client(),\n",
     ")\n",
-    "constant_names = [\n",
-    "    \"Offset\", \"BadPixelsDark\",\n",
-    "    \"BadPixelsFF\", \"GainAmpMap\",\n",
-    "    \"FFMap\", \"RelativeGain\",\n",
-    "]\n",
+    "\n",
     "# Initialize const_data in case no constants were retrieved.\n",
     "lpd_cal_metadata = {mod: {\"no-constants-retrieved\": None} for mod in karabo_da}\n",
     "\n",
+    "constant_data = lpd_cal.metadata([\"Offset\", \"BadPixelsDark\"])\n",
     "try:\n",
-    "    lpd_cal_metadata = lpd_cal.metadata(constant_names)\n",
-    "except CalCatError as e:\n",
-    "    warning(f\"CaLCaTError: {e}\")\n",
+    "    illum_const_data = lpd_cal.metadata(lpd_cal.illuminated_calibrations)\n",
+    "    for key, value in illum_const_data.items():\n",
+    "        const_data.setdefault(key, {}).update(value)\n",
+    "except CalCatError as e:  # TODO: replace when API errors are improved.\n",
+    "    warning(f\"CalCatError: {e}\")\n",
     "\n",
     "# Validate the constants availability and raise/warn correspondingly. \n",
     "for mod, ccv_dict in lpd_cal_metadata.items():\n",