diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
index 929b380..f2826a7 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
@@ -55,7 +55,7 @@
       volumes:
         - name: schema-map
           configMap:
-            name: dcae-external-repo-configmap-schema-map
+            name: {{ include "common.release" . }}-dcae-external-repo-configmap-schema-map
             defaultMode: 0755
             items:
               - key: {{ .Values.schemaMap.filename }}
diff --git a/kubernetes/dcaegen2/resources/external/map/schema-map.json b/kubernetes/dcaegen2/resources/external/map/schema-map.json
deleted file mode 100644
index a70c597..0000000
--- a/kubernetes/dcaegen2/resources/external/map/schema-map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml"
-  }
-]
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/resources/external/schema/rel16/PerDataFileReportMnS.yaml b/kubernetes/dcaegen2/resources/external/schema/rel16/PerDataFileReportMnS.yaml
deleted file mode 100644
index dfacc14..0000000
--- a/kubernetes/dcaegen2/resources/external/schema/rel16/PerDataFileReportMnS.yaml
+++ /dev/null
@@ -1,272 +0,0 @@
-openapi: 3.0.1
-info:
-  title: TS 28.532 Performance data file reporting Service
-  version: 16.4.0
-  description: >-
-    OAS 3.0.1 specification of the Performance data file reporting Management Service © 2020,
-    3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All
-    rights reserved.
-externalDocs:
-  description: 3GPP TS 28.532 V16.4.0; Generic management services
-  url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/'
-servers:
-  - url: '{MnSRoot}/PerfDataFileReportMnS/v1640'
-    variables:
-      MnSRoot:
-        description: See subclause 4.4 of TS 32.158
-        default: http://example.com/3GPPManagement
-paths:
-  /Files:
-    get:
-      summary: Read resources of information of available files
-      description: 'With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (managementDataType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned.'
-      parameters:
-        - name: managementDataType
-          in: query
-          description: This parameter identifies the type of management data that the file contains to select the resources from the collection resources identified with the path component of the URI.
-          required: true
-          $ref: '#/components/schemas/managementDataType-Type'
-        - name: beginTime
-          in: query
-          description: This parameter identifies the time stamp no later than which the file became available to select the resources from the collection resources identified with the path component of the URI.
-          required: true
-          $ref: '#/components/schemas/dateTime-Type'
-        - name: endTime
-          in: query
-          description: This parameter identifies the time stamp no earlier than which the file became available to select the resources from the collection resources identified with the path component of the URI.
-          required: true
-          $ref: '#/components/schemas/dateTime-Type'
-      responses:
-        '200':
-          description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/fileInfoRetrieval-ResponseType'
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-  /subscriptions:
-    post:
-      summary: Create a subscription
-      description: To create a subscription the representation of the subscription is POSTed on the /subscriptions collection resource.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/subscription-RequestType'
-      responses:
-        '201':
-          description: Success case ("201 Created"). The representation of the newly created subscription resource shall be returned.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/subscription-ResponseType'
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-      callbacks:
-        notifyFileReady:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyFileReady-NotifType'
-              responses:
-                '204':
-                  description: Success case ("204 No Content"). The notification is successfully delivered. The response message body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-        notifyFilePreparationError:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyFilePreparationError-NotifType'
-              responses:
-                '204':
-                  description: Success case ("204 No Content"). The notification is successfully delivered. The response message body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-    delete:
-      summary: Delete all subscriptions made with a specific consumerReferenceId
-      description: The subscriptions are deleted by deleting the corresponding subscription resources. The resources to be deleted are identified with the path component of the URI pointing to the /subscription collection resource and filtering on the consumerReferenceId provided in the query part.
-      parameters:
-        - name: consumerReferenceId
-          in: query
-          description: Identifies the subscriptions to be deleted.
-          required: true
-          schema:
-            $ref: '#/components/schemas/consumerReferenceId-QueryType'
-      responses:
-        '204':
-          description: Success case ("204 No Content"). The subscription resources have been deleted. The response message body is absent.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-  '/subscriptions/{subscriptionId}':
-    delete:
-      summary: Delete a single subscription
-      description: The subscription is deleted by deleting the corresponding subscription resource. The resource to be deleted is identified with the path component of the URI.
-      parameters:
-        - name: subscriptionId
-          in: path
-          description: Identifies the subscription to be deleted.
-          required: true
-          schema:
-            $ref: '#/components/schemas/subscriptionId-PathType'
-      responses:
-        '204':
-          description: Success case ("204 No Content"). The subscription resource has been deleted. The response message body is absent.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-components:
-  schemas:
-    dateTime-Type:
-      type: string
-      format: date-Time
-    uri-Type:
-      type: string
-    long-Type:
-      type: string
-      format: long
-    additionalText-Type:
-      type: string
-    reason-Type:
-      type: string
-    fileInfoRetrieval-ResponseType:
-      type: object
-      properties:
-        data:
-          type: array
-          items:
-            $ref: '#/components/schemas/fileInfo-Type'
-    fileInfo-Type:
-      type: object
-      properties:
-        fileLocation:
-          $ref: '#/components/schemas/uri-Type'
-        fileSize:
-          $ref: '#/components/schemas/long-Type'
-        fileReadyTime:
-          $ref: '#/components/schemas/dateTime-Type'
-        fileExpirationTime:
-          $ref: '#/components/schemas/dateTime-Type'
-        fileCompression:
-          type: string
-        fileFormat:
-          type: string
-    error-ResponseType:
-      type: object
-      properties:
-        error:
-          type: object
-          properties:
-            errorInfo:
-              type: string
-    managementDataType-Type:
-      type: string
-      enum:
-        - PM
-    header-Type:
-      description: Header used in notifications as notification header
-      type: object
-      properties:
-        uri:
-          $ref: '#/components/schemas/uri-Type'
-        notificationId:
-          $ref: '#/components/schemas/notificationId-Type'
-        notificationType:
-          $ref: '#/components/schemas/notificationType-Type'
-        eventTime:
-          $ref: '#/components/schemas/dateTime-Type'
-    subscriptionId-PathType:
-      type: string
-    filter-Type:
-      type: string
-    notificationId-Type:
-      $ref: '#/components/schemas/long-Type'
-    notificationType-Type:
-      type: string
-      enum:
-        - notifyFileReady
-        - notifyFilePreparationError
-    subscription-ResourceType:
-      type: object
-      properties:
-        consumerReference:
-          $ref: '#/components/schemas/uri-Type'
-        timeTick:
-          $ref: '#/components/schemas/long-Type'
-        filter:
-          $ref: '#/components/schemas/filter-Type'
-    subscription-RequestType:
-      type: object
-      properties:
-        data:
-          $ref: '#/components/schemas/subscription-ResourceType'
-    subscription-ResponseType:
-      type: object
-      properties:
-        data:
-          $ref: '#/components/schemas/subscription-ResourceType'
-    consumerReferenceId-QueryType:
-      $ref: '#/components/schemas/uri-Type'
-    notifyFileReady-NotifType:
-      type: object
-      properties:
-        header:
-          $ref: '#/components/schemas/header-Type'
-        body:
-          type: object
-          properties:
-            fileInfoList:
-              type: array
-              items:
-                $ref: '#/components/schemas/fileInfo-Type'
-            additionalText:
-              $ref: '#/components/schemas/additionalText-Type'
-    notifyFilePreparationError-NotifType:
-      type: object
-      properties:
-        header:
-          $ref: '#/components/schemas/header-Type'
-        body:
-          type: object
-          properties:
-            fileInfoList:
-              type: array
-              items:
-                $ref: '#/components/schemas/fileInfo-Type'
-            reason:
-              $ref: '#/components/schemas/reason-Type'
-            additionalText:
-              $ref: '#/components/schemas/additionalText-Type'
diff --git a/kubernetes/dcaegen2/resources/external/schema/rel16/faultMnS.yaml b/kubernetes/dcaegen2/resources/external/schema/rel16/faultMnS.yaml
deleted file mode 100644
index 499123b..0000000
--- a/kubernetes/dcaegen2/resources/external/schema/rel16/faultMnS.yaml
+++ /dev/null
@@ -1,1144 +0,0 @@
-openapi: 3.0.1
-info:
-  title: Fault Supervision MnS
-  version: 16.4.0
-  description: >-
-    OAS 3.0.1 definition of the Fault Supervision MnS
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-    All rights reserved.
-externalDocs:
-  description: 3GPP TS 28.532 V16.4.0; Generic management services
-  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
-servers:
-  - url: '{MnSRoot}/FaultSupervisionMnS/{version}'
-    variables:
-      MnSRoot:
-        description: See subclause 4.4.3 of TS 32.158
-        default: http://example.com/3GPPManagement
-      version:
-        description: Versi      on number of the OpenAPI definition
-        default: XXX
-paths:
-  /alarms:
-    get:
-      summary: Retrieve multiple alarms
-      description: >-
-        Retrieves the alarms identified by alarmAckState, baseObjectInstance
-        and filter.
-      parameters:
-        - name: alarmAckState
-          in: query
-          required: false
-          schema:
-            $ref: '#/components/schemas/AlarmAckState'
-        - name: baseObjectInstance
-          in: query
-          required: false
-          schema:
-            $ref: '#/components/schemas/Dn'
-        - name: filter
-          in: query
-          required: false
-          schema:
-            $ref: '#/components/schemas/Filter'
-      responses:
-        '200':
-          description: >-
-            Success case ("200 OK").
-            Returns the alarms identified in the request. The alarmId is the key
-            of the map.
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties:
-                  type: object
-                  allOf:
-                      - type: object
-                        properties:
-                          lastNotificationHeader:
-                            $ref: '#/components/schemas/NotificationHeader'
-                      - $ref: '#/components/schemas/AlarmRecord'
-                      - type: object
-                        properties:
-                          comments:
-                            $ref: '#/components/schemas/Comments'
-        default:
-          description: Response in case of error.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ErrorResponse'
-    patch:
-      summary: 'Clear, acknowledge or unacknowledge multiple alarms'
-      description: >-
-        Clears, acknowledges or unacknowledges multiple alarms using patch. Depending
-        on which action is to be performed, different merge patch documents need
-        to be used.
-      requestBody:
-        description: >-
-          Patch documents for acknowledging and unacknowledging, or clearing multiple
-          alarms. The keys in the map are the alarmIds to be patched.
-        content:
-          application/merge-patch+json:
-            schema:
-              oneOf:
-                - type: object
-                  additionalProperties:
-                    $ref: '#/components/schemas/MergePatchAcknowledgeAlarm'
-                - type: object
-                  additionalProperties:
-                    $ref: '#/components/schemas/MergePatchClearAlarm'
-      responses:
-        '204':
-          description: >-
-            Success case ("204 No content").
-            The response message body is empty.
-        default:
-          description: Response in case of error.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/FailedAlarm'
-  /alarms/alarmCount:
-    get:
-      summary: Get the alarm count per perceived severity
-      parameters:
-        - name: alarmAckState
-          in: query
-          required: false
-          schema:
-            $ref: '#/components/schemas/AlarmAckState'
-        - name: filter
-          in: query
-          required: false
-          schema:
-            type: string
-      responses:
-        '200':
-          description: >-
-            Success case ("200 OK").
-            The alarm count per perceived severity is returned.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/AlarmCount'
-        default:
-          description: Response in case of error. The error case needs rework.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ErrorResponse'
-  /alarms/{alarmId}:
-    patch:
-      summary: 'Clear, acknowledge or unacknowledge a single alarm'
-      description: >-
-        Clears, acknowledges or uncknowldeges a single alarm by patching the alarm
-        information. A conditional acknowledge request based on the perceived
-        severity is not supported.
-      parameters:
-        - name: alarmId
-          in: path
-          description: Identifies the alarm to be patched.
-          required: true
-          schema:
-            type: string
-      requestBody:
-        required: true
-        content:
-          application/merge-patch+json:
-            schema:
-              oneOf:
-                - $ref: '#/components/schemas/MergePatchAcknowledgeAlarm'
-                - $ref: '#/components/schemas/MergePatchClearAlarm'
-      responses:
-        '204':
-          description: >-
-            Success case (204 No content).
-            The response message body is absent.
-        default:
-          description: Response in case of error.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ErrorResponse'
-  /alarms/{alarmId}/comments:
-    post:
-      summary: Add a comment to a single alarm
-      description: >-
-        Adds a comment to an alarm identified by alarmId. The id of the new comment
-        is allocated by the producer.
-      parameters:
-        - name: alarmId
-          in: path
-          description: Identifies the alarm to which the comment shall be added.
-          required: true
-          schema:
-            type: string
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Comment'
-      responses:
-        '201':
-          description: >-
-            Success case (201 Created).
-            The representation of the newly created comment resource shall be returned.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Comment'
-          headers:
-            Location:
-              description: URI of the newly created comment resource.
-              required: true
-              schema:
-                type: string
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ErrorResponse'
-
-  /subscriptions:
-    post:
-      summary: Create a subscription
-      description: >-
-        To create a subscription the representation of the subscription is
-        POSTed on the /subscriptions collection resource.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Subscription'
-      responses:
-        '201':
-          description: >-
-            Success case ("201 Created").
-            The representation of the newly created subscription resource shall
-            be returned.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Subscription'
-          headers:
-            Location:
-              description: URI of the newly created subscription resource
-              required: true
-              schema:
-                type: string
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ErrorResponse'
-      callbacks:
-        notifyNewAlarm:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      oneOf:
-                        - $ref: '#/components/schemas/NotifyNewAlarm'
-                        - $ref: '#/components/schemas/NotifyNewSecAlarm'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyClearedAlarm:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/NotifyClearedAlarm'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyChangedAlarm:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/NotifyChangedAlarm'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyChangedAlarmGeneral:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      oneOf:
-                        - $ref: '#/components/schemas/NotifyChangedAlarmGeneral'
-                        - $ref: '#/components/schemas/NotifyChangedSecAlarmGeneral'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyCorrelatedNotificationChanged:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/NotifyCorrelatedNotificationChanged'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyAckStateChanged:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/NotifyAckStateChanged'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyComments:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/NotifyComments'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyPotentialFaultyAlarmList:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/NotifyPotentialFaultyAlarmList'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-        notifyAlarmListRebuilt:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/NotifyAlarmListRebuilt'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response message
-                    body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/ErrorResponse'
-  /subscriptions/{subscriptionId}:
-    delete:
-      summary: Delete a subscription
-      description: >-
-        The subscription is deleted by deleting the corresponding subscription
-        resource. The resource to be deleted is identified with the path
-        component of the URI.
-      parameters:
-        - name: subscriptionId
-          in: path
-          description: Identifies the subscription to be deleted.
-          required: true
-          schema:
-            type: string
-      responses:
-        '204':
-          description: >-
-            Success case ("204 No Content").
-            The subscription resource has been deleted. The response message body
-            is absent.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ErrorResponse'
-
-components:
-  schemas:
-  
-  #---- Definitions to be moved to comDefs.yaml --------------------------------------#
-
-    Long:
-      type: string
-      format: long
-    Float:
-      type: string
-      format: float
-    DateTime:
-      type: string
-      format: date-Time
-
-    Dn:
-      type: string
-    Uri:
-      type: string
-
-    AttributeNameValuePairSet:
-      type: object
-      minProperties: 1
-    AttributeValueChangeSet:
-      description: >-
-        The key in this map is the attribute name. The value of each key is an array.
-        When only one item is present in the array, it carries the new attribute
-        value. If two items are present, then the first item carries the old value
-        and the second item the new value. The items can be of any type including null.
-      type: object
-      additionalProperties:
-        type: array
-        minItems: 1
-        maxItems: 2
-        items:
-          nullable: true
-
-    Filter:
-      type: string
-    SystemDN:
-      type: string
-
-    NotificationId:
-      type: integer
-    NotificationHeader:
-      description: >-
-        Header used for all notification types
-      type: object
-      required:
-        - href
-        - notificationId
-        - notificationType
-        - eventTime
-        - systemDN
-      properties:
-        uri:
-          $ref: '#/components/schemas/Uri'
-        notificationId:
-          $ref: '#/components/schemas/NotificationId'
-        notificationType:
-          oneOf:
-            - $ref: '#/components/schemas/AlarmNotificationTypes'
-            #- $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes'
-            #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
-            # more to be added
-        eventTime:
-          $ref: '#/components/schemas/DateTime'
-        systemDN:
-          $ref: '#/components/schemas/SystemDN'
-
-    ErrorResponse:
-      description: >-
-        Default schema for the response message body in case the request is not
-        successful.
-      type: object
-      properties:
-        error:
-          type: object
-          properties:
-            errorInfo:
-              type: string
-
-  #---- End of definitions to be moved to comDefs.yaml -------------------------------#
-
-  #---- Definition of AlarmRecord ----------------------------------------------------#
- 
-    AlarmId:
-      type: string
-    AlarmType:
-      type: string
-      enum:
-        - COMMUNICATIONS_ALARM
-        - QUALITY_OF_SERVICE_ALARM
-        - PROCESSING_ERROR_ALARM
-        - EQUIPMENT_ALARM
-        - ENVIRONMENTAL_ALARM
-        - INTEGRITY_VIOLATION
-        - OPERATIONAL_VIOLATION
-        - PHYSICAL_VIOLATION
-        - SECURITY_SERVICE_OR_MECHANISM_VIOLATION
-        - TIME_DOMAIN_VIOLATION
-    ProbableCause:
-      description: >-
-        The value of the probable cause may be a specific standardized string, or any
-        vendor provided string. Probable cause strings are not standardized in the
-        present document. They may be added in a future version. Up to then the
-        mapping of the generic probable cause strings "PROBABLE_CAUSE_001" to
-        "PROBABLE_CAUSE_005" is vendor specific.
-        The value of the probable cause may also be an integer. The mapping of integer
-        values to probable causes is vendor specific.
-      oneOf:
-        - anyOf:
-            - type: string
-              enum:
-                - PROBABLE_CAUSE_001
-                - PROBABLE_CAUSE_002
-                - PROBABLE_CAUSE_003
-                - PROBABLE_CAUSE_004
-                - PROBABLE_CAUSE_005
-            - type: string
-        - type: integer
-    SpecificProblem:
-      oneOf:
-        - type: string
-        - type: integer
-    PerceivedSeverity:
-      type: string
-      enum:
-        - INDETERMINATE
-        - CRITICAL
-        - MAJOR
-        - MINOR
-        - WARNING
-        - CLEARED
-    TrendIndication:
-      type: string
-      enum:
-        - MORE_SEVERE
-        - NO_CHANGE
-        - LESS_SEVERE
-    ThresholdHysteresis:
-      type: object
-      required:
-        - high
-      properties:
-        high:
-          oneOf:
-            - type: integer
-            - $ref: '#/components/schemas/Float'
-        low:
-          $ref: '#/components/schemas/Float'
-    ThresholdLevelInd:
-      type: object
-      required:
-        - up
-      properties:
-        up:
-          $ref: '#/components/schemas/ThresholdHysteresis'
-        low:
-          $ref: '#/components/schemas/ThresholdHysteresis'
-    ThresholdInfo:
-      type: object
-      required:
-        - observedMeasurement
-        - observedValue
-      properties:
-        observedMeasurement:
-          type: string
-        observedValue:
-          oneOf:
-            - type: integer
-            - $ref: '#/components/schemas/Float'
-        thresholdLevelInd:
-          $ref: '#/components/schemas/ThresholdLevelInd'
-        armTime:
-          $ref: '#/components/schemas/DateTime'
-    CorrelatedNotification:
-      type: object
-      required:
-        - source
-        - notificationId
-      properties:
-        sourceObjectInstance:
-          $ref: '#/components/schemas/Dn'
-        notificationIds:
-          type: array
-          items:
-            $ref: '#/components/schemas/NotificationId'
-    CorrelatedNotifications:
-      type: array
-      items:
-        $ref: '#/components/schemas/CorrelatedNotification'
-    AckState:
-      type: string
-      enum:
-        - ACKNOWLEDGED
-        - UNACKNOWLEDGED
-
-    AlarmRecord:
-      description: >-
-        The alarmId is not a property of an alarm record. It is used as key
-        in the map of alarm records instead.
-      type: object
-      properties:
-        # alarmId:
-        #  $ref: '#/components/schemas/AlarmId'
-        objectInstance:
-          $ref: '#/components/schemas/Dn'
-        notificationId:
-          $ref: '#/components/schemas/NotificationId'
-        alarmRaisedTime:
-          $ref: '#/components/schemas/DateTime'
-        alarmChangedTime:
-          $ref: '#/components/schemas/DateTime'
-        alarmClearedTime:
-          $ref: '#/components/schemas/DateTime'
-        alarmType:
-          $ref: '#/components/schemas/AlarmType'
-        probableCause:
-          $ref: '#/components/schemas/ProbableCause'
-        specificProblem:
-          $ref: '#/components/schemas/SpecificProblem'
-        perceivedSeverity:
-          $ref: '#/components/schemas/PerceivedSeverity'
-        backedUpStatus:
-          type: boolean
-        backUpObject:
-          $ref: '#/components/schemas/Dn'
-        trendIndication:
-          $ref: '#/components/schemas/TrendIndication'
-        thresholdinfo:
-          $ref: '#/components/schemas/ThresholdInfo'
-        correlatedNotifications:
-          $ref: '#/components/schemas/CorrelatedNotifications'
-        stateChangeDefinition:
-          $ref: '#/components/schemas/AttributeValueChangeSet'
-        monitoredAttributes:
-          $ref: '#/components/schemas/AttributeNameValuePairSet'
-        proposedRepairActions:
-          type: string
-        additionalText:
-          type: string
-        additionalInformation:
-          $ref: '#/components/schemas/AttributeNameValuePairSet'
-
-        rootCauseIndicator:
-          type: boolean
-
-        ackTime:
-          $ref: '#/components/schemas/DateTime'
-        ackUserId:
-          type: string
-        ackSystemId:
-          type: string
-        ackState:
-          $ref: '#/components/schemas/AckState'
-
-        clearUserId:
-          type: string
-        clearSystemId:
-          type: string
-        serviceUser:
-          type: string
-        serviceProvider:
-          type: string
-        securityAlarmDetector:
-          type: string
-
-  #---- Definition of alarm notifications --------------------------------------------#
-  
-    AlarmNotificationTypes:
-      type: string
-      enum:
-        - notifyNewAlarm
-        - notifyChangedAlarm
-        - notifyChangedAlarmGeneral
-        - notifyAckStateChanged
-        - notifyCorrelatedNotificationChanged
-        - notifyComments
-        - notifyClearedAlarm
-        - notifyAlarmListRebuiltAlarm
-        - notifyPotentialFaultyAlarmList
-    AlarmListAlignmentRequirement:
-      type: string
-      enum:
-        - ALIGNMENT_REQUIRED
-        - ALIGNMENT_NOT_REQUIRED
-
-    NotifyNewAlarm:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            specificProblem:
-              $ref: '#/components/schemas/SpecificProblem'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-            backedUpStatus:
-              type: boolean
-            backUpObject:
-              $ref: '#/components/schemas/Dn'
-            trendIndication:
-              $ref: '#/components/schemas/TrendIndication'
-            thresholdInfo:
-              $ref: '#/components/schemas/ThresholdInfo'
-            correlatedNotifications:
-              $ref: '#/components/schemas/CorrelatedNotifications'
-            stateChangeDefinition:
-              $ref: '#/components/schemas/AttributeValueChangeSet'
-            monitoredAttributes:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-            proposedRepairActions:
-              type: string
-            additionalText:
-              type: string
-            additionalInformation:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-            rootCauseIndicator:
-              type: boolean
-    NotifyNewSecAlarm:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-            - serviceUser
-            - serviceProvider
-            - securityAlarmDetector 
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-            correlatedNotifications:
-              $ref: '#/components/schemas/CorrelatedNotifications'
-            additionalText:
-              type: string
-            additionalInformation:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-            rootCauseIndicator:
-              type: boolean
-            serviceUser:
-              type: string
-            serviceProvider:
-              type: string
-            securityAlarmDetector:
-              type: string
-    NotifyClearedAlarm:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-            correlatedNotifications:
-              $ref: '#/components/schemas/CorrelatedNotifications'
-            clearUserId:
-              type: string
-            clearSystemId:
-              type: string
-    NotifyChangedAlarm:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-    NotifyChangedAlarmGeneral:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-            - changedAlarmAttributes
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            specificProblem:
-              $ref: '#/components/schemas/SpecificProblem'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-            correlatedNotifications:
-              $ref: '#/components/schemas/CorrelatedNotifications'
-            backedUpStatus:
-              type: boolean
-            backUpObject:
-              $ref: '#/components/schemas/Dn'
-            trendIndication:
-              $ref: '#/components/schemas/TrendIndication'
-            thresholdInfo:
-              $ref: '#/components/schemas/ThresholdInfo'
-            stateChangeDefinition:
-              $ref: '#/components/schemas/AttributeValueChangeSet'
-            monitoredAttributes:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-            proposedRepairActions:
-              type: string
-            additionalText:
-              type: string
-            additionalInformation:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-            rootCauseIndicator:
-              type: boolean
-            changedAlarmAttributes:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-    NotifyChangedSecAlarmGeneral:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-            - serviceUser
-            - serviceProvider
-            - securityAlarmDetector
-            - changedAlarmAttributes
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-            correlatedNotifications:
-              $ref: '#/components/schemas/CorrelatedNotifications'
-            additionalText:
-              type: string
-            additionalInformation:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-            rootCauseIndicator:
-              type: boolean
-            serviceUser:
-              type: string
-            serviceProvider:
-              type: string
-            securityAlarmDetector:
-              type: string
-            changedAlarmAttributes:
-              $ref: '#/components/schemas/AttributeNameValuePairSet'
-    NotifyCorrelatedNotificationChanged:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - correlatedNotifications
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            correlatedNotifications:
-              $ref: '#/components/schemas/CorrelatedNotifications'
-            rootCauseIndicator:
-              type: boolean
-    NotifyAckStateChanged:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-            - ackState
-            - ackUserId
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-            ackState:
-              $ref: '#/components/schemas/AckState'
-            ackUserId:
-              type: string
-            ackSystemId:
-              type: string
-    NotifyComments:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - alarmId
-            - alarmType
-            - probableCause
-            - perceivedSeverity
-            - comments
-          properties:
-            alarmId:
-              $ref: '#/components/schemas/AlarmId'
-            alarmType:
-              $ref: '#/components/schemas/AlarmType'
-            probableCause:
-              $ref: '#/components/schemas/ProbableCause'
-            perceivedSeverity:
-              $ref: '#/components/schemas/PerceivedSeverity'
-            comments:
-              $ref: '#/components/schemas/Comments'
-    NotifyPotentialFaultyAlarmList:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - reason
-          properties:
-            reason:
-              type: string
-    NotifyAlarmListRebuilt:
-      allOf:
-        - $ref: '#/components/schemas/NotificationHeader'
-        - type: object
-          required:
-            - reason
-          properties:
-            reason:
-              type: string
-            alarmListAlignmentRequirement:
-              $ref: '#/components/schemas/AlarmListAlignmentRequirement'
-
-  #---- Definition of query parameters -----------------------------------------------#
-  
-    AlarmAckState:
-      type: string
-      enum:
-        - ALL_ALARMS
-        - ALL_ACTIVE_ALARMS
-        - ALL_ACTIVE_AND_ACKNOWLEDGED_ALARMS
-        - ALL_ACTIVE_AND_UNACKNOWLEDGED_ALARMS
-        - ALL_CLEARED_AND_UNACKNOWLEDGED_ALARMS
-        - ALL_UNACKNOWLEDGED_ALARMS
-        
-  #---- Definition of patch documents ------------------------------------------------#
-
-    MergePatchAcknowledgeAlarm:
-      description: >-
-        Patch document acknowledging or unacknowledging a single alarm. For
-        acknowleding an alarm the value of ackState is ACKNOWLEDGED, for unacknowleding
-        an alarm the value of ackState is UNACKNOWLEDGED.
-      type: object
-      required:
-        - ackUserId
-        - ackState
-      properties:
-        ackUserId:
-          type: string
-        ackSystemId:
-          type: string
-        ackState:
-          $ref: '#/components/schemas/AckState'
-    MergePatchClearAlarm:
-      description: Patch document for clearing a single alarm
-      type: object
-      required:
-        - clearUserId
-        - perceivedSeverity
-      properties:
-        clearUserId:
-          type: string
-        clearSystemId:
-          type: string
-        perceivedSeverity:
-          type: string
-          enum:
-            - CLEARED
-
-  #---- Definition of method responses -----------------------------------------------#
-
-    FailedAlarm:
-      type: object
-      required:
-        - alarmId
-        - failureReason
-      properties:
-        alarmId:
-          $ref: '#/components/schemas/AlarmId'
-        failureReason:
-          type: string
-
-  #---- Definition of resources ------------------------------------------------------#
-
-    AlarmCount:
-      type: object
-      required:
-        - criticalCount
-        - majorCount
-        - minorCount
-        - warningCount
-        - indeterminateCount
-        - clearedCount
-      properties:
-        criticalCount:
-          type: integer
-        majorCount:
-          type: integer
-        minorCount:
-          type: integer
-        warningCount:
-          type: integer
-        indeterminateCount:
-          type: integer
-        clearedCount:
-          type: integer
-    Comment:
-      type: object
-      properties:
-        commentTime:
-          $ref: '#/components/schemas/DateTime'
-        commentUserId:
-          type: string
-        commentSystemId:
-          type: string
-        commentText:
-          type: string
-    Comments:
-      description: >-
-        Collection of comments. The comment identifiers are allocated by the
-        MnS producer and used as key in the map.
-      type: object
-      additionalProperties:
-        $ref: '#/components/schemas/Comment'
-    Subscription:
-      type: object
-      properties:
-        consumerReference:
-          $ref: '#/components/schemas/Uri'
-        timeTick:
-          $ref: '#/components/schemas/Long'
-        filter:
-          $ref: '#/components/schemas/Filter'
diff --git a/kubernetes/dcaegen2/resources/external/schema/rel16/heartbeatNtf.yaml b/kubernetes/dcaegen2/resources/external/schema/rel16/heartbeatNtf.yaml
deleted file mode 100644
index afde506..0000000
--- a/kubernetes/dcaegen2/resources/external/schema/rel16/heartbeatNtf.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-openapi: 3.0.1
-info:
-  title: Heartbeat notification
-  version: 16.3.0
-  description: >-
-    OAS 3.0.1 specification of the heartbeat notification
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-    All rights reserved.
-externalDocs:
-  description: 3GPP TS 28.532 V16.3.0; Heartbeat notification
-  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/
-paths: {}
-components:
-  schemas:
-    hearbeatNtfPeriod-Type:
-      type: integer
-    notifyHeartbeat-NotifType:
-      allOf:
-        - $ref: 'provMnS.yaml#/components/schemas/header-Type'
-        - type: object
-          properties:
-            heartbeatNtfPeriod:
-              $ref: '#/components/schemas/hearbeatNtfPeriod-Type'
diff --git a/kubernetes/dcaegen2/resources/external/schema/rel16/provMnS.yaml b/kubernetes/dcaegen2/resources/external/schema/rel16/provMnS.yaml
deleted file mode 100644
index b2f84a4..0000000
--- a/kubernetes/dcaegen2/resources/external/schema/rel16/provMnS.yaml
+++ /dev/null
@@ -1,579 +0,0 @@
-openapi: 3.0.1
-info:
-  title: Provisioning MnS
-  version: 16.4.0
-  description: >-
-    OAS 3.0.1 definition of the Provisioning MnS
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-    All rights reserved.
-externalDocs:
-  description: 3GPP TS 28.532 V16.4.0; Generic management services
-  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
-servers:
-  - url: 'http://{URI-DN-prefix}/{root}/ProvMnS/v1640/{LDN-first-part}'
-    variables:
-      URI-DN-prefix:
-        description: See subclause 4.4 of TS 32.158
-        default: example.com
-      root:
-        description: See subclause 4.4 of TS 32.158
-        default: 3GPPManagement
-      LDN-first-part:
-        description: See subclause 4.4 of TS 32.158
-        default: ''
-paths:
-  '/{className}={id}':
-    parameters:
-      - name: className
-        in: path
-        required: true
-        schema:
-          $ref: '#/components/schemas/className-PathType'
-      - name: id
-        in: path
-        required: true
-        schema:
-          $ref: '#/components/schemas/id-PathType'
-    put:
-      summary: Replaces a complete single resource or creates it if it does not exist
-      description: >-
-        With HTTP PUT a complete resource is replaced or created if it does not
-        exist. The target resource is identified by the target URI.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/resourcePut-RequestType'
-      responses:
-        '200':
-          description: >-
-            Success case ("200 OK").
-            This status code shall be returned when the resource is replaced, and
-            when the replaced resource representation is not identical to the resource
-            representation in the request.
-            This status code may be retourned when the resource is updated and when the
-            updated resource representation is identical to the resource representation
-            in the request.
-            The representation of the updated resource is returned in the response
-            message body.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/resourceUpdate-ResponseType'
-        '201':
-          description: >-
-            Success case ("201 Created").
-            This status code shall be returned when the resource is created.
-            The representation of the created resource is returned in the response
-            message body.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/resourceCreation-ResponseType'
-        '204':
-          description: >-
-            Success case ("204 No Content").
-            This status code may be returned only when the replaced resource
-            representation is identical to the representation in the request.
-            The response has no message body.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-      callbacks:
-        notifyMOICreation:
-          '{request.body#/notificationRecipientAddress}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyMOICreation-NotifType'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response
-                    has no message body.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-        notifyMOIDeletion:
-          '{request.body#/notificationRecipientAddress}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyMOIDeletion-NotifType'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response
-                    has no message body.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-        notifyMOIAttributeValueChange:
-          '{request.body#/notificationRecipientAddress}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyMOIAttributeValueChange-NotifType'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response
-                    has no message body.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-        notifyMOIChanges:
-          '{request.body#/notificationRecipientAddress}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyMOIChanges-NotifType'
-              responses:
-                '204':
-                  description: >-
-                    Success case ("204 No Content").
-                    The notification is successfully delivered. The response
-                    has no message body.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-    get:
-      summary: Reads one or multiple resources
-      description: >-
-        With HTTP GET resources are read. The resources to be retrieved are
-        identified with the target URI. The attributes and fields parameter
-        of the query components allow to select the resource properties to be returned.
-      parameters:
-        - name: scope
-          in: query
-          description: >-
-            This parameter extends the set of targeted resources beyond the base
-            resource identified with the path component of the URI. No scoping
-            mechanism is specified in the present document.
-          required: false
-          schema:
-            $ref: '#/components/schemas/scope-QueryType'
-          style: form
-          explode: true
-        - name: filter
-          in: query
-          description: >-
-            This parameter reduces the targeted set of resources by applying a
-            filter to the scoped set of resource representations. Only resource
-            representations for which the filter construct evaluates to "true"
-            are targeted. No filter language is specified in the present
-            document.
-          required: false
-          schema:
-            $ref: '#/components/schemas/filter-QueryType'
-        - name: attributes
-          in: query
-          description: >-
-            This parameter specifies the attributes of the scoped resources that
-            are returned.
-          required: true
-          schema:
-            $ref: '#/components/schemas/attributes-QueryType'
-          style: form
-          explode: false
-        - name: fields
-          in: query
-          description: >-
-            This parameter specifies the attribute field of the scoped resources
-            that are returned.
-          required: false
-          schema:
-            $ref: '#/components/schemas/fields-QueryType'
-          style: form
-          explode: false
-      responses:
-        '200':
-          description: >-
-            Success case ("200 OK").
-            The resources identified in the request for retrieval are returned
-            in the response message body. In case the attributes or fields query
-            parameters are used, only the selected attributes or sub-attributes are
-            returned. The response message body is constructed according to the
-            hierarchical response construction method (TS 32.158 [15]).
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/resourceRetrieval-ResponseType'
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-    patch:
-      summary: Patches one or multiple resources
-      description: >-
-        With HTTP PATCH resources are created, updated or deleted. The resources
-        to be modified are identified with the target URI (base resource) and
-        the patch document included in the request message body.
-      requestBody:
-        description: >-
-          The request body describes changes to be made to the target resources.
-          The following patch media types are available
-            - "application/merge-patch+json" (RFC 7396)
-            - "application/3gpp-merge-patch+json" (TS 32.158)
-            - "application/json-patch+json" (RFC 6902)
-            - "application/3gpp-json-patch+json" (TS 32.158)
-        required: true
-        content:
-          application/merge-patch+json:
-            schema:
-              $ref: '#/components/schemas/jsonMergePatch-RequestType'
-          application/3gpp-merge-patch+json:
-            schema:
-              $ref: '#/components/schemas/3gppJsonMergePatch-RequestType'
-          application/json-patch+json:
-            schema:
-              $ref: '#/components/schemas/jsonPatch-RequestType'
-          application/3gpp-json-patch+json:
-            schema:
-              $ref: '#/components/schemas/3gppJsonPatch-RequestType'
-      responses:
-        '200':
-          description: >-
-            Success case ("200 OK").
-            This status code is returned when the updated the resource representations
-            shall be returned for some reason.
-            The resource representations are returned in the response message body. The
-            response message body is constructed according to the hierarchical response
-            construction method (TS 32.158 [15])
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/resourceUpdate-ResponseType'
-        '204':
-          description: >-
-            Success case ("204 No Content").
-            This status code is returned when there is no need to return the updated
-            resource representations.
-            The response message body is empty.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-    delete:
-      summary: Deletes one or multiple resources
-      description: >-
-        With HTTP DELETE resources are deleted. The resources to be deleted are
-        identified with the target URI.
-      parameters:
-        - name: scope
-          in: query
-          description: >-
-            This parameter extends the set of targeted resources beyond the base
-            resource identified with the path component of the URI. No scoping
-            mechanism is specified in the present document.
-          required: false
-          schema:
-            $ref: '#/components/schemas/scope-QueryType'
-        - name: filter
-          in: query
-          description: >-
-            This parameter reduces the targeted set of resources by applying a
-            filter to the scoped set of resource representations. Only resources
-            representations for which the filter construct evaluates to "true"
-            are returned. No filter language is specified in the present
-            document.
-          required: false
-          schema:
-            $ref: '#/components/schemas/filter-QueryType'
-      responses:
-        '200':
-          description: >-
-            Success case ("200 OK").
-            This status code shall be returned, when query parameters are present in
-            the request and one or multiple resources are deleted.
-            The URIs of the deleted resources are returned in the response message body.
-        '204':
-          description: >-
-            Success case ("204 No Content").
-            This status code shall be returned, when no query parameters are present in
-            the request and only one resource is deleted.
-            The message body is empty.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/resourceDeletion-ResponseType'
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-components:
-  schemas:
-    dateTime-Type:
-      type: string
-      format: date-time
-    long-Type:
-      type: integer
-      format: int64
-    uri-Type:
-      type: string
-    correlatedNotification-Type:
-      type: object
-      properties:
-        source:
-          $ref: '#/components/schemas/uri-Type'
-        notificationIds:
-          type: array
-          items:
-            $ref: '#/components/schemas/notificationId-Type'
-    notificationId-Type:
-      $ref: '#/components/schemas/long-Type'
-    notificationType-Type:
-      type: string
-      enum:
-        - notifyMOICreation
-        - notifyMOIDeletion
-        - notifyMOIAttributeValueChange
-    systemDN-Type:
-      type: string
-    additionalText-Type:
-      type: string
-    sourceIndicator-Type:
-      type: string
-      enum:
-        - resourceOperation
-        - mangementOperation
-        - sONOperation
-        - unknown
-    header-Type:
-      type: object
-      properties:
-        href:
-          $ref: '#/components/schemas/uri-Type'
-        notificationId:
-          $ref: '#/components/schemas/notificationId-Type'
-        notificationType:
-          $ref: '#/components/schemas/notificationType-Type'
-        eventTime:
-          $ref: '#/components/schemas/dateTime-Type'
-        systemDN:
-          $ref: '#/components/schemas/systemDN-Type'
-      required:
-        - href
-        - notificationId
-        - notificationType
-        - eventTime
-        - systemDN
-    scopeType-Type:
-      type: string
-      enum:
-        - BASE_ONLY
-        - BASE_NTH_LEVEL
-        - BASE_SUBTREE
-        - BASE_ALL
-    scopeLevel-Type:
-      type: integer
-    className-PathType:
-      type: string
-    id-PathType:
-      type: string
-    attributes-QueryType:
-      type: array
-      items:
-        type: string
-    fields-QueryType:
-      type: array
-      items:
-        type: string
-    filter-QueryType:
-      type: string
-    scope-QueryType:
-      type: object
-      properties:
-        scopeType:
-          $ref: '#/components/schemas/scopeType-Type'
-        scopeLevel:
-          $ref: '#/components/schemas/scopeLevel-Type'
-
-    resourcePut-RequestType:
-      $ref: '#/components/schemas/resourceRepresentation-Type'
-    jsonMergePatch-RequestType:
-      $ref: '#/components/schemas/resourceRepresentation-Type'
-    3gppJsonMergePatch-RequestType:
-      $ref: '#/components/schemas/resourceRepresentation-Type'
-    jsonPatch-RequestType:
-      type: array
-      items:
-        type: object
-    3gppJsonPatch-RequestType:
-      type: array
-      items:
-        type: object
-
-    error-ResponseType:
-      type: object
-      properties:
-        error:
-          type: object
-          properties:
-            errorInfo:
-              type: string
-    resourceRetrieval-ResponseType:
-      $ref: '#/components/schemas/resourceRepresentation-Type'
-    resourceCreation-ResponseType:
-      $ref: '#/components/schemas/resourceRepresentation-Type'
-    resourceUpdate-ResponseType:
-      $ref: '#/components/schemas/resourceRepresentation-Type'
-    resourceDeletion-ResponseType:
-      type: array
-      items:
-        $ref: '#/components/schemas/uri-Type'
-
-    resourceRepresentation-Type:
-      oneOf:
-        - type: object
-          properties:
-            id:
-              type: string
-            attributes:
-              type: object
-          additionalProperties:
-            type: array
-            items:
-              type: object
-        - anyOf:
-            - $ref: 'genericNrm.yaml#/components/schemas/resources-genericNrm'
-            - $ref: 'nrNrm.yaml#/components/schemas/resources-nrNrm'
-            - $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm'
-            - $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm'
-
-    mOIChange-Type:
-      type: object
-      properties:
-        notificationId:
-          $ref: '#/components/schemas/notificationId-Type'
-        correlatedNotifications:
-          type: array
-          items:
-            $ref: '#/components/schemas/correlatedNotification-Type'
-        additionalText:
-          $ref: '#/components/schemas/additionalText-Type'
-        sourceIndicator:
-          $ref: '#/components/schemas/sourceIndicator-Type'
-        path:
-          $ref: '#/components/schemas/uri-Type'
-        operation:
-          type: string
-          enum:
-            - CREATE
-            - DELETE
-            - REPLACE
-        value:
-          oneOf:
-            - type: object
-              additionalProperties:
-                nullable: true
-            - type: array
-              items:
-                type: object
-              minItems: 1
-              maxItems: 2
-
-    notifyMOICreation-NotifType:
-      allOf:
-        - $ref: '#/components/schemas/header-Type'
-        - type: object
-          properties:
-            correlatedNotifications:
-              type: array
-              items:
-                $ref: '#/components/schemas/correlatedNotification-Type'
-            additionalText:
-              $ref: '#/components/schemas/additionalText-Type'
-            sourceIndicator:
-              $ref: '#/components/schemas/sourceIndicator-Type'
-            attributeList:
-              type: object
-              additionalProperties:
-                nullable: true
-    notifyMOIDeletion-NotifType:
-      allOf:
-        - $ref: '#/components/schemas/header-Type'
-        - type: object
-          properties:
-            correlatedNotifications:
-              type: array
-              items:
-                $ref: '#/components/schemas/correlatedNotification-Type'
-            additionalText:
-              $ref: '#/components/schemas/additionalText-Type'
-            sourceIndicator:
-              $ref: '#/components/schemas/sourceIndicator-Type'
-            attributeList:
-              type: object
-              additionalProperties: true
-    notifyMOIAttributeValueChange-NotifType:
-      allOf:
-        - $ref: '#/components/schemas/header-Type'
-        - type: object
-          properties:
-            correlatedNotifications:
-              type: array
-              items:
-                $ref: '#/components/schemas/correlatedNotification-Type'
-            additionalText:
-              $ref: '#/components/schemas/additionalText-Type'
-            sourceIndicator:
-              $ref: '#/components/schemas/sourceIndicator-Type'
-            attributeValueChange:
-              type: object
-              additionalProperties:
-                type: array
-                minItems: 1
-                maxItems: 2
-                items:
-                  nullable: true
-          required:
-            - attributeValueChange
-    notifyMOIChanges-NotifType:
-      allOf:
-        - $ref: '#/components/schemas/header-Type'
-        - type: object
-          properties:
-            mOIChanges:
-              type: array
-              items:
-                $ref: '#/components/schemas/mOIChange-Type'
-          required:
-            - mOIChanges
diff --git a/kubernetes/dcaegen2/templates/configmap.yaml b/kubernetes/dcaegen2/templates/configmap.yaml
index a9917a5..8a389ed 100644
--- a/kubernetes/dcaegen2/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/templates/configmap.yaml
@@ -24,19 +24,3 @@
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: dcae-external-repo-configmap-schema-map
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ (.Files.Glob "resources/external/map/*").AsConfig | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: dcae-external-repo-configmap-sa88-rel16
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ (.Files.Glob "resources/external/schema/rel16/*").AsConfig | indent 2 }}