diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index baeb64e..5d9405f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -134,7 +134,7 @@ jobs:
         run: env
 
       - name: Download package
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: dist-packages
           path: dist
@@ -298,7 +298,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Download distribution files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: dist-packages
           path: dist
@@ -344,7 +344,7 @@ jobs:
       id-token: write
     steps:
       - name: Download distribution files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: dist-packages
           path: dist
diff --git a/src/frequenz/client/marketmetering/_client.py b/src/frequenz/client/marketmetering/_client.py
index 1817774..e269fa0 100644
--- a/src/frequenz/client/marketmetering/_client.py
+++ b/src/frequenz/client/marketmetering/_client.py
@@ -201,7 +201,7 @@ async def stream_samples(
         """
         # Build the request
         request = pb.ReceiveMarketLocationSamplesStreamRequest(
-            market_location_list=[ml.to_protobuf() for ml in market_locations],
+            market_location_refs=[ml.to_protobuf() for ml in market_locations],
             directions=[d.value for d in directions],
             metric_types=[mt.value for mt in metric_types],
         )
@@ -314,7 +314,7 @@ def _get_stream(
         if broadcaster is None:
             # Build the request
             request = pb.ReceiveMarketLocationSamplesStreamRequest(
-                market_location_list=[ml.to_protobuf() for ml in market_locations],
+                market_location_refs=[ml.to_protobuf() for ml in market_locations],
                 directions=[d.value for d in directions],
                 metric_types=[mt.value for mt in metric_types],
             )
diff --git a/src/frequenz/client/marketmetering/types.py b/src/frequenz/client/marketmetering/types.py
index b12745d..a7ab156 100644
--- a/src/frequenz/client/marketmetering/types.py
+++ b/src/frequenz/client/marketmetering/types.py
@@ -40,22 +40,22 @@ class MarketArea(Enum):
 class MarketLocationIdType(Enum):
     """Type of external market identifier."""
 
-    UNSPECIFIED = pb.OFFICIAL_MARKET_LOCATION_ID_TYPE_UNSPECIFIED
+    UNSPECIFIED = pb.MARKET_LOCATION_ID_TYPE_UNSPECIFIED
     """Unspecified identifier type."""
 
-    MALO_ID = pb.OFFICIAL_MARKET_LOCATION_ID_TYPE_MALO_ID
+    MALO_ID = pb.MARKET_LOCATION_ID_TYPE_MALO_ID
     """Germany – Marktlokations-ID (MaLo-ID)."""
 
-    MPAN = pb.OFFICIAL_MARKET_LOCATION_ID_TYPE_MPAN
+    MPAN = pb.MARKET_LOCATION_ID_TYPE_MPAN
     """United Kingdom – Meter Point Administration Number."""
 
-    ESI_ID = pb.OFFICIAL_MARKET_LOCATION_ID_TYPE_ESI_ID
+    ESI_ID = pb.MARKET_LOCATION_ID_TYPE_ESI_ID
     """United States – Electric Service Identifier (ESI ID)."""
 
-    NMI = pb.OFFICIAL_MARKET_LOCATION_ID_TYPE_NMI
+    NMI = pb.MARKET_LOCATION_ID_TYPE_NMI
     """Australia – National Metering Identifier."""
 
-    OTHER = pb.OFFICIAL_MARKET_LOCATION_ID_TYPE_OTHER
+    OTHER = pb.MARKET_LOCATION_ID_TYPE_OTHER
     """Generic meter identifier for markets not modeled explicitly."""