diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml
index d78e34d32eb33c637e5af931f016b967b9c20bc2..3c9a5670045414101e443d198375faf08b1b34e9 100644
--- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml
+++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml
@@ -20,8 +20,8 @@ externalDocs:
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.05.01_60/gs_nfv-sol005v030501p.pdf
 
 servers:
-  - url: http://127.0.0.1/callback/v2
-  - url: https://127.0.0.1/callback/v2
+  - url: http://127.0.0.1/callback/v1
+  - url: https://127.0.0.1/callback/v1
 
 paths:
   ###############################################################################
diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
index 23900ad0f31a43f7144a5293aa9f482c1f38ca69..7e68c0a860ee4f4551f43adea7f68daf6488fad4 100644
--- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
+++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
@@ -13,7 +13,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:2
+  version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.5.1
diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
index 1c7661becd212e371984fa3b53924d36921b464a..af6a5c5f9fcecb9722fb08dc9fd243062ed37ba8 100644
--- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
+++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
@@ -13,15 +13,15 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:4
+  version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.05.01_60/gs_nfv-sol005v030501p.pdf
 
 servers:
-  - url: http://127.0.0.1/nslcm/v1
-  - url: https://127.0.0.1/nslcm/v1
+  - url: http://127.0.0.1/nslcm/v2
+  - url: https://127.0.0.1/nslcm/v2
 
 paths:
   /api_versions:
diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
index 3ccf2bf333bb490564165d7288502532d4039cf6..584fa687a48a8bfa128f2240cb960168a9cbe852 100644
--- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
+++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
@@ -17,8 +17,8 @@ externalDocs:
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.05.01_60/gs_nfv-sol005v030501p.pdf
 
 servers:
-  - url: http://127.0.0.1/callback/v1
-  - url: https://127.0.0.1/callback/v1
+  - url: http://127.0.0.1/callback/v2
+  - url: https://127.0.0.1/callback/v2
 
 paths:
   /URI_is_provided_by_the_client_when_creating_the_subscription-NsLcmOperationOccurrenceNotification:
diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
index b079d2a7bedff8cc04539a419f954e040e1af33f..fe5f2c0ab94c55ff364ebd09fd7cf9054ff03ba7 100644
--- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
+++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
@@ -14,7 +14,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.5.1
diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
index d57fa55190b272c164ec4c48fb5c7578b199bcd7..0ef021841b449fb8ca915be0a98cbcd259788bb1 100644
--- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
@@ -12,7 +12,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:2
+  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.5.1
diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index e34e2e51015dc91ca62add915cdbe374a3919fa1..245b6c5eebbc02ac2b8421238671f030d9b5bbda 100644
--- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -10,15 +10,15 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.05.01_60/gs_nfv-sol005v030501p.pdf
 
 servers:
-  - url: http://127.0.0.1/callback/v1
-  - url: https://127.0.0.1/callback/v1
+  - url: http://127.0.0.1/callback/v2
+  - url: https://127.0.0.1/callback/v2
 
 
 paths: