diff --git a/.jenkins.sh b/.jenkins.sh
deleted file mode 100755
index 74d0370875e23476bf3a058ebcb825f7494b3de7..0000000000000000000000000000000000000000
--- a/.jenkins.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-specfiles=$(ls | egrep "^[^.]*.(json|yaml)")
-
-fres=0
-for i in $specfiles ; do
-    echo "-- Validating and linting OpenAPI file $i..."
-    swagger-cli validate $i
-    res=$?
-    speccy lint "$i"
-    res2=$?
-    fres=$(($fres||$res||$res2))
-    echo "--- Validator returned $res, linter returned $res2."
-done
-
-echo "-- Final validator returns $fres."
-exit $fres
-
diff --git a/MEC021_AppMobilityService.json b/MEC021_AppMobilityService.json
index 8459765747ac69909caf8631bb2d1377aecce5dd..e6e7d597eaa62f70d784c72395ac61a6dad5df12 100644
--- a/MEC021_AppMobilityService.json
+++ b/MEC021_AppMobilityService.json
@@ -1546,7 +1546,8 @@
             "$ref": "#/components/schemas/AdjacentAppInfoSubscription.links"
           },
           "callbackReference": {
-            "type": "uri",
+            "type": "string",
+            "format": "uri",
             "description": "URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response."
           },
           "requestTestNotification": {
@@ -1691,7 +1692,8 @@
         "properties": {
           "websocketUri": {
             "description": "Set by AMS to indicate to the service consumer the Websocket URI to be used for delivering notifications.",
-            "type": "uri"
+            "type": "string",
+            "format": "uri"
           },
           "requestWebsocketUri": {
             "type": "boolean",
@@ -1711,7 +1713,8 @@
             "$ref": "#/components/schemas/MobilityProcedureSubscription.links"
           },
           "callbackReference": {
-            "type": "uri",
+            "type": "string",
+            "format": "uri",
             "description": "URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response."
           },
           "requestTestNotification": {
diff --git a/MEC021_AppMobilityService.yaml b/MEC021_AppMobilityService.yaml
index 1af920c5e36144ae2c9505d61739425255372d6a..4451221bd882e7e807c55cdc2d39794e9f721b7a 100644
--- a/MEC021_AppMobilityService.yaml
+++ b/MEC021_AppMobilityService.yaml
@@ -1006,7 +1006,8 @@ components:
         _links:
           $ref: '#/components/schemas/AdjacentAppInfoSubscription.links'
         callbackReference:
-          type: uri
+          type: string
+          format: uri
           description: URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response.
         requestTestNotification:
           type: boolean
@@ -1111,7 +1112,8 @@ components:
       properties:
         websocketUri:
           description: Set by AMS to indicate to the service consumer the Websocket URI to be used for delivering notifications.
-          type: uri
+          type: string
+          format: uri
         requestWebsocketUri:
           type: boolean
           description: Set to true by the service consumer to indicate that Websocket delivery is requested.
@@ -1126,7 +1128,8 @@ components:
         _links:
           $ref: '#/components/schemas/MobilityProcedureSubscription.links'
         callbackReference:
-          type: uri
+          type: string
+          format: uri
           description: URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response.
         requestTestNotification:
           type: boolean
diff --git a/README.md b/README.md
index 24c4e355a390e1b6fb889cfb72e48543b5184a50..73fc6be52ad0c5ec933aab1411e736f4bab13b71 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ This repository contains OpenAPIs descriptions for the interfaces specified in E
 ## Online resources
 
 * [Specification document](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_mec021v020101p.pdf)
-* [Navigate the Application Mobility Service API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs021-amsi-api/raw/stf606-final/MEC021_AppMobilityService.yaml).
-* [Edit the Application Mobility Service API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/rep/mec/gs021-amsi-api/raw/stf606-final/MEC021_AppMobilityService.yaml).
+* [Navigate the Application Mobility Service API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs021-amsi-api/raw/v2.2.1/MEC021_AppMobilityService.yaml).
+* [Edit the Application Mobility Service API online](https://redocly.github.io/redoc/?url=https://forge.etsi.org/rep/mec/gs021-amsi-api/raw/v2.2.1/MEC021_AppMobilityService.yaml).
 
 ## License