diff --git a/advanced/advanced-01-open-telemetry/README.md b/advanced/advanced-01-open-telemetry/README.md
index bdd374c4..79af79c7 100644
--- a/advanced/advanced-01-open-telemetry/README.md
+++ b/advanced/advanced-01-open-telemetry/README.md
@@ -99,9 +99,9 @@ The output will be something like:
         "@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
         "@type": "dcat:DataService",
         "dcat:endpointDescription": "dspace:connector",
-        "dcat:endpointUrl": "http://provider:19194/protocol",
+        "dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
         "dct:terms": "dspace:connector",
-        "dct:endpointUrl": "http://provider:19194/protocol"
+        "dct:endpointUrl": "http://provider:19194/protocol/2025-1"
       }
     },
     {
@@ -113,9 +113,9 @@ The output will be something like:
         "@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
         "@type": "dcat:DataService",
         "dcat:endpointDescription": "dspace:connector",
-        "dcat:endpointUrl": "http://provider:19194/protocol",
+        "dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
         "dct:terms": "dspace:connector",
-        "dct:endpointUrl": "http://provider:19194/protocol"
+        "dct:endpointUrl": "http://provider:19194/protocol/2025-1"
       }
     }
   ],
@@ -128,7 +128,7 @@ The output will be something like:
     "dcat": "http://www.w3.org/ns/dcat#",
     "dct": "http://purl.org/dc/terms/",
     "odrl": "http://www.w3.org/ns/odrl/2/",
-    "dspace": "https://w3id.org/dspace/v0.8/"
+    "dspace": "https://w3id.org/dspace/2025/1/"
   }
 }
 
diff --git a/advanced/advanced-01-open-telemetry/resources/get-dataset.json b/advanced/advanced-01-open-telemetry/resources/get-dataset.json
index 217aa29a..59258a54 100644
--- a/advanced/advanced-01-open-telemetry/resources/get-dataset.json
+++ b/advanced/advanced-01-open-telemetry/resources/get-dataset.json
@@ -2,6 +2,7 @@
   "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
   "@type": "DatasetRequest",
   "@id": "assetId",
-  "counterPartyAddress": "http://provider:19194/protocol",
-  "protocol": "dataspace-protocol-http"
-}
\ No newline at end of file
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://provider:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1"
+}
diff --git a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json
index 44b73204..f47f3755 100644
--- a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json
+++ b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json
@@ -3,8 +3,9 @@
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
   "@type": "ContractRequest",
-  "counterPartyAddress": "http://provider:19194/protocol",
-  "protocol": "dataspace-protocol-http",
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://provider:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
     "@id": "{{contract-offer-id}}",
diff --git a/advanced/advanced-01-open-telemetry/resources/start-transfer.json b/advanced/advanced-01-open-telemetry/resources/start-transfer.json
index 354566ce..017852e7 100644
--- a/advanced/advanced-01-open-telemetry/resources/start-transfer.json
+++ b/advanced/advanced-01-open-telemetry/resources/start-transfer.json
@@ -4,8 +4,8 @@
   },
   "@type": "TransferRequestDto",
   "connectorId": "provider",
-  "counterPartyAddress": "http://provider:19194/protocol",
+  "counterPartyAddress": "http://provider:19194/protocol/2025-1",
   "contractId": "{{contract-agreement-id}}",
-  "protocol": "dataspace-protocol-http",
+  "protocol": "dataspace-protocol-http:2025-1",
   "transferType": "HttpData-PULL"
 }
diff --git a/federated-catalog/fc-01-embedded/README.md b/federated-catalog/fc-01-embedded/README.md
index 7e6d3e1e..190d2b98 100644
--- a/federated-catalog/fc-01-embedded/README.md
+++ b/federated-catalog/fc-01-embedded/README.md
@@ -115,9 +115,9 @@ Sample output:
       
     },
     "dspace:participantId": "provider",
-    "originator": "http://localhost:19194/protocol",
+    "originator": "http://localhost:19194/protocol/2025-1",
     "@context": {
     }
   }
 ]
-```
\ No newline at end of file
+```
diff --git a/federated-catalog/fc-02-standalone/README.md b/federated-catalog/fc-02-standalone/README.md
index 0e141bfc..5eeb33fe 100644
--- a/federated-catalog/fc-02-standalone/README.md
+++ b/federated-catalog/fc-02-standalone/README.md
@@ -98,10 +98,10 @@ Sample output:
       
     },
     "dspace:participantId": "provider",
-    "originator": "http://localhost:19194/protocol",
+    "originator": "http://localhost:19194/protocol/2025-1",
     "@context": {
       
     }
   }
 ]
-```
\ No newline at end of file
+```
diff --git a/federated-catalog/fc-03-static-node-directory/README.md b/federated-catalog/fc-03-static-node-directory/README.md
index ad02ad19..da8f2aa6 100644
--- a/federated-catalog/fc-03-static-node-directory/README.md
+++ b/federated-catalog/fc-03-static-node-directory/README.md
@@ -36,8 +36,8 @@ In this case, the file contains the properties of the `participant-connector` fr
 {
     "name": "https://w3id.org/edc/v0.0.1/ns/",
     "id": "provider",
-    "url": "http://localhost:19194/protocol",
-    "supportedProtocols": ["dataspace-protocol-http"]
+    "url": "http://localhost:19194/protocol/2025-1",
+    "supportedProtocols": ["dataspace-protocol-http:2025-1"]
 }
 ```
 However, this solution is intended for use only within the sample scope; in production, it must be managed in different way.
@@ -136,4 +136,4 @@ To get the combined set of catalogs, use the following request:
 curl -d @federated-catalog/fc-01-embedded/resources/empty-query.json \
   -H 'content-type: application/json' http://localhost:29195/api/catalog/v1alpha/catalog/query \
   -s | jq
-```
\ No newline at end of file
+```
diff --git a/policy/policy-01-policy-enforcement/README.md b/policy/policy-01-policy-enforcement/README.md
index 598db16e..1d0abcf2 100644
--- a/policy/policy-01-policy-enforcement/README.md
+++ b/policy/policy-01-policy-enforcement/README.md
@@ -272,7 +272,7 @@ We'll receive the following catalog in the response, where we can see the offer
     "@id": "fe9581ee-b4ec-473c-b0b7-96f30d957e87",
     "@type": "dcat:DataService",
     "dct:terms": "connector",
-    "dct:endpointUrl": "http://localhost:8282/protocol"
+    "dct:endpointUrl": "http://localhost:8282/protocol/2025-1"
   },
   "participantId": "provider",
   "@context": {
@@ -281,7 +281,7 @@ We'll receive the following catalog in the response, where we can see the offer
     "dcat": "https://www.w3.org/ns/dcat/",
     "dct": "https://purl.org/dc/terms/",
     "odrl": "http://www.w3.org/ns/odrl/2/",
-    "dspace": "https://w3id.org/dspace/v0.8/"
+    "dspace": "https://w3id.org/dspace/2025/1/"
   }
 }
 
diff --git a/policy/policy-01-policy-enforcement/resources/catalog-request.json b/policy/policy-01-policy-enforcement/resources/catalog-request.json
index 370b4f2f..28a0a7e7 100644
--- a/policy/policy-01-policy-enforcement/resources/catalog-request.json
+++ b/policy/policy-01-policy-enforcement/resources/catalog-request.json
@@ -2,6 +2,7 @@
   "@context": {
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
-  "counterPartyAddress": "http://localhost:19194/protocol",
-  "protocol": "dataspace-protocol-http"
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1"
 }
diff --git a/policy/policy-01-policy-enforcement/resources/contract-request.json b/policy/policy-01-policy-enforcement/resources/contract-request.json
index e254def0..1680f439 100644
--- a/policy/policy-01-policy-enforcement/resources/contract-request.json
+++ b/policy/policy-01-policy-enforcement/resources/contract-request.json
@@ -3,8 +3,9 @@
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
   "@type": "ContractRequest",
-  "counterPartyAddress": "http://localhost:19194/protocol",
-  "protocol": "dataspace-protocol-http",
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
     "@id": "1:test-document:13dce0f1-52ed-4554-a194-e83e92733ee5",
diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java
index c924696c..471a9cc0 100644
--- a/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java
+++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java
@@ -16,35 +16,35 @@
 
 import java.util.Objects;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath;
-import static org.eclipse.edc.samples.util.TransferUtil.POLL_INTERVAL;
-import static org.eclipse.edc.samples.util.TransferUtil.TIMEOUT;
-import static org.eclipse.edc.samples.util.TransferUtil.get;
-import static org.eclipse.edc.samples.util.TransferUtil.post;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath;
+import static org.eclipse.edc.samples.util.TransferUtil.POLL_INTERVAL;
+import static org.eclipse.edc.samples.util.TransferUtil.TIMEOUT;
+import static org.eclipse.edc.samples.util.TransferUtil.get;
+import static org.eclipse.edc.samples.util.TransferUtil.post;
 
 public class FileTransferCloudCommon {
 
-    private static final String CONSUMER_MANAGEMENT_URL = "http://localhost:29193/management";
-    private static final String V3_CATALOG_DATASET_REQUEST_PATH = "/v3/catalog/dataset/request";
-    private static final String FETCH_DATASET_FROM_CATALOG_FILE_PATH = "transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json";
-    private static final String CATALOG_DATASET_ID = "\"odrl:hasPolicy\".'@id'";
-    private static final String NEGOTIATE_CONTRACT_FILE_PATH = "transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json";
+    private static final String CONSUMER_MANAGEMENT_URL = "http://localhost:29193/management";
+    private static final String V3_CATALOG_DATASET_REQUEST_PATH = "/v3/catalog/dataset/request";
+    private static final String FETCH_DATASET_FROM_CATALOG_FILE_PATH = "transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json";
+    private static final String CATALOG_DATASET_ID = "\"hasPolicy\"[0].'@id'";
+    private static final String NEGOTIATE_CONTRACT_FILE_PATH = "transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json";
     private static final String V3_CONTRACT_NEGOTIATIONS_PATH = "/v3/contractnegotiations/";
     private static final String CONTRACT_NEGOTIATION_ID = "@id";
     private static final String CONTRACT_AGREEMENT_ID = "contractAgreementId";
     private static final String CONTRACT_OFFER_ID_KEY = "{{contract-offer-id}}";
 
-    public static String fetchDatasetFromCatalog(String fetchDatasetFromCatalogFilePath) {
-        var catalogDatasetId = post(
-                CONSUMER_MANAGEMENT_URL + V3_CATALOG_DATASET_REQUEST_PATH,
-                getFileContentFromRelativePath(fetchDatasetFromCatalogFilePath),
-                CATALOG_DATASET_ID
-        );
-        assertThat(catalogDatasetId).isNotEmpty();
-        return catalogDatasetId;
-    }
+    public static String fetchDatasetFromCatalog(String fetchDatasetFromCatalogFilePath) {
+        var catalogDatasetId = post(
+                CONSUMER_MANAGEMENT_URL + V3_CATALOG_DATASET_REQUEST_PATH,
+                getFileContentFromRelativePath(fetchDatasetFromCatalogFilePath),
+                CATALOG_DATASET_ID
+        );
+        assertThat(catalogDatasetId).isNotEmpty();
+        return catalogDatasetId;
+    }
 
     public static String negotiateContract(String negotiateContractFilePath, String catalogDatasetId) {
         var requestBody = getFileContentFromRelativePath(negotiateContractFilePath)
diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java
index 4fb3b8f7..4c56eb4f 100644
--- a/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java
+++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java
@@ -15,7 +15,6 @@
 
 package org.eclipse.edc.samples.common;
 
-
 import java.util.Objects;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,7 +35,7 @@ public class NegotiationCommon {
     private static final String V2_CONTRACT_DEFINITIONS_PATH = "/v3/contractdefinitions";
     private static final String V2_CATALOG_DATASET_REQUEST_PATH = "/v3/catalog/dataset/request";
     private static final String FETCH_DATASET_FROM_CATALOG_FILE_PATH = "transfer/transfer-01-negotiation/resources/get-dataset.json";
-    private static final String CATALOG_DATASET_ID = "\"odrl:hasPolicy\".'@id'";
+    private static final String CATALOG_DATASET_ID = "\"hasPolicy\"[0].'@id'";
     private static final String NEGOTIATE_CONTRACT_FILE_PATH = "transfer/transfer-01-negotiation/resources/negotiate-contract.json";
     private static final String V2_CONTRACT_NEGOTIATIONS_PATH = "/v3/contractnegotiations/";
     private static final String CONTRACT_NEGOTIATION_ID = "@id";
diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java
index d364abe2..7845f042 100644
--- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java
+++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java
@@ -26,7 +26,6 @@
  * Essentially a wrapper around the management API enabling to test interactions with other participants, eg. catalog, transfer...
  */
 public class StreamingParticipant extends Participant {
-
     protected StreamingParticipant() {
     }
 
@@ -80,7 +79,7 @@ public String fetchDatasetFromCatalog(String requestBody) {
                 .then()
                 .statusCode(200)
                 .contentType(JSON)
-                .extract().jsonPath().getString("'odrl:hasPolicy'.@id");
+                .extract().jsonPath().getString("hasPolicy[0].@id");
     }
 
     public String negotiateContract(String requestBody) {
diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java
index 5521cb35..4b37dcf4 100644
--- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java
+++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java
@@ -90,13 +90,13 @@ public class Transfer06KafkaBrokerTest {
             .name("provider")
             .id("provider")
             .controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:18181/management")))
-            .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol")))
+            .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol/2025-1")))
             .build();
     private static final StreamingParticipant CONSUMER = StreamingParticipant.Builder.newStreamingInstance()
             .name("consumer")
             .id("consumer")
             .controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:28181/management")))
-            .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol")))
+            .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol/2025-1")))
             .build();
     private static final String GROUP_ID = "group_id";
 
diff --git a/transfer/transfer-01-negotiation/README.md b/transfer/transfer-01-negotiation/README.md
index ac079505..72181e71 100644
--- a/transfer/transfer-01-negotiation/README.md
+++ b/transfer/transfer-01-negotiation/README.md
@@ -143,7 +143,7 @@ Sample output:
     "@id": "2a5178c3-c937-4ac2-85be-c46dbc6c5642",
     "@type": "dcat:DataService",
     "dct:terms": "connector",
-    "dct:endpointUrl": "http://localhost:19194/protocol"
+    "dct:endpointUrl": "http://localhost:19194/protocol/2025-1"
   },
   "participantId": "anonymous",
   "@context": {
@@ -151,7 +151,7 @@ Sample output:
     "dct": "https://purl.org/dc/terms/",
     "dcat": "https://www.w3.org/ns/dcat/",
     "odrl": "http://www.w3.org/ns/odrl/2/",
-    "dspace": "https://w3id.org/dspace/v0.8/"
+    "dspace": "https://w3id.org/dspace/2025/1/"
   }
 }
 ```
@@ -216,9 +216,9 @@ Sample output:
   "@type": "ContractNegotiation",
   "@id": "5ca21b82-075b-4682-add8-c26c9a2ced67",
   "type": "CONSUMER",
-  "protocol": "dataspace-protocol-http",
+  "protocol": "dataspace-protocol-http:2025-1",
   "state": "FINALIZED",
-  "counterPartyAddress": "http://localhost:19194/protocol",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
   "callbackAddresses": [],
   "contractAgreementId": "0b3150be-feaf-43bc-91e1-90f050de28bd",  <---------
   "@context": {
@@ -226,7 +226,7 @@ Sample output:
     "dct": "https://purl.org/dc/terms/",
     "dcat": "https://www.w3.org/ns/dcat/",
     "odrl": "http://www.w3.org/ns/odrl/2/",
-    "dspace": "https://w3id.org/dspace/v0.8/"
+    "dspace": "https://w3id.org/dspace/2025/1/"
   }
 }
 ```
diff --git a/transfer/transfer-01-negotiation/resources/fetch-catalog.json b/transfer/transfer-01-negotiation/resources/fetch-catalog.json
index 370b4f2f..28a0a7e7 100644
--- a/transfer/transfer-01-negotiation/resources/fetch-catalog.json
+++ b/transfer/transfer-01-negotiation/resources/fetch-catalog.json
@@ -2,6 +2,7 @@
   "@context": {
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
-  "counterPartyAddress": "http://localhost:19194/protocol",
-  "protocol": "dataspace-protocol-http"
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1"
 }
diff --git a/transfer/transfer-01-negotiation/resources/get-dataset.json b/transfer/transfer-01-negotiation/resources/get-dataset.json
index 5286af00..f37c1661 100644
--- a/transfer/transfer-01-negotiation/resources/get-dataset.json
+++ b/transfer/transfer-01-negotiation/resources/get-dataset.json
@@ -2,6 +2,7 @@
   "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
   "@type": "DatasetRequest",
   "@id": "assetId",
-  "counterPartyAddress": "http://localhost:19194/protocol",
-  "protocol": "dataspace-protocol-http"
-}
\ No newline at end of file
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1"
+}
diff --git a/transfer/transfer-01-negotiation/resources/negotiate-contract.json b/transfer/transfer-01-negotiation/resources/negotiate-contract.json
index 82fe8036..bd76cb54 100644
--- a/transfer/transfer-01-negotiation/resources/negotiate-contract.json
+++ b/transfer/transfer-01-negotiation/resources/negotiate-contract.json
@@ -3,8 +3,9 @@
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
   "@type": "ContractRequest",
-  "counterPartyAddress": "http://localhost:19194/protocol",
-  "protocol": "dataspace-protocol-http",
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
     "@id": "{{contract-offer-id}}",
diff --git a/transfer/transfer-02-provider-push/resources/start-transfer.json b/transfer/transfer-02-provider-push/resources/start-transfer.json
index f0a02b4a..29e424e7 100644
--- a/transfer/transfer-02-provider-push/resources/start-transfer.json
+++ b/transfer/transfer-02-provider-push/resources/start-transfer.json
@@ -4,9 +4,9 @@
   },
   "@type": "TransferRequestDto",
   "connectorId": "provider",
-  "counterPartyAddress": "http://localhost:19194/protocol",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
   "contractId": "{{contract-agreement-id}}",
-  "protocol": "dataspace-protocol-http",
+  "protocol": "dataspace-protocol-http:2025-1",
   "transferType": "HttpData-PUSH",
   "dataDestination": {
     "type": "HttpData",
diff --git a/transfer/transfer-03-consumer-pull/resources/start-transfer.json b/transfer/transfer-03-consumer-pull/resources/start-transfer.json
index ff44b695..f59ec024 100644
--- a/transfer/transfer-03-consumer-pull/resources/start-transfer.json
+++ b/transfer/transfer-03-consumer-pull/resources/start-transfer.json
@@ -4,8 +4,8 @@
   },
   "@type": "TransferRequestDto",
   "connectorId": "provider",
-  "counterPartyAddress": "http://localhost:19194/protocol",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
   "contractId": "{{contract-agreement-id}}",
-  "protocol": "dataspace-protocol-http",
+  "protocol": "dataspace-protocol-http:2025-1",
   "transferType": "HttpData-PULL"
 }
diff --git a/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json b/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json
index b81e8ed5..28a0a7e7 100644
--- a/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json
+++ b/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json
@@ -2,6 +2,7 @@
   "@context": {
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
-  "counterPartyAddress": "http://localhost:19194/protocol",
-  "protocol": "dataspace-protocol-http"
-}
\ No newline at end of file
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1"
+}
diff --git a/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json b/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json
index b6674fe9..68792c3c 100644
--- a/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json
+++ b/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json
@@ -2,6 +2,7 @@
     "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/"},
     "@type": "DatasetRequest",
     "@id": "1",
-    "counterPartyAddress": "http://localhost:19194/protocol",
-    "protocol": "dataspace-protocol-http"
-}
\ No newline at end of file
+    "counterPartyId": "provider",
+    "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+    "protocol": "dataspace-protocol-http:2025-1"
+}
diff --git a/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json b/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json
index d04e405a..38434acf 100644
--- a/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json
+++ b/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json
@@ -3,8 +3,9 @@
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
   "@type": "ContractRequest",
-  "counterPartyAddress": "http://localhost:19194/protocol",
-  "protocol": "dataspace-protocol-http",
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
     "@id": "{{contract-offer-id}}",
@@ -17,4 +18,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json b/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json
index 0fa94fce..e49492b4 100644
--- a/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json
+++ b/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json
@@ -4,9 +4,9 @@
   },
   "@type": "TransferRequestDto",
   "connectorId": "provider",
-  "counterPartyAddress": "http://localhost:19194/protocol",
+  "counterPartyAddress": "http://localhost:19194/protocol/2025-1",
   "contractId": "{{contract-agreement-id}}",
-  "protocol": "dataspace-protocol-http",
+  "protocol": "dataspace-protocol-http:2025-1",
   "transferType": "AmazonS3-PUSH",
   "dataDestination": {
     "type": "AmazonS3",
diff --git a/transfer/transfer-06-kafka-broker/4-get-dataset.json b/transfer/transfer-06-kafka-broker/4-get-dataset.json
index 0ec57558..829d8687 100644
--- a/transfer/transfer-06-kafka-broker/4-get-dataset.json
+++ b/transfer/transfer-06-kafka-broker/4-get-dataset.json
@@ -2,6 +2,7 @@
   "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
   "@type": "DatasetRequest",
   "@id": "kafka-stream-asset",
-  "counterPartyAddress": "http://localhost:18182/protocol",
-  "protocol": "dataspace-protocol-http"
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:18182/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1"
 }
diff --git a/transfer/transfer-06-kafka-broker/5-negotiate-contract.json b/transfer/transfer-06-kafka-broker/5-negotiate-contract.json
index 9dce9907..340db07c 100644
--- a/transfer/transfer-06-kafka-broker/5-negotiate-contract.json
+++ b/transfer/transfer-06-kafka-broker/5-negotiate-contract.json
@@ -3,8 +3,9 @@
     "edc": "https://w3id.org/edc/v0.0.1/ns/"
   },
   "@type": "ContractRequest",
-  "counterPartyAddress": "http://localhost:18182/protocol",
-  "protocol": "dataspace-protocol-http",
+  "counterPartyId": "provider",
+  "counterPartyAddress": "http://localhost:18182/protocol/2025-1",
+  "protocol": "dataspace-protocol-http:2025-1",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
     "@id": "{{offerId}}",
diff --git a/transfer/transfer-06-kafka-broker/6-transfer.json b/transfer/transfer-06-kafka-broker/6-transfer.json
index e30d4f4c..168ba241 100644
--- a/transfer/transfer-06-kafka-broker/6-transfer.json
+++ b/transfer/transfer-06-kafka-broker/6-transfer.json
@@ -3,11 +3,11 @@
     "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
   },
   "@type": "TransferRequest",
-  "protocol": "dataspace-protocol-http",
+  "protocol": "dataspace-protocol-http:2025-1",
   "transferType": "KafkaBroker-PULL",
   "contractId": "{{contract-agreement-id}}",
   "connectorId": "provider",
-  "counterPartyAddress": "http://localhost:18182/protocol",
+  "counterPartyAddress": "http://localhost:18182/protocol/2025-1",
   "callbackAddresses": [
     {
       "transactional": false,
diff --git a/transfer/transfer-06-kafka-broker/README.md b/transfer/transfer-06-kafka-broker/README.md
index 6656e305..8e1aca64 100644
--- a/transfer/transfer-06-kafka-broker/README.md
+++ b/transfer/transfer-06-kafka-broker/README.md
@@ -131,7 +131,7 @@ The output will be something like:
     "edc": "https://w3id.org/edc/v0.0.1/ns/",
     "dcat": "https://www.w3.org/ns/dcat/",
     "odrl": "http://www.w3.org/ns/odrl/2/",
-    "dspace": "https://w3id.org/dspace/v0.8/"
+    "dspace": "https://w3id.org/dspace/2025/1/"
   }
 }
 ```