diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_22_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_22_08.robot
index d1b921f05919d20c2e72d65603d4cbdb54149adf..6e4123242ee62a07c0153af98d54fb7c8af0c8b4 100644
--- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_22_08.robot
+++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_22_08.robot
@@ -27,7 +27,7 @@ ${entity_expectation_file_path}=        entity-deleted-name-attribute-instance-n
     ...    entityId=${entity_id}
     ...    attributeId=name
     ...    datasetId=${EMPTY}
-    ...    deleteAll=${true}
+    ...    deleteAll=true
     ...    context=${ngsild_test_suite_context}
     Check Response Status Code    204    ${response.status_code}
 
diff --git a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_exc.robot b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_exc.robot
index 98af539666fda3d8479d612107611360d62cff89..994e6cda8d0d32d8f648f4298fd880e1479dc89b 100644
--- a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_exc.robot
+++ b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_01_exc.robot
@@ -42,7 +42,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
         ${entity_id}=    Generate Random Vehicle Entity Id
         Set Suite Variable   ${entity_id}
 
-        ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=${True}
+        ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=true
         Check Response Status Code    201    ${response.status_code}
 
         ${registration_id}=    Generate Random CSR Id
diff --git a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_exc.robot b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_exc.robot
index 382fe549680d1392d6a4a2aa36cef07578ad6a22..91f259d9807afa445024104ea4d06069a36f71dd 100644
--- a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_exc.robot
+++ b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_exc.robot
@@ -28,7 +28,7 @@ D010_02_exc Query Context Broker And Retrieve Entity By Id
     ${entity_speed}=    Load Entity    ${entity_speed_filename}    ${entity_id}
     Set Stub Reply    GET    /broker1/ngsi-ld/v1/entities/${entity_id}    200    ${entity_speed}
 
-    ${response}=    Retrieve Entity    ${entity_id}    context=${ngsild_test_suite_context}    local=${True}
+    ${response}=    Retrieve Entity    ${entity_id}    context=${ngsild_test_suite_context}    local=true
     Dictionary Should Not Contain Key    ${response.json()}    speed
     
 *** Keywords ***
@@ -36,7 +36,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
         ${entity_id}=    Generate Random Vehicle Entity Id
         Set Suite Variable   ${entity_id}
 
-        ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=${True}
+        ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=true
         Check Response Status Code    201    ${response.status_code}
 
         ${registration_id}=    Generate Random CSR Id
diff --git a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_red.robot b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_red.robot
index ebb5abcae4d0336171110f6155b001a5d2632597..2156cf15bf07d6fe39a75ca358d84f050f7eb169 100644
--- a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_red.robot
+++ b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/RetrieveEntity/D010_02_red.robot
@@ -33,7 +33,7 @@ D010_02_red Query Context Broker And Retrieve Entity By Id
     ${response}=    Retrieve Entity
     ...    ${entity_id}
     ...    context=${ngsild_test_suite_context}
-    ...    local=${true}
+    ...    local=true
     Check Response Status Code    404    ${response.status_code}
 
     ${stub_count}=    Get Stub Count    GET    /broker1/ngsi-ld/v1/entities/${entity_id}
diff --git a/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_01_exc.robot b/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_01_exc.robot
index 619d5e4226b2f50e294c2bb4ae089b0dd5cd225a..57537c005b035d5484be0632e7410cd520356096 100644
--- a/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_01_exc.robot
+++ b/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_01_exc.robot
@@ -40,7 +40,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
     ${entity_id}=    Generate Random Vehicle Entity Id
     Set Suite Variable    ${entity_id}
 
-    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=${True}
+    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=true
     Check Response Status Code    201    ${response.status_code}
 
     ${registration_id}=    Generate Random CSR Id
diff --git a/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_02_exc.robot b/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_02_exc.robot
index 808aea69cf96f871125727731778df528245b658..da4bbb690be1dd7b989df78b3690cb82b2c14bb9 100644
--- a/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_02_exc.robot
+++ b/TP/NGSI-LD/DistributedOperations/Provision/Entities/DeleteEntity/D002_02_exc.robot
@@ -39,7 +39,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
     ${entity_id}=    Generate Random Vehicle Entity Id
     Set Suite Variable    ${entity_id}
 
-    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=${True}
+    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=true
     Check Response Status Code    201    ${response.status_code}
 
     ${registration_id}=    Generate Random CSR Id
diff --git a/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/AppendEntityAttributes/D003_02_exc.robot b/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/AppendEntityAttributes/D003_02_exc.robot
index 084015b54fdc014cac291b343674f4053b49452f..61960a026ec9d7c10eefd7b65625515046cecee7 100644
--- a/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/AppendEntityAttributes/D003_02_exc.robot
+++ b/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/AppendEntityAttributes/D003_02_exc.robot
@@ -41,7 +41,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
     ${entity_id}=    Generate Random Vehicle Entity Id
     Set Suite Variable    ${entity_id}
 
-    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=${True}
+    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=true
     Check Response Status Code    201    ${response.status_code}
 
     ${registration_id}=    Generate Random CSR Id
diff --git a/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/UpdateEntityAttributes/D004_01_exc.robot b/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/UpdateEntityAttributes/D004_01_exc.robot
index 3811a848b31da6e7f1f8e8240689f29677e02e7a..dade0db198310787835956a436dae4cc97185018 100644
--- a/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/UpdateEntityAttributes/D004_01_exc.robot
+++ b/TP/NGSI-LD/DistributedOperations/Provision/EntityAttributes/UpdateEntityAttributes/D004_01_exc.robot
@@ -42,7 +42,7 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo
     ${entity_id}=    Generate Random Vehicle Entity Id
     Set Suite Variable    ${entity_id}
 
-    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=${True}
+    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    local=true
     Check Response Status Code    201    ${response.status_code}
 
     ${registration_id}=    Generate Random CSR Id