diff --git a/esm-collections/cloud-access/dkrz_catalog.yaml b/esm-collections/cloud-access/dkrz_catalog.yaml
index b4fb1d5fefc449e16b90f6b4a043925dc5675188..874e1183e341a899d41c4b101bfa16a84cf1e7a7 100755
--- a/esm-collections/cloud-access/dkrz_catalog.yaml
+++ b/esm-collections/cloud-access/dkrz_catalog.yaml
@@ -4,16 +4,17 @@ metadata:
     additional_cmip6_disk_columns:
       default:
       - units
-      - path
       - opendap_url
+      - path
       - long_name
       type: list[str]
     additional_era5_disk_columns:
       default:
+      - step
       - path
-      - units
-      - long_name
       - short_name
+      - long_name
+      - units
       type: list[str]
     cataloonie_columns:
       default:
@@ -41,6 +42,7 @@ plugins:
 sources:
   dkrz_cmip5_archive:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_cmip5_archive.json'
       read_csv_kwargs:
         usecols:
         - project
@@ -58,13 +60,13 @@ sources:
         - uri
         - format
         - jblob_file
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_cmip5_archive.json"
     description: This is an ESM collection for CMIP5 data accessible on the DKRZ's
       cera archive
     driver:
     - intake.open_esm_datastore
   dkrz_cmip5_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_cmip5_disk.json'
       read_csv_kwargs:
         usecols:
         - project
@@ -81,13 +83,13 @@ sources:
         - temporal_subset
         - uri
         - format
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_cmip5_disk.json"
     description: This is an ESM collection for CMIP5 data accessible on the DKRZ's
       Lustre disk storage system in /work/kd0956/CMIP5/data/cmip5/
     driver:
     - intake.open_esm_datastore
   dkrz_cmip6_cloud:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_cmip6_cloud.json'
       read_csv_kwargs:
         usecols:
         - project
@@ -102,13 +104,13 @@ sources:
         - version
         - uri
         - format
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_cmip6_cloud.json"
     description: This is an ESM collection for CMIP6 data accessible on DKRZ's swift
       cloud store
     driver:
     - intake.open_esm_datastore
   dkrz_cmip6_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_cmip6_disk.json'
       read_csv_kwargs:
         usecols:
         - project
@@ -125,12 +127,12 @@ sources:
         - time_range
         - uri
         - format
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_cmip6_disk.json"
     description: This is a ESM-collection for CMIP6 data on DKRZ's disk storage system
     driver:
     - intake.open_esm_datastore
   dkrz_cordex_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_cordex_disk.json'
       read_csv_kwargs:
         usecols:
         - project
@@ -148,13 +150,13 @@ sources:
         - time_range
         - uri
         - format
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_cordex_disk.json"
     description: 'This is an ESM collection for CORDEX data accessible on the DKRZ''s
       disk storage system '
     driver:
     - intake.open_esm_datastore
   dkrz_dyamond-winter_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_dyamond-winter_disk.json'
       read_csv_kwargs:
         usecols: &id001
         - project
@@ -174,12 +176,17 @@ sources:
         - format
         - uri
         - variable_id
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_dyamond-winter_disk.json"
     description: Default catalog for ICON-ESM experiments by MPIMet
     driver:
     - intake.open_esm_datastore
+  dkrz_eerie:
+    args:
+      path: '{{CATALOG_DIR}}/dkrz_eerie.yaml'
+    description: EERIE Data at DKRZ
+    driver: yaml_file_cat
   dkrz_era5_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_era5_disk.json'
       read_csv_kwargs:
         usecols:
         - project
@@ -194,18 +201,18 @@ sources:
         - initialization_date
         - uri
         - format
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_era5_disk.json"
     description: This is an ESM collection for ERA5 data accessible on the DKRZ's
       disk storage system in /work/bk1099/data/
     driver:
     - intake.open_esm_datastore
   dkrz_monsoon_disk:
     args:
-      path: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_monsoon_disk.yaml"
+      path: '{{CATALOG_DIR}}/dkrz_monsoon_disk.yaml'
     description: Monsoon 2.0
     driver: yaml_file_cat
   dkrz_mpige_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_mpige_disk.json'
       read_csv_kwargs:
         usecols:
         - product_id
@@ -221,7 +228,6 @@ sources:
         - version
         - uri
         - format
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_mpige_disk.json"
     description: This is an ESM collection for the Max Planck Institute Grand Ensemble
       (Maher et al. 2019 https://doi.org/10/gf3kgt) cmorized by CMIP5-standards accessible
       on the DKRZ's Levante disk storage system in /work/mh1007/CMOR/MPI-GE
@@ -229,14 +235,15 @@ sources:
     - intake.open_esm_datastore
   dkrz_nextgems_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_nextgems_disk.json'
       read_csv_kwargs:
         usecols: *id001
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_nextgems_disk.json"
     description: Default catalog for ICON-ESM experiments by MPIMet
     driver:
     - intake.open_esm_datastore
   dkrz_palmod2_disk:
     args:
+      obj: '{{CATALOG_DIR}}/dkrz_palmod2_disk.json'
       read_csv_kwargs:
         usecols:
         - project
@@ -251,7 +258,6 @@ sources:
         - format
         - time_range
         - uri
-      obj: "https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access//dkrz_palmod2_disk.json"
     description: This is a ESM-collection for Palmod2 data on DKRZ's disk storage
       system
     driver: