diff --git a/code/API_definitions/geofencing-subscriptions.yaml b/code/API_definitions/geofencing-subscriptions.yaml
index 8ae7942d..2f6e63e9 100644
--- a/code/API_definitions/geofencing-subscriptions.yaml
+++ b/code/API_definitions/geofencing-subscriptions.yaml
@@ -114,17 +114,17 @@ info:
 
     (FAQs will be added in a later version of the documentation)
 
-  version: 0.5.0
+  version: wip
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-  x-camara-commonalities: 0.6
+  x-camara-commonalities: tbd
 externalDocs:
   description: Project documentation at Camara
   url: https://github.com/camaraproject/DeviceLocation
 
 servers:
-  - url: "{apiRoot}/geofencing-subscriptions/v0.5"
+  - url: "{apiRoot}/geofencing-subscriptions/vwip"
     variables:
       apiRoot:
         default: http://localhost:9091
diff --git a/code/API_definitions/location-retrieval.yaml b/code/API_definitions/location-retrieval.yaml
index a009959d..b48fb87a 100644
--- a/code/API_definitions/location-retrieval.yaml
+++ b/code/API_definitions/location-retrieval.yaml
@@ -108,16 +108,16 @@ info:
     # Further info and support
 
     (FAQs will be added in a later version of the documentation)
-  version: 0.5.0
+  version: wip
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-  x-camara-commonalities: 0.6
+  x-camara-commonalities: tbd
 externalDocs:
   description: Project documentation at Camara
   url: https://github.com/camaraproject/DeviceLocation
 servers:
-  - url: '{apiRoot}/location-retrieval/v0.5'
+  - url: '{apiRoot}/location-retrieval/vwip'
     variables:
       apiRoot:
         default: http://localhost:9091
diff --git a/code/API_definitions/location-verification.yaml b/code/API_definitions/location-verification.yaml
index f5b86c5f..bfcbf965 100644
--- a/code/API_definitions/location-verification.yaml
+++ b/code/API_definitions/location-verification.yaml
@@ -92,16 +92,16 @@ info:
     # Further info and support
 
     (FAQs will be added in a later version of the documentation)
-  version: 3.0.0
+  version: wip
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-  x-camara-commonalities: 0.6
+  x-camara-commonalities: tbd
 externalDocs:
   description: Project documentation at CAMARA
   url: https://github.com/camaraproject/DeviceLocation
 servers:
-  - url: "{apiRoot}/location-verification/v3"
+  - url: "{apiRoot}/location-verification/vwip"
     variables:
       apiRoot:
         default: http://localhost:9091
diff --git a/code/Test_definitions/geofencing-subscriptions.feature b/code/Test_definitions/geofencing-subscriptions.feature
index 1d23e8e5..d2981a65 100644
--- a/code/Test_definitions/geofencing-subscriptions.feature
+++ b/code/Test_definitions/geofencing-subscriptions.feature
@@ -1,4 +1,4 @@
-Feature: Camara Geofencing Subscriptions API, v0.5.0 - Operations on subscriptions
+Feature: Camara Geofencing Subscriptions API, vwip - Operations on subscriptions
 
   # Input to be provided by the implementation to the tester
   #
@@ -14,7 +14,7 @@ Feature: Camara Geofencing Subscriptions API, v0.5.0 - Operations on subscriptio
 
   Background: Common Geofencing Subscriptions setup
     Given an environment at "apiRoot"
-    And the resource  "/geofencing-subscriptions/v0.5/" as geofencing base-url
+    And the resource  "/geofencing-subscriptions/vwip/" as geofencing base-url
     And the header "Authorization" is set to a valid access token
     And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"
 
diff --git a/code/Test_definitions/location-retrieval.feature b/code/Test_definitions/location-retrieval.feature
index 46f70d8a..218c0200 100644
--- a/code/Test_definitions/location-retrieval.feature
+++ b/code/Test_definitions/location-retrieval.feature
@@ -1,4 +1,4 @@
-Feature: CAMARA Device location retrieval API, v0.5.0 - Operation retrieveLocation
+Feature: CAMARA Device location retrieval API, vwip - Operation retrieveLocation
   # Input to be provided by the implementation to the tester
   #
   # Implementation indications:
@@ -14,7 +14,7 @@ Feature: CAMARA Device location retrieval API, v0.5.0 - Operation retrieveLocati
 
   Background: Common retrieveLocation setup
     Given an environment at "apiRoot"
-    And the resource "/location-retrieval/v0.5/retrieve"                                                              |
+    And the resource "/location-retrieval/vwip/retrieve"                                                              |
     And the header "Content-Type" is set to "application/json"
     And the header "Authorization" is set to a valid access token
     And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"
diff --git a/code/Test_definitions/location-verification.feature b/code/Test_definitions/location-verification.feature
index 5c260bf4..4c4d0ad0 100644
--- a/code/Test_definitions/location-verification.feature
+++ b/code/Test_definitions/location-verification.feature
@@ -1,4 +1,4 @@
-Feature: CAMARA Device location verification API, v3.0.0 - Operation verifyLocation
+Feature: CAMARA Device location verification API, vwip - Operation verifyLocation
   # Input to be provided by the implementation to the tester
   #
   # Implementation indications:
@@ -14,7 +14,7 @@ Feature: CAMARA Device location verification API, v3.0.0 - Operation verifyLocat
 
   Background: Common verifyLocation setup
     Given an environment at "apiRoot"
-    And the resource "/location-verification/v3/verify"
+    And the resource "/location-verification/vwip/verify"
     And the header "Content-Type" is set to "application/json"
     And the header "Authorization" is set to a valid access token
     And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"