diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/openapi/openapi.yaml b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/openapi/openapi.yaml
index 566379b7c37444dae1084a72a234035f1d485fc2..43054968701a0324d4f83948efe869ca50d28090 100644
--- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/openapi/openapi.yaml
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/openapi/openapi.yaml
@@ -5726,7 +5726,9 @@ components:
       title: ServiceKpis
       type: object
     IpAddrRange:
-      anyOf: []
+      anyOf:
+        - required: ["ueIpv4AddrRanges"]
+        - required: ["ueIpv6AddrRanges"]
       description: Represents the list of public IP ranges
       example:
         ueIpv4AddrRanges:
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/VERSION
index 18bb4182dd01428f1d4c3c2145501ee5d40455a3..b23eb27529e2bacf6c8c06f725c323d9fb87f042 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/VERSION
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/VERSION
@@ -1 +1 @@
-7.5.0
+7.11.0
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/README.md b/services/TS29222_CAPIF_API_Provider_Management_API/README.md
index 3aa91ec68ea850ad7ece64da4412eb0da0423592..c9acf914cff1769f2c2527ba1c6398f97c607d1c 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/README.md
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/README.md
@@ -15,7 +15,7 @@ To run the server, please execute the following from the root directory:
 
 ```
 pip3 install -r requirements.txt
-python3 -m openapi_server
+python3 -m api_provider_management
 ```
 
 and open your browser to here:
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py
index 92a631209a444fdd1ea091f061f14574732719a2..da7fb6dafe1c69f068428894526bc0513d17707e 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py
@@ -1,11 +1,14 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from api_provider_management import util
-from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails  # noqa: E501
 from api_provider_management.models.base_model import Model
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails
+import re
+from api_provider_management import util
 
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails  # noqa: E501
+import re  # noqa: E501
 
 class APIProviderEnrolmentDetails(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -187,7 +190,7 @@ class APIProviderEnrolmentDetails(Model):
         :type supp_feat: str
         """
         if supp_feat is not None and not re.search(r'^[A-Fa-f0-9]*$', supp_feat):  # noqa: E501
-            raise ValueError("Invalid value for `supp_feat`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `supp_feat`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._supp_feat = supp_feat
 
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py
index a9eeeceb6706559457d964725cec2042e32eb3c8..e16230b9fcc41939819d7dc12bcd538d58e0be3f 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from api_provider_management import util
-from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails  # noqa: E501
 from api_provider_management.models.base_model import Model
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails
+from api_provider_management import util
 
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails  # noqa: E501
 
 class APIProviderEnrolmentDetailsPatch(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py
index 20cc6f7ef2fa0f0731d909c3fdc43124cf40892e..7f3bb0f7d664e9af6d55a612a0e084217e1fb557 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from api_provider_management import util
 from api_provider_management.models.base_model import Model
+from api_provider_management import util
 
 
 class ApiProviderFuncRole(Model):
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py
index 2646b41854e1b1b47300bf11e1400edf12f22934..d6989b1a97a350d8708364e3d32b27c61fc150b9 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from api_provider_management.models.base_model import Model
+from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole
+from api_provider_management.models.registration_information import RegistrationInformation
 from api_provider_management import util
+
 from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole  # noqa: E501
-from api_provider_management.models.base_model import Model
 from api_provider_management.models.registration_information import RegistrationInformation  # noqa: E501
 
-
 class APIProviderFunctionDetails(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py
index 621b8c7d108e389ec2467de39e26e0ff2a6683a5..4fd1d5c704da9d92ad275c890b9bb2fd9d8429f5 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py
@@ -1,4 +1,5 @@
 import pprint
+
 import typing
 
 from api_provider_management import util
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py
index 6d1bfc1552b2e79905697a70bc0d2cb4da885cc0..003aa181a9d0463a3f1d31ee83fc7ff6b21f5e81 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from api_provider_management import util
 from api_provider_management.models.base_model import Model
+from api_provider_management import util
 
 
 class InvalidParam(Model):
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py
index 89e0807ffc704af18bef569df3585aa7fc21e36a..7b4a267dfb81a536c436a800256cbca0194be312 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py
@@ -1,11 +1,14 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from api_provider_management import util
 from api_provider_management.models.base_model import Model
-from api_provider_management.models.invalid_param import InvalidParam  # noqa: E501
+from api_provider_management.models.invalid_param import InvalidParam
+import re
+from api_provider_management import util
 
+from api_provider_management.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
 
 class ProblemDetails(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -259,6 +262,6 @@ class ProblemDetails(Model):
         :type supported_features: str
         """
         if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
-            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py
index 5255ef8ca3e8a88be1d60af0b8b3fa4c1fb06e1b..3e4d440ccd438af954c02af936e20f10d9c8e36a 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from api_provider_management import util
 from api_provider_management.models.base_model import Model
+from api_provider_management import util
 
 
 class RegistrationInformation(Model):
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/openapi/openapi.yaml b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/openapi/openapi.yaml
index 60fd3db1a7bedc3d233410272113cd3e81095ef3..44e8f63dbcae4b3fe427a1317332b8974f75665f 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/openapi/openapi.yaml
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/openapi/openapi.yaml
@@ -4,9 +4,9 @@ info:
     \ Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights\
     \ reserved.\n"
   title: CAPIF_API_Provider_Management_API
-  version: 1.2.0-alpha.3
+  version: 1.2.0
 externalDocs:
-  description: 3GPP TS 29.222 V18.5.0 Common API Framework for 3GPP Northbound APIs
+  description: 3GPP TS 29.222 V18.6.0 Common API Framework for 3GPP Northbound APIs
   url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
 servers:
 - url: "{apiRoot}/api-provider-management/v1"
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py
index 7be5050e36aed914ad5992b3087322dc02cfb0ec..9853918d7cafeba3919e244ddc169d3e6d525449 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py
@@ -1,9 +1,10 @@
 import logging
 
 import connexion
-from api_provider_management.encoder import JSONEncoder
 from flask_testing import TestCase
 
+from api_provider_management.encoder import JSONEncoder
+
 
 class BaseTestCase(TestCase):
 
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py
index 87052d9518b34b8ef3fd5a947244085382c5c396..2b12ff853a553615823367b5f557b5ea9e39f584 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py
@@ -1,8 +1,11 @@
 import unittest
 
-from api_provider_management.test import BaseTestCase
 from flask import json
 
+from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501
+from api_provider_management.models.problem_details import ProblemDetails  # noqa: E501
+from api_provider_management.test import BaseTestCase
+
 
 class TestDefaultController(BaseTestCase):
     """DefaultController integration test stubs"""
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py
index 6d8533afd9dca27b58ee3aeea4b1d21cf2febd71..463aa435708c08be531b53dd8896fac13a92d266 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py
@@ -1,8 +1,12 @@
 import unittest
 
-from api_provider_management.test import BaseTestCase
 from flask import json
 
+from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501
+from api_provider_management.models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch  # noqa: E501
+from api_provider_management.models.problem_details import ProblemDetails  # noqa: E501
+from api_provider_management.test import BaseTestCase
+
 
 class TestIndividualAPIProviderEnrolmentDetailsController(BaseTestCase):
     """IndividualAPIProviderEnrolmentDetailsController integration test stubs"""
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py
index d21c4f633653a0eae75d04b2f6eff684ff9d200d..74e3c913a7db6246bc765f147ca872996112c6bb 100644
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py
@@ -1,6 +1,7 @@
 import sys
 
 if sys.version_info < (3, 7):
+    import typing
 
     def is_generic(klass):
         """ Determine whether klass is a generic class """
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/wsgi copy.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/wsgi copy.py
deleted file mode 100644
index 6026b0fa96078634d3455ab93d71dcdc78774276..0000000000000000000000000000000000000000
--- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/wsgi copy.py	
+++ /dev/null
@@ -1,4 +0,0 @@
-from app import app
-
-if __name__ == "__main__":
-    app.run()