diff --git a/code/API_definitions/device-identifier.yaml b/code/API_definitions/device-identifier.yaml
index 51806e2..86429de 100644
--- a/code/API_definitions/device-identifier.yaml
+++ b/code/API_definitions/device-identifier.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: Device Identifier
-  version: 0.3.0
+  version: wip
   description: |
     # Summary
 
@@ -30,7 +30,7 @@ info:
 
     The mobile network associates this device identifier with the mobile subscription currently using the device. The mobile subscription is defined by the Subscriber Identity Module (SIM) currently active in the mobile device. This may be a removable SIM or an eSIM. In either case, it is possible for the association between the device identifier and subscription to change - for example, when a physical SIM is transferred to another mobile device.
 
-    ![Device Identifier API Overview](https://raw.githubusercontent.com/camaraproject/DeviceIdentifier/r2.2/documentation/API_documentation/resources/Device_Identifier_Overview.png)
+    ![Device Identifier API Overview](https://raw.githubusercontent.com/camaraproject/DeviceIdentifier/main/documentation/API_documentation/resources/Device_Identifier_Overview.png)
 
     The Device Identifier API allows the API consumer to obtain the IMEI and associated parameters for a specified mobile subscription identifier or equivalent. The mobile subscription can be identified using one or more of the following subscription identifiers:
     - the subscription phone number (also known as MSISDN)
@@ -173,7 +173,7 @@ externalDocs:
   url: https://github.com/camaraproject/DeviceIdentifier
 
 servers:
-  - url: "{apiRoot}/device-identifier/v0.3"
+  - url: "{apiRoot}/device-identifier/vwip"
     variables:
       apiRoot:
         default: http://localhost:9091
diff --git a/code/Test_definitions/device-identifier-retrieveIdentifier.feature b/code/Test_definitions/device-identifier-retrieveIdentifier.feature
index 02d2c83..48ea3b5 100644
--- a/code/Test_definitions/device-identifier-retrieveIdentifier.feature
+++ b/code/Test_definitions/device-identifier-retrieveIdentifier.feature
@@ -1,5 +1,5 @@
 # device-identifier-retrieveIdentifier
-Feature: Camara Mobile Device Identifer API, v0.3.0 - Operation: retrieveIdentifier
+Feature: Camara Mobile Device Identifer API, vwip - Operation: retrieveIdentifier
 
   # Input to be provided by the implementation to the tests
   # References to OAS spec schemas refer to schemas specified in /code/API_definitions/device-identifier.yaml
@@ -30,7 +30,7 @@ Feature: Camara Mobile Device Identifer API, v0.3.0 - Operation: retrieveIdentif
 
   Background: Common Device Identifier retrieveIdentifier setup
     Given an environment at "apiRoot"
-    And the resource "/device-identifier/v0.3/retrieve-identifier"
+    And the resource "/device-identifier/vwip/retrieve-identifier"
     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/device-identifier-retrievePPID.feature b/code/Test_definitions/device-identifier-retrievePPID.feature
index c939c33..bed72ee 100644
--- a/code/Test_definitions/device-identifier-retrievePPID.feature
+++ b/code/Test_definitions/device-identifier-retrievePPID.feature
@@ -1,5 +1,5 @@
 # device-identifier-retrievePPID
-Feature: Camara Mobile Device Identifer API, v0.3.0 - Operation: retrievePPID
+Feature: Camara Mobile Device Identifer API, vwip - Operation: retrievePPID
 
   # Input to be provided by the implementation to the tests
   # References to OAS spec schemas refer to schemas specified in /code/API_definitions/device-identifier.yaml
@@ -32,7 +32,7 @@ Feature: Camara Mobile Device Identifer API, v0.3.0 - Operation: retrievePPID
 
   Background: Common Device Identifier retrievePPID setup
     Given an environment at "apiRoot"
-    And the resource "/device-identifier/v0.3/retrieve-ppid"
+    And the resource "/device-identifier/vwip/retrieve-ppid"
     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/device-identifier-retrieveType.feature b/code/Test_definitions/device-identifier-retrieveType.feature
index 3460d5a..c423134 100644
--- a/code/Test_definitions/device-identifier-retrieveType.feature
+++ b/code/Test_definitions/device-identifier-retrieveType.feature
@@ -1,5 +1,5 @@
 # device-identifier-retrieveType
-Feature: Camara Mobile Device Identifer API, v0.3.0 - Operation: retrieveType
+Feature: Camara Mobile Device Identifer API, vwip - Operation: retrieveType
 
   # Input to be provided by the implementation to the tests
   # References to OAS spec schemas refer to schemas specified in /code/API_definitions/device-identifier.yaml
@@ -30,7 +30,7 @@ Feature: Camara Mobile Device Identifer API, v0.3.0 - Operation: retrieveType
 
   Background: Common Device Identifier retrieveType setup
     Given an environment at "apiRoot"
-    And the resource "/device-identifier/v0.3/retrieve-type"
+    And the resource "/device-identifier/vwip/retrieve-type"
     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"