diff --git a/.jenkins.sh b/.jenkins.sh
deleted file mode 100644
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/README.md b/README.md
index 19ae5d21bb59b533d7b6c8495e53d3897f0bf852..d8144e0bdf9848997d238a64bcb849fcca1b85fd 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ This repository contains OpenAPIs descriptions for the interfaces specified in E
 
 ## Online resources
 
-* [Navigate the API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/stf606-final/WlanInformationApi.yaml).
-* [Edit the API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/stf606-final/WlanInformationApi.yaml).
+* [Navigate the API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/v2.3.1/WlanInformationApi.yaml).
+* [Edit the API online](https://redocly.github.io/redoc/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/v2.3.1/WlanInformationApi.yaml).
 
 ## License
 
diff --git a/WlanInformationApi.json b/WlanInformationApi.json
index 1db9df38e2a3e6ff622e18148b8d9963a86afdc7..8a54e2b2dfb781c780c7939b5711b6ad7cd994de 100644
--- a/WlanInformationApi.json
+++ b/WlanInformationApi.json
@@ -21,7 +21,8 @@
   ],
   "tags": [
     {
-      "name": "wai"
+      "name": "wai",
+      "description": "WLAN Access Information"
     }
   ],
   "paths": {
@@ -754,6 +755,9 @@
                 "responses": {
                   "204": {
                     "description": "No content"
+                  },
+                  "400": {
+                    "description": "Bad Request"
                   }
                 }
               }
@@ -2077,7 +2081,7 @@
         "properties": {
           "antennaId": {
             "type": "integer",
-            "description": "The Antenna ID field contains the identifying number for the antenna(s) used for this measurement. Antenna ID is defined in clause 9.4.2.40 of IEEE 802.11-2016.",
+            "description": "The Antenna ID field contains the identifying number for the antenna(s) used for this measurement. Antenna ID is defined in clause 9.4.2.40 of IEEE 802.11-2016.",
             "contentEncoding": "int32"
           },
           "bssid": {
@@ -3825,9 +3829,9 @@
         "discriminator": {
           "propertyName": "notificationType",
           "mapping": {
-            "AssocStaNotification": "AssocStaNotification",
-            "MeasurementReportNotification": "MeasurementReportNotification",
-            "StaDataRateNotification": "StaDataRateNotification"
+            "AssocStaNotification": "#/components/schemas/AssocStaNotification",
+            "MeasurementReportNotification": "#/components/schemas/MeasurementReportNotification",
+            "StaDataRateNotification": "#/components/schemas/StaDataRateNotification"
           }
         }
       },
@@ -3845,9 +3849,9 @@
         "discriminator": {
           "propertyName": "subscriptionType",
           "mapping": {
-            "AssocStaSubscription": "AssocStaSubscription",
-            "MeasurementReportSubscription": "MeasurementReportSubscription",
-            "StaDataRateSubscription": "StaDataRateSubscription"
+            "AssocStaNotification": "#/components/schemas/AssocStaNotification",
+            "MeasurementReportNotification": "#/components/schemas/MeasurementReportNotification",
+            "StaDataRateNotification": "#/components/schemas/StaDataRateNotification"
           }
         }
       },
diff --git a/WlanInformationApi.yaml b/WlanInformationApi.yaml
index ec6eba6fb42fe35a884626fa8f3f04cac52ff62f..6e1dbaf5d7f5a0b3f789a6f0d7f0613d13fe8f70 100644
--- a/WlanInformationApi.yaml
+++ b/WlanInformationApi.yaml
@@ -15,6 +15,7 @@ servers:
 
 tags:
 - name: wai
+  description: WLAN Access Information
 
 paths:
   /queries/ap/ap_information:
@@ -494,6 +495,8 @@ paths:
               responses:
                 '204':
                  description: "No content"
+                '400':
+                 description: "Bad Request"
 
 
     parameters: []
@@ -2747,9 +2750,9 @@ components:
       discriminator:
         propertyName: notificationType
         mapping:
-          AssocStaNotification: AssocStaNotification
-          MeasurementReportNotification: MeasurementReportNotification
-          StaDataRateNotification: StaDataRateNotification
+          AssocStaNotification: '#/components/schemas/AssocStaNotification'
+          MeasurementReportNotification: '#/components/schemas/MeasurementReportNotification'
+          StaDataRateNotification: '#/components/schemas/StaDataRateNotification'
     InlineSubscription:
       title: InlineSubscription
       required:
@@ -2761,9 +2764,9 @@ components:
       discriminator:
         propertyName: subscriptionType
         mapping:
-          AssocStaSubscription: AssocStaSubscription
-          MeasurementReportSubscription: MeasurementReportSubscription
-          StaDataRateSubscription: StaDataRateSubscription
+          AssocStaNotification: '#/components/schemas/AssocStaNotification'
+          MeasurementReportNotification: '#/components/schemas/MeasurementReportNotification'
+          StaDataRateNotification: '#/components/schemas/StaDataRateNotification'
     Links:
       title: Links
       required: