diff --git a/doc/addons/camara/images/CAMARA-QoDProvisioning-API-Endpoints.png b/doc/addons/camara/images/CAMARA-QoDProvisioning-API-Endpoints.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0fee4ea886564af09d804abc4343151d9dfa1c1
Binary files /dev/null and b/doc/addons/camara/images/CAMARA-QoDProvisioning-API-Endpoints.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-Architecture.png b/doc/addons/camara/images/CAMARAaaS-Architecture.png
new file mode 100644
index 0000000000000000000000000000000000000000..16a8d378264e92aaf0d214026dd7a5883833d838
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-Architecture.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Active-Services.png b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Active-Services.png
new file mode 100644
index 0000000000000000000000000000000000000000..0db82e2ade75e445b0d6bc15f4f3c1712ccfda21
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Active-Services.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-CR.png b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-CR.png
new file mode 100644
index 0000000000000000000000000000000000000000..f13ab200fc2134da69c27ded1046dc7d6415ed28
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-CR.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Characteristics-After-CAMARA-Invoking.png b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Characteristics-After-CAMARA-Invoking.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5a0b0f1db42fadae5c950e3f55badba479b713d
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Characteristics-After-CAMARA-Invoking.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Characteristics.png b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Characteristics.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b03b17eb2749f8df9cfaf44e5f6f3840e98376
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Characteristics.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Ordering.png b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Ordering.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f85d2a8ce4a850ef7a896b22f3f33f5989511e8
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Ordering.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Pre-Provision-Rule.png b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Pre-Provision-Rule.png
new file mode 100644
index 0000000000000000000000000000000000000000..09bd1f6d7b6b14da0e90736be41386e8fa30e5d9
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Pre-Provision-Rule.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Supervision-Rule.png b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Supervision-Rule.png
new file mode 100644
index 0000000000000000000000000000000000000000..e08ec3ea0816e5b2ce8d8cc57854afb76ac407f6
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-QoD-Prov-API-Supervision-Rule.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-Workflow-OSLToday.png b/doc/addons/camara/images/CAMARAaaS-Workflow-OSLToday.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f0e3c285aaec4a12d26e0acdc606be09be2a3a8
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-Workflow-OSLToday.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-Workflow-ServiceOperation.png b/doc/addons/camara/images/CAMARAaaS-Workflow-ServiceOperation.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a451b2ecba49978c734dd05c753737889231423
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-Workflow-ServiceOperation.png differ
diff --git a/doc/addons/camara/images/CAMARAaaS-Workflow-ServiceOrdering.png b/doc/addons/camara/images/CAMARAaaS-Workflow-ServiceOrdering.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b10df21a6eac26d73d4ab60d3c6af464b461a9f
Binary files /dev/null and b/doc/addons/camara/images/CAMARAaaS-Workflow-ServiceOrdering.png differ
diff --git a/doc/addons/camara/images/DummyOperatorService-Characteristics-After-CAMARA-Invoking.png b/doc/addons/camara/images/DummyOperatorService-Characteristics-After-CAMARA-Invoking.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fa0a94c30341b6f031e8c16dee8e0cabd905061
Binary files /dev/null and b/doc/addons/camara/images/DummyOperatorService-Characteristics-After-CAMARA-Invoking.png differ
diff --git a/doc/addons/camara/images/DummyOperatorService-CustomResource.png b/doc/addons/camara/images/DummyOperatorService-CustomResource.png
new file mode 100644
index 0000000000000000000000000000000000000000..97b9452c42aba6ac7e5e726d99e176fdb7814786
Binary files /dev/null and b/doc/addons/camara/images/DummyOperatorService-CustomResource.png differ
diff --git a/doc/addons/camara/images/DummyOperatorService-Pre-Provision-Rule.png b/doc/addons/camara/images/DummyOperatorService-Pre-Provision-Rule.png
new file mode 100644
index 0000000000000000000000000000000000000000..8de481239e3954ee2f33d9a75d01e2b868ec0757
Binary files /dev/null and b/doc/addons/camara/images/DummyOperatorService-Pre-Provision-Rule.png differ
diff --git a/doc/addons/camara/images/DummyOperatorService-ResourceInventory.png b/doc/addons/camara/images/DummyOperatorService-ResourceInventory.png
new file mode 100644
index 0000000000000000000000000000000000000000..7864d9534f868b101e55ff6d10d0298f443f61a3
Binary files /dev/null and b/doc/addons/camara/images/DummyOperatorService-ResourceInventory.png differ
diff --git a/doc/addons/camara/images/DummyOperatorService-ServiceOrder.png b/doc/addons/camara/images/DummyOperatorService-ServiceOrder.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0054c319c533a78a906fe2222944bfd525b17ed
Binary files /dev/null and b/doc/addons/camara/images/DummyOperatorService-ServiceOrder.png differ
diff --git a/doc/addons/camara/images/DummyOperatorService-Supervision-Rule.png b/doc/addons/camara/images/DummyOperatorService-Supervision-Rule.png
new file mode 100644
index 0000000000000000000000000000000000000000..853e3bd0a8590a31e9a142fb910f37fe7d7b672a
Binary files /dev/null and b/doc/addons/camara/images/DummyOperatorService-Supervision-Rule.png differ
diff --git a/doc/addons/camara/images/QoDProvisioningAPI-Docs.png b/doc/addons/camara/images/QoDProvisioningAPI-Docs.png
new file mode 100644
index 0000000000000000000000000000000000000000..228fa75ab819509f16da8f20a2a7c5412bc1141d
Binary files /dev/null and b/doc/addons/camara/images/QoDProvisioningAPI-Docs.png differ
diff --git a/doc/addons/camara/intro.md b/doc/addons/camara/intro.md
new file mode 100644
index 0000000000000000000000000000000000000000..c9532b9ee48b78b46ee26dbd6141eeabd47ba5fe
--- /dev/null
+++ b/doc/addons/camara/intro.md
@@ -0,0 +1,140 @@
+
+# CAMARAaaS Addon
+
+## Introduction
+
+The **CAMARA as a Service (CAMARAaaS) OSL Add-on** is a prototype service developed by OSL and allows users of OSL to expose CAMARA APIs for their TMF-based services. By doing so, it enables runtime operations, such as enforcing profiles on User Equipment (UEs) or updating 5G Network Slice characteristics, using standardized CAMARA API endpoints. The work is in progress for future enhancements (e.g. multi-tenancy, etc). 
+
+In a nutshell, CAMARAaaS add-on performs API transformations from CAMARA API model to TMF API model and vice-versa.
+
+The supporting use case is the following:
+
+- An OSL Service Provider (e.g. an Operator) has a running 5G Core (e.g. from another service order in OSL).
+- The running service exposes already some characteristics (i.e. via TMF Service Inventory) that can be configured. Thus, someone can reconfigure the latter during runtime (e.g. change the quality of a slice via a TMF API service request).
+- On a subsequent step, the Service Provider makes a Service Order in OSL to expose this running 5G Core service via a CAMARA API endpoint.
+- The CAMARAaaS add-on is a wrapper between the CAMARA requests and the TMF API Service Inventory models. These CAMARA APIs will then be used to control the lifecycle and the operations that shall take place in an already existing OSL Service.
+
+Therefore, these are the key features of this add-on:
+
+- **Seamless Integration**: Operators can expose their existing OSL Services through CAMARA APIs, maintaining consistency with the OSL framework while offering additional accessibility.
+- **Dynamic Service Control**: Allows runtime updates to characteristics of 5G-related Services, such as UE profiles or Network Slices, via CAMARA REST API calls. The updated characteristics of a Service can then be consumed by a Kubernetes Custom Resource that will produce an operation according to the updated characteristics.
+
+## Architectural Approach and Service Interactions
+
+The add-on introduces a generic **CAMARA API Service**, which acts as a wrapper for existing (running) services registered in TMF Service Inventory. The architecture ensures:
+
+1. **API Exposure**: CAMARA APIs are orchestrated by OSL (offered as-a-service) and their endpoints are exposed to the end-users (clients).
+2. **Service Mapping**: The CAMARA API Service references a running service (identified by a unique UUID), enabling targeted operations. The invoking of CAMARA API endpoints will result in updates in the running service’s characteristics.
+3. **Operational Flow**: Updates triggered via CAMARA APIs are propagated to the operator's service through OSL's message queue (Active MQ), ensuring synchronization of service characteristics.
+
+> Assumption: The Operator already processes and exposes a 5G controlling running service
+
+This architectural approach is presented in the figure below:
+
+![CAMARAaaS-Architecture](./images/CAMARAaaS-Architecture.png)
+
+### **Components in the Architecture**
+
+---
+
+**Service Specification Catalogue**:
+
+- Stores the Service Specifications.
+- Contains the `CAMARA API Controller` Service Specification, which defines/exposes the profile enforcer functionality.
+
+**Service Inventory**:
+
+- Tracks service instances (e.g., RFS - Resource-Facing Services) and their configurations.
+- Includes services such as:
+    - CAMARA API Exposure Profile Enforcer
+    - 5G Network Slice
+    - Network profiles and UE (User Equipment) services
+
+**Resource Inventory**:
+
+- Holds information about resources provisioned in the system, related with the respective RFSs.
+- Contains resources like:
+    - CAMARA API Exposure
+    - Profile Enforcer
+    - 5G Core
+    - Configmaps (used for managing Kubernetes configurations)
+
+**Kubernetes Cluster**:
+
+- Hosts and manages the 5G Core components
+- Hosts all OSL operators (OSL can manage them these through CRIDGE - not depicted)
+- Facilitates configuration updates via ConfigMap and resource values
+
+**CAMARA API Controller**:
+
+- Processes API exposure requests and orchestrates resources for API exposure
+- Generates the CAMARA API Exposure resource on demand
+
+---
+
+### **Processes in the Workflow**
+
+
+There are three workflows depicted for a fully orchestrated end-to-end solution. The first one defines the prerequisites to deliver CAMARAaaS.
+
+The following two workflows explain how the CAMARAaaS is being delivered:
+
+**CAMARAaaS - Service Order Creation**:
+   
+- A Service Order is initiated to expose a CAMARA API Exposure service with parameter(`ExposeServiceUUID=Profile Enforcer`) using the TMF Service order API
+- This triggers the service provisioning process in the Service Inventory
+- A custom resource is created and requests via the CAMARA API controller to create the CAMARA API Exposure for the Service Profile Enforcer
+- The `CAMARA API Exposure` resource is created and populated with configuration values
+- The API Exposure resource is finalized in the cluster and made available for consumption via the ordered CAMARA API Exposure service.
+
+
+**CAMARA API Usage - Service Operation**:
+   
+- The API request includes QoD (Quality on Demand) parameters and is accessible via a specified NodePort and/or endpoint URL (e.g. `portal.osl/{serviceAUUID}/camaraapiFQDN`).
+- A client performs a CAMARA QoD Request.
+- An event is created and circulated within OSL message bus to notify about the request.
+- The event results into a TMF request that is used to patch and customize the Network Operator's Profile enforcer service in the Service Inventory.
+- The configuration is passed through OSL Orchestrator and CRIDGE down to the `5G Core Controller`.
+- The 5G Core Controller modifies the respective network configurations such as:
+    - Slices (5G Network Slice profiles)
+    - User equipment (UE) profiles
+- These changes are propagated to the Kubernetes-managed 5G Core components.
+- Resources in the Resource Inventory are updated to reflect the enforced requirements.
+- Updates are made to the `Configmap` Resource to align with the latest configurations.
+- These changes ensure that the 5G Core components operate with updated slice, profile, and UE configurations.
+- A similar event as in previous steps is generated that enables the CAMARA API to get notified by the enforced changes and update the client. 
+---
+
+This architecture emphasizes automation, modularity, and interoperability between CAMARA APIs and 5G Core Infrastructure, leveraging Kubernetes for seamless management and deployment.
+
+The first image below, displays a normal scenario of using OSL to deploy and change a running service deployed in a Kubernetes cluster, using Kubernetes CRDs. First the service is requested through a Service Order. For example, the requested service can be a Service Specification bundle consisting of:
+
+- a 5G Core Service Specification that will deploy a 5G Core through HELM chart(s).
+- a 5G Controller Service Specification (deployed via HELM) that can change configuration of slices for UEs. This 5G Controller might register further Kubernetes operators for reconfiguring the core, slices, etc. It is developed by the Network Operator and is able to reconfigure several components via e.g. NEF, scripting, API commands or other means.
+
+OSL deploys the services via a Service Order request. Then while the service is in operation (ACTIVE), the user that ordered it can submit reconfigurations (see loop in figure) by changing characteristics of the service. These characteristics are then propagated from OSL orchestrator, through CRIDGE, down to the 5G Controller Kubernetes resource to handle it.
+
+![CAMARAaaS-Workflow-OSLToday](./images/CAMARAaaS-Workflow-OSLToday.png)
+
+Since the 5G Controller Service is running since the previous step, the user requests to expose it via a certain CAMARA API. The user orders the respective CAMARA Controller to expose this service via CAMARA API. User just needs to pass the UUID identifier of the 5G Controller Service (facilitator of CAMARA Controller), as seen in TMF Service Inventory, during the Service Order request.
+
+![CAMARAaaS-Workflow-ServiceOrdering](./images/CAMARAaaS-Workflow-ServiceOrdering.png)
+
+Since the new CAMARA API service is active, clients can use this new API to reconfigure the service. This request is passed through the message bus to the TMF API and then down to the 5G Controller Service.
+
+As already mentioned, the steps that require to “Update Service Characteristics” are achieved by sending a message to OSL’s message bus.
+
+
+![CAMARAaaS-Workflow-ServiceOperation](./images/CAMARAaaS-Workflow-ServiceOperation.png)
+
+
+## Important Considerations
+
+The CAMARAaaS add-on depends on 2 Services:
+
+- The OSL CAMARA API Service
+    - Is a generic CAMARA API wrapper Service implemented by the OSL team
+    - This implementation is publicly offered as an OpenSlice add-on (Helm Chart)
+- A custom 5G-related Service (that shall be controlled/referenced by the CAMARA API Service)
+    - An OSL user must implement and provide its own 5G-related Controlling Service (following OSL design patterns)
+    - The implementation is custom
\ No newline at end of file
diff --git a/doc/addons/camara/qod.md b/doc/addons/camara/qod.md
new file mode 100644
index 0000000000000000000000000000000000000000..f21a4991d7d155eee8794bd90265f3917e698dd2
--- /dev/null
+++ b/doc/addons/camara/qod.md
@@ -0,0 +1,447 @@
+
+
+# Quality on Demand API Proof of Concept
+
+## Candidate CAMARA API - QoD Provisioning
+
+For this Proof of Concept (PoC), we decided to rely on the [CAMARA QoD Provisioning API](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qod-provisioning.yaml).
+
+Such API has the following endpoints:
+
+![CAMARA QoD Swagger](./images/CAMARA-QoDProvisioning-API-Endpoints.png)
+
+Our solution needs to be deployed in a Kubernetes cluster. A 5G Core is needed for proper implementation as well as your own 5G Core Controller.
+
+The PoC is based on [OSL CAMARAaaS Add-on](./intro.md). It is recommended to read this before diving into the implementation of the PoC.
+
+To replicate this PoC you have to close the code found in the [CAMARA Addon project](https://labs.etsi.org/rep/osl/code/addons/org.etsi.osl.controllers.camara/-/tree/main/QoDProvisioning).
+
+## General concepts of the OSL CAMARAaaS as a TMF Service Specification
+
+First step is to design and expose the OSL CAMARA API service via the TMF models (Service Specification that can be ordered). The OSL CAMARA API service uses as backend connectivity the OSL message bus (OSL’s Active MQ broker). It exposes the CAMARA API, translates and forwards the requests to TMF Service Inventory model via the service bus. Therefore, considering the interactions that shall take place between the exposed CAMARA API, the Operator’s running 5G Controller Service and the architecture introduced before, the OSL CAMARA API exposure service must interface with OSL’s Active MQ broker. Moreover, for this first prototype the OSL's CAMARAaaS will be delivered via a Service Order. To enable this, we need to design it in OpenSlice as a Service Specification, so in general some TMF service characteristics are required to pass this information to the OSL CAMARA API exposure service which will be orchestrated, deployed and configured through OSL:
+
+- **messageBroker.address** - OSL's ActiveMQ Address (e.g. 10.10.10.10)
+- **messageBroker.port** - OSL's ActiveMQ Port
+- **messageBroker.username** - OSL’s ActiveMQ Username
+- **messageBroker.password** - OSL’s ActiveMQ Password
+
+Additionally, we also need another Service Characteristic to store the UUID of the Operator’s running 5G Controller Service that will be triggered through the CAMARA API:
+
+- *serviceUnderControl.uuid*
+
+Considering that the CAMARA API will be orchestrated by OSL, the client does not know where the API will be deployed, nor the credentials used to access it. Therefore, 4 additional characteristics are required. These will be automatically updated by OSL after the CAMARA API Service is deployed:
+
+- **camaraAPI.url** - URL of the CAMARA API orchestrated by this service (view-only). This field will be automatically populated when the CAMARA API starts running
+- **camaraAPI.username** - Username of the CAMARA API orchestrated by this service (view-only). This field will be automatically populated when the CAMARA API starts running
+- **camaraAPI.password** - Password of the CAMARA API orchestrated by this service (view-only). This field will be automatically populated when the CAMARA API starts running
+- **camaraAPI.status** - This characteristic (view-only) will be populated with the CAMARA API status (RUNNING, NOT_RUNNING)
+
+Additionally, you may create a characteristic titled “*camaraAPI.results*”, which you can use to have visibility of the QoD Provisionings processed by the API, at OSL level. Still, this characteristic is not required.
+
+Therefore, OSL’s CAMARAaaS (QoD API exposure service) will contain the following TMF Service Characteristics:
+
+- *messageBroker.address*
+- *messageBroker.port*
+- *messageBroker.username*
+- *messageBroker.password*
+- *serviceUnderControl.uuid*
+- *camaraAPI.url*
+- *camaraAPI.username*
+- *camaraAPI.password*
+- *camaraAPI.status*
+- *camaraAPI.results*
+
+### Broker Connection
+
+This API has a *ServiceEventManager* class that communicates with OSL's ActiveMQ broker through two topics:
+
+- `CATALOG.UPD.SERVICE`: Topic for catalog updates.
+- `EVENT.SERVICE.ATTRCHANGED`: Topic for service attribute changes.
+
+### CATALOG.UPD.SERVICE
+
+Whenever a new provisioning is created for an UE, the *ServiceEventManager*'s *update_service* method is called. This method sends a service update message through OpenSlice's *CATALOG.UPD.SERVICE* topic. When OSL receives the request, it updates the Operator's 5G Controller Service with the new characteristics, which are then caught and materialized by the correspondent Kubernetes Operator. After processing the request, the Operator adds the result to the CR-related service characteristic, i.e. *camaraResults*.
+
+### EVENT.SERVICE.ATTRCHANGED
+
+The *ServiceEventManager* subscribes to this topic to obtain and process the update messages regarding the specified Operator's 5G Controller Service, namely the UE QoD Profile Enforcer OSL service. Whenever this service's characteristics are updated in OSL, this class catches the update message. Then, the class extracts the *camaraResults* characteristic, which contains all QoS provisionings applied to the UE(s).
+
+These results are then processed by the *CamaraResultsProcessor* class, which updates each provisioning accordingly in the database.
+
+## General concepts of the QoD service (the 5G Core Provider/Operator Service) as OSL TMF Service Specification
+
+Having chosen the candidate API, the first step is to find a way to map the possible requests to TMF Service characteristics of the Operator’s service. Our approach in general is the following:
+
+- Design the QoD service that will accept the necessary QoD related characteristics
+- Implement the QoD service as a controller able to manage your 5G Core
+- Deploy it in a kubernetes cluster that OSL can manage (via CRIDGE)
+
+By looking at API’s specification, it is clear that at least 3 operations are required: (i) the creation of a QoD profile, (ii) its deletion, and (iii) listing all active QoD profiles. Therefore, we can proceed with evaluating the payload required for creating a QoD Provisioning. This payload involves various fields, which can be translated to the TMF Service Characteristics:
+
+- *qodProv.device.phoneNumber*
+- *qodProv.device.networkAccessIdentifier*
+- *qodProv.device.ipv4Address.privateAddress*
+- *qodProv.device.ipv4Address.publicAddress*
+- *qodProv.device.ipv4Address.publicPort*
+- *qodProv.device.ipv6Address*
+- *qodProv.qosProfile*
+- *qodProv.sink*
+- *qodProv.sinkCredential.credentialType*
+
+In order to support interaction with the previously defined OSL’s CAMARAaaS and alignment the CAMARA QoD Provisioning API models in general, the QoD service must be designed, at least, with these characteristics. 
+
+Still, since there are various operations that can take place (CREATE and DELETE), a characteristic is also needed to map this. Therefore, the Operator's QoD service must also have a characteristics titled *qodProv.operation*. The DELETE operation is achieved based on a provisioning Id, and therefore the respective characteristics is needed: *qodProv.provisioningId.*
+
+Finally, characteristic is required to store the provisionings that were enforced by the Operator's QoD service. We can define this characteristic as *camaraResults*.
+
+Therefore, for an Operator’s service to be controlled by OSL’s CAMARAaaS specification, it needs to be designed with, at least, the following characteristics:
+
+- *qodProv.device.phoneNumber*
+- *qodProv.device.networkAccessIdentifier*
+- *qodProv.device.ipv4Address.privateAddress*
+- *qodProv.device.ipv4Address.publicAddress*
+- *qodProv.device.ipv4Address.publicPort*
+- *qodProv.device.ipv6Address*
+- *qodProv.qosProfile*
+- *qodProv.sink*
+- *qodProv.sinkCredential.credentialType*
+- *qodProv.operation*
+- *qodProv.provisioningId*
+- *camaraResults*
+
+Additional characteristics are fully supported. Those can be custom characteristics that are required by the Operator's QoD Service.
+
+In regard to the *camaraResults* characteristic, to allow interoperability, it must store a Stringified JSON Array with the enforced QoD Provisionings. **The schema of each provisioning should be the one defined in CAMARA’s QoD Provisioning API Specification.** 
+
+
+## How To / Demonstration
+
+### 1. Dummy QoD Kubernetes Operator Service Design
+
+For this prototype, since we cannot deliver a QoD Service implementation for a specific commercial core, we created a Dummy QoD Kubernetes Operator Service which emulates the 5G Core configuration. In future releases of OSL we will offer solutions for some open source 5G cores, and/or some code templates to build your own 5G Core Operator.
+
+We will start by looking at the Dummy QoD Kubernetes Operator Service we have created to demonstrate this Add-on. The Service will be offered as a simple Custom Resource (CR) deployed in a Kubernetes cluster. You may find its Custom Resource Definition (CRD) under `/DummyOperatorService/crd.yaml` Look at the CRD fields. Please notice that these were defined according with what we introduced in the previous section.
+
+The first step is then to install this CRD in your kubernetes cluster. To this end, you may use the following command: `make create-dummy-operator-crd`
+
+After creating the CRD in your Kubernetes cluster, you may access OSL’s Resource Inventory and you will see the just created resource there.
+
+![Dummy Operator Service - Resource Inventory](./images/DummyOperatorService-ResourceInventory.png)
+
+We need now to start offering this as-a-Service, ready to be ordered from the Service Catalogue. So, the first step is to create a Resource-Facing-Service (RFS) Specification to expose this resource. To do so, you may read the [Exposing Kubernetes Operators as a Service : Offering "Calculator as a Service" through OpenSlice](../../service_design/examples/calculator_crd_aas/calculator_crd_aas.md) documentation page.
+
+Regarding the RFS Service, you must set the following characteristics:
+
+- _CR_CHECKVAL_AVAILABLE = RUNNING
+- _CR_CHECK_FIELD = spec.status
+
+By setting these characteristics, you will rely on the value of `spec.status` to set the service as `active`. Ideally, the 5G Core provider would have implemented a proper Kubernetes Operator for this Custom Resource to implement the requested QoD. However, as discussed already, for demonstration purposes, we will short-circuit the behavior and we will set `spec.status` to `RUNNING` immediately after deployment.
+
+
+Then, you can proceed to create a Customer-Facing-Service (CFS) Specification, which will incorporate the just created RFS Service. More information is available at: [Exposing Kubernetes Operators as a Service : Offering "Calculator as a Service" through OpenSlice](../../service_design/examples/calculator_crd_aas/calculator_crd_aas.md). To create the CFS Service's characteristics, you may use the Service Specification available at `/DummyOperatorService/OSLArtifacts/DummyOperatorService-CFS-Specification.json` . You may manually create the CFS Service, or you may onboard this Service Specification by making a POST request to `{{url}}/tmf-api/serviceCatalogManagement/v4/serviceSpecification`.
+
+After creating the CFS Specification, you should mark this Service as a Bundle. Then, go to “Service Specification Relationships” and add the previous created RFS Specification.
+
+Regarding the LCM Rules for the CFS Service, you should configure the following ones:
+
+
+**[Pre-Provision Rule] - Short-circuits RFS/Sets RFS's spec.status to "Running"**
+
+![Dummy Operator Service - Pre-Provision Rule](./images/DummyOperatorService-Pre-Provision-Rule.png)
+
+<details>
+<summary>Pre-Provision Rule Java code</summary>
+
+```java
+{
+java.util.HashMap<String,String> charvals = new java.util.HashMap<>();
+charvals.put("_CR_SPEC",String.format("""
+apiVersion: org.etsi.osl/v1
+kind: DummyOperatorService
+metadata:
+  name: _to_be_replaced_by_osl
+  namespace: default
+spec:
+  status: "%s"
+"""
+, "RUNNING"));
+setServiceRefCharacteristicsValues("Dummy Operator Service - RFS", charvals);
+}
+```
+</details>
+
+**[Supervision Rule] - Detects changes to the Operator's CFS and reflects them and forwards them to RFS**
+
+![Dummy Operator Service - Supervision Rule](./images/DummyOperatorService-Supervision-Rule.png)
+
+
+<details>
+<summary>Supervision Rule Java code</summary>
+
+```java
+{
+java.util.HashMap<String,String> charvals = new java.util.HashMap<>();
+charvals.put("_CR_SPEC",String.format("""
+apiVersion: org.etsi.osl/v1
+kind: DummyOperatorService
+metadata:
+  name: _to_be_replaced_by_osl
+  namespace: default
+spec:
+  qodProv:
+    operation: "%s"
+    provisioningId: "%s"
+    device:
+      phoneNumber: "%s"
+      networkAccessIdentifier: "%s"
+      ipv4Address:
+        publicAddress: "%s"
+        privateAddress: "%s"
+        publicPort: %d
+      ipv6Address: "%s"
+    qosProfile: "%s"
+    sink: "%s"
+    sinkCredential:
+      credentialType: "%s"
+"""
+, getCharValAsString("qodProv.operation"), getCharValAsString("qodProv.provisioningId"), getCharValAsString("qodProv.device.phoneNumber"), getCharValAsString("qodProv.device.networkAccessIdentifier"), getCharValAsString("qodProv.device.ipv4Address.publicAddress"), getCharValAsString("qodProv.device.ipv4Address.privateAddress"), getCharValNumber("qodProv.device.ipv4Address.publicPort"), getCharValAsString("qodProv.device.ipv6Address"), getCharValAsString("qodProv.qosProfile"), getCharValAsString("qodProv.sink"), getCharValAsString("qodProv.sinkCredential.credentialType")));
+setServiceRefCharacteristicsValues("Dummy Operator Service - RFS", charvals);
+}
+setCharValFromStringType("camaraResults", getServiceRefPropValue("Dummy Operator Service - RFS", "serviceCharacteristicValue", "spec.camaraResults"));
+```
+</details>
+
+
+You can find the  `_CR_SPEC` template used for the pre-provision rule at `/DummyOperatorService/OSLArtifacts/cr-template-pre-provision.yaml` . The `_CR_SPEC` template used for the supervision rule is available at `/DummyOperatorService/OSLArtifacts/cr-template-supervision.yaml` 
+
+After that, you may expose this service via OSL’s Service Catalog, and order it. You do not need to configure any characteristics when ordering this Service. Confirm that the Service Order was completed, both RFS and CFS Services are active, and a Custom Resource of type *DummyOperatorService* was created in your Kubernetes Cluster. See images below:
+
+![Dummy Operator Service - Service Order](./images/DummyOperatorService-ServiceOrder.png)
+
+![Dummy Operator Service - Custom Resource](./images/DummyOperatorService-CustomResource.png)
+
+### 2. OSL CAMARAaaS QoD Provisioning API exposure Service Design
+
+Then, we can proceed to design the CAMARAaaS QoD Provisioning API exposure Service Specification in OSL catalogue. To this end, OSL’s team has implemented in Python the CAMARAaaS QoD Provisioning API, created a CRD to offer it, and developed a Kubernetes Operator to deal with its internal logic.
+
+
+#### 2.1 OSL CAMARAaaS QoD Provisioning API - Kubernetes Operator
+
+The previous docker image shall make available the CAMARA QoD Provisioning API. However, these API will be made available through Custom Resources of Type `CAMARAaaS-QoDProvisiongAPI`. Therefore, we also need a Kubernetes Operator to manage these resources. The Operator’s code can be found under `/QoDProvisioningAPI/Operator`. There, you have the source code of the Kubernetes Operator. The Operator's Helm Chart uses the default OSL registry docker images. If you are interesting in developing your own, please refer to the Makefile. To install the Operator, run the following command: 
+
+```bash
+helm install camaraaas-qod-prov-operator ./QoDProvisioningAPI/Operator/chart --namespace <namespace_where_the_operator_shall_be_deployed> --create-namespace
+```
+
+After this, check if the operator is running through the `make get-operator-logs` command.
+
+If everything went ok, you should have a new CRD in your Kubernetes cluster. Run this command to verify if it was created: `kubectl describe crd camaraaas-qod-provisioning-apis.org.etsi.osl`.
+
+Before designing the service in OSL, let us first create a CR of type `CAMARAaaS-QoDProvisiongAPI` to validate that the operator is behaving according to what is expected. To this end, you may use the test custom resource available at `/QoDProvisioningAPI/Operator/test-cr.yaml` . Before creating the resource, you need to update the fields: *spec.messageBroker.address*, *spec.messageBroker.port, spec.messageBroker.username, spec.messageBroker.password*, with the values that relate with your OSL instance. The default values will be the following ones:
+
+- **spec.messageBroker.address:** {your OSL address}
+- **spec.messageBroker.port**: 61613
+- **spec.messageBroker.username**: artemis
+- **spec.messageBroker.password**: artemis
+
+For now, you do not need to update the field serviceUnderControl.uuid. You may leave it as is.
+
+After these updates, create the CR by running the command: `make create-operator-test-cr`.
+
+When the CR is created, its operator will deploy the CAMARA QoD API in a pod and expose it via a K8s Node Port. The URL where the API is available is published under the CR field `spec.camaraAPI.url` (e.g. [http://10.255.28.73:32630](http://10.255.28.73:32630/)). Check this field by running `make describe-operator-test-cr`. To confirm the API is running, access *<URL>/docs*. You should see the following:
+
+![QoD Provisioning API Docs](./images/QoDProvisioningAPI-Docs.png)
+
+If you see this page, the CAMARA QoD Provisioning API Custom Resources and their operator is working. You may delete the Custom Resource you created. Run the following command: `make delete-operator-test-cr`.
+
+#### 2.2 OSL CAMARAaaS QoD Provisioning API - TMF Service Specification Design
+
+Now we can proceed to create an OSL TMF Service Specification that maps the CAMARAaaS QoD Provisioning API CR, ready to be ordered in your OSL Service Specification Catalogue.
+
+The first step is to create an RFS Service to expose this resource. To do so, you may read the [Exposing Kubernetes Operators as a Service : Offering "Calculator as a Service" through OpenSlice](../../service_design/examples/calculator_crd_aas/calculator_crd_aas.md) documentation page. 
+
+Regarding the RFS Service, you must set the following characteristics:
+
+- _CR_CHECKVAL_AVAILABLE = RUNNING
+- _CR_CHECK_FIELD = spec.camaraAPI.status
+
+By setting this characteristics, you will rely on the value of `spec.camaraAPI.status` to set the service as `active`. The previous operator, when it deploys the CAMARA QoD Provisioning API will set that CR field to `RUNNING`.
+
+Then, you can proceed to create a CFS Service, which will incorporate the just created RFS Service. More information is available at: [Exposing Kubernetes Operators as a Service : Offering "Calculator as a Service" through OpenSlice](../../service_design/examples/calculator_crd_aas/calculator_crd_aas.md). To create the CFS Service characteristics, you may use the Service Specification available at `/QoDProvisioningAPI/OSLArtifacts/CAMARAaaS-QoD-Provisioning-API-CFS-Specification.json`. You may manually create the CFS Service, or you may onboard this Service Specification by making a POST request to `{{url}}/tmf-api/serviceCatalogManagement/v4/serviceSpecification`.
+
+After creating the Service Specification, you should mark this Service as a Bundle. Then, go to “Service Specification Relationships” and add the RFS Service.
+
+Regarding the LCM Rules for the CFS Service, you should configure the following ones:
+
+**[Pre-Provision Rule] - Forwards the user input towards the created CR of type "CAMARAaaS-QoDProvisiongAPI"**
+
+![CAMARAaaS-QoD-Prov-API - Pre-Provision Rule](./images/CAMARAaaS-QoD-Prov-API-Pre-Provision-Rule.png)
+
+<details>
+<summary>Pre-Provision Rule Java code</summary>
+
+```java
+{
+java.util.HashMap<String,String> charvals = new java.util.HashMap<>();
+charvals.put("_CR_SPEC",String.format("""
+apiVersion: org.etsi.osl/v1
+kind: CAMARAaaS-QoDProvisiongAPI
+metadata:
+  name: _to_be_replaced_by_osl_
+spec:
+  messageBroker:
+    address: "%s"
+    port: %d
+    username: "%s"
+    password: "%s"
+  serviceUnderControl:
+    uuid: "%s"
+"""
+, getCharValAsString("messageBroker.address"), getCharValNumber("messageBroker.port"), getCharValAsString("messageBroker.username"), getCharValAsString("messageBroker.password"), getCharValAsString("serviceUnderControl.uuid")));
+setServiceRefCharacteristicsValues("CAMARAaaS - QoD Provisioning API - RFS", charvals);
+}
+```
+
+</details>
+
+
+**[Supervision Rule] - Updates the exposed QoD Provisioning API Service with information about the undertaken actions**
+
+![CAMARAaaS-QoD-Prov-API - Supervision Rule](./images/CAMARAaaS-QoD-Prov-API-Supervision-Rule.png)
+
+<details>
+<summary>Supervision Rule Java code</summary>
+
+```java
+{
+java.util.HashMap<String,String> charvals = new java.util.HashMap<>();
+charvals.put("_CR_SPEC",String.format("""
+apiVersion: org.etsi.osl/v1
+kind: CAMARAaaS-QoDProvisiongAPI
+metadata:
+  name: _to_be_replaced_by_osl_
+spec:
+  messageBroker:
+    address: "%s"
+    port: %d
+    username: "%s"
+    password: "%s"
+  serviceUnderControl:
+    uuid: "%s"
+"""
+, getCharValAsString("messageBroker.address"), getCharValNumber("messageBroker.port"), getCharValAsString("messageBroker.username"), getCharValAsString("messageBroker.password"), getCharValAsString("serviceUnderControl.uuid")));
+setServiceRefCharacteristicsValues("CAMARAaaS - QoD Provisioning API - RFS", charvals);
+}
+setCharValFromStringType("camaraAPI.status", getServiceRefPropValue("CAMARAaaS - QoD Provisioning API - RFS", "serviceCharacteristicValue", "spec.camaraAPI.status"));
+setCharValFromStringType("camaraAPI.url", getServiceRefPropValue("CAMARAaaS - QoD Provisioning API - RFS", "serviceCharacteristicValue", "spec.camaraAPI.url"));
+setCharValFromStringType("camaraAPI.username", getServiceRefPropValue("CAMARAaaS - QoD Provisioning API - RFS", "serviceCharacteristicValue", "spec.camaraAPI.username"));
+setCharValFromStringType("camaraAPI.password", getServiceRefPropValue("CAMARAaaS - QoD Provisioning API - RFS", "serviceCharacteristicValue", "spec.camaraAPI.password"));
+setCharValFromStringType("camaraAPI.results", getServiceRefPropValue("CAMARAaaS - QoD Provisioning API - RFS", "serviceCharacteristicValue", "spec.camaraAPI.results"));
+
+```
+</details>
+
+
+You can find the  `_CR_SPEC` template used for both rules at `/QoDProvisioningAPI/OSLArtifacts/cr-template.yaml`. 
+
+After that, you may expose this service via OSL’s Service Catalog, and order it. When you order it, you will be prompted to configure some characteristics:
+
+- *messageBroker.address*
+- *messageBroker.port*
+- *messageBroker.username*
+- *messageBroker.password*
+- *serviceUnderControl.uuid*
+
+In `serviceUnderControl.uuid` you should input the UUID of the Service (in the Service Inventory) that you ordered before: the one that relates with the Dummy Operator. For this tutorial, we have used the following characteristic values:
+
+
+![CAMARAaaS-QoD-Prov-API - Service Order](./images/CAMARAaaS-QoD-Prov-API-Ordering.png)
+
+Confirm that the service order was completed, both RFS and CFS Services are active, and a Custom Resource of type CAMARAaaS-QoDProvisiongAPI was created in your Kubernetes Cluster. See images below (`kubectl describe camaraaas-qod-provisioning-apis <name> -n <namespace>`)
+
+![CAMARAaaS-QoD-Prov-API - Service Inventory](./images/CAMARAaaS-QoD-Prov-API-Active-Services.png)
+
+![CAMARAaaS-QoD-Prov-API - Custom Resource](./images/CAMARAaaS-QoD-Prov-API-CR.png)
+
+Additionally, in OSL, you may see the URL where the QoD Provisioning API is exposed. To do so, please see the characteristics of the CAMARAaaS QoD Provisioning API CFS. See image below:
+
+![CAMARAaaS-QoD-Prov-API - Service Characteristics](./images/CAMARAaaS-QoD-Prov-API-Characteristics.png)
+
+### 3. Validation
+
+Now we can test if the two services are communicating. To do so, you should create a QoD Provisioning via the API that was just deployed. You may do that, using this command:
+
+```bash
+# You must update the url to correspond to your API instance, found in camaraAPI.url highlighted in previous image.
+curl --location '{{camaraAPI.url}}/device-qos' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+  "device": {
+    "phoneNumber": "+987654321",
+    "networkAccessIdentifier": "987654321@example.org",
+    "ipv4Address": {
+      "publicAddress": "203.0.112.12",
+      "publicPort": 59765
+    },
+    "ipv6Address": "2001:db8:85a3:8d3:1319:8a2e:370:7344"
+  },
+  "qosProfile": "QOS_PROFILE_A",
+  "sink": "https://endpoint.example.com/"
+}'
+```
+
+You should have received a response similar to this one: 
+
+```bash
+{"device":{"phoneNumber":"+987654321","networkAccessIdentifier":"987654321@example.org","ipv4Address":{"publicAddress":"203.0.112.12","privateAddress":null,"publicPort":59765},"ipv6Address":"2001:db8:85a3:8d3:1319:8a2e:370:7344"},"qosProfile":"QOS_PROFILE_A","sink":"https://endpoint.example.com/","sinkCredential":{"credentialType":null},"provisioningId":"cb55f9e9-802e-4898-95f5-d1a5a2552483","startedAt":"2024-12-17T15:49:21.995399","status":"REQUESTED","statusInfo":null}
+```
+
+Now, if everything is working properly, the characteristics of the Dummy Operator Service you referenced should have been updated. You should now see these characteristics:
+
+![Dummy Operator Service - Characteristics after CAMARA Invoking](./images/DummyOperatorService-Characteristics-After-CAMARA-Invoking.png)
+
+You may also query the  QoD Provisioning API to check the status of your provisioning.
+
+```bash
+curl --location '{{camaraAPI.url}}/device-qos/cb55f9e9-802e-4898-95f5-d1a5a2552483'
+# notice the "provisioningId":"cb55f9e9-802e-4898-95f5-d1a5a2552483" above
+```
+
+If you do so, you will receive the following response:
+
+```bash
+{"device":{"phoneNumber":"+987654321","networkAccessIdentifier":"987654321@example.org","ipv4Address":{"publicAddress":"203.0.112.12","privateAddress":null,"publicPort":59765},"ipv6Address":"2001:db8:85a3:8d3:1319:8a2e:370:7344"},"qosProfile":"QOS_PROFILE_A","sink":"https://endpoint.example.com/","sinkCredential":{"credentialType":null},"provisioningId":"cb55f9e9-802e-4898-95f5-d1a5a2552483","startedAt":"2024-12-17T15:49:21.962746","status":"REQUESTED","statusInfo":null}
+```
+
+As there is no logic behind the Dummy Operator Service, the provisioning will remain with the status “REQUESTED”. However, we can simulate that Dummy Operator Service enforced a QOS enforcement, by patching its Custom Resource:
+
+```bash
+kubectl patch dummy-operator-services <name> -n <namespace> \
+--type='json' -p='[{"op": "replace", "path": "/spec/camaraResults", "value": "[{\"device\": {\"ipv4Address\": {\"publicAddress\": \"203.0.112.12\", \"publicPort\": 59765}, \"ipv6Address\": \"2001:db8:85a3:8d3:1319:8a2e:370:7344\", \"networkAccessIdentifier\": \"987654321@example.org\", \"phoneNumber\": \"+987654321\"}, \"provisioningId\": \"cb55f9e9-802e-4898-95f5-d1a5a2552483\", \"qosProfile\": \"QOS_PROFILE_A\", \"sink\": \"https://endpoint.example.com/\", \"sinkCredential\": {}, \"status\": \"AVAILABLE\", \"startedAt\": \"2024-12-15T11:00:00Z\"}]"}]'
+```
+
+When you do this, the `camaraResults` characteristic in the Dummy Operator Service will be updated to:
+
+![Dummy Operator Service - Characteristics after CAMARA Invoking](./images/DummyOperatorService-Characteristics-After-CAMARA-Invoking.png)
+
+After a while, if you check the characteristics of the CAMARAaaS QoD Provisioning API CFS, you will also see that the characteristic `camaraAPI.results` was updated.
+
+![CAMARAaaS-QoD-Prov-API - Characteristics after CAMARA Invoking](./images/CAMARAaaS-QoD-Prov-API-Characteristics-After-CAMARA-Invoking.png)
+
+Finally, execute this request again:
+
+```bash
+curl --location '{{camaraAPI.url}}/device-qos/cb55f9e9-802e-4898-95f5-d1a5a2552483'
+# notice the "provisioningId":"cb55f9e9-802e-4898-95f5-d1a5a2552483" above
+```
+
+You should receive the following response.
+
+```bash
+{"device":{"phoneNumber":"+987654321","networkAccessIdentifier":"987654321@example.org","ipv4Address":{"publicAddress":"203.0.112.12","privateAddress":null,"publicPort":59765},"ipv6Address":"2001:db8:85a3:8d3:1319:8a2e:370:7344"},"qosProfile":"QOS_PROFILE_A","sink":"https://endpoint.example.com/","sinkCredential":{"credentialType":null},"provisioningId":"cb55f9e9-802e-4898-95f5-d1a5a2552483","startedAt":"2024-12-15T11:00:00","status":"AVAILABLE","statusInfo":null}
+```
+
+Notice the `"status":"AVAILABLE"`. This means the 2 services are communicating. 
+
+
+Now, you just have to implement your own Kubernetes Operator for your 5G Core configuration, and you may use OSL’s CAMARAaaS Add-on to expose it through a CAMARA API.
\ No newline at end of file
diff --git a/doc/addons/intro.md b/doc/addons/intro.md
new file mode 100644
index 0000000000000000000000000000000000000000..03401b2a79a40aac25a9010396dea3862b52d912
--- /dev/null
+++ b/doc/addons/intro.md
@@ -0,0 +1,7 @@
+# OpenSlice Addons
+
+**Intended Audience: OpenSlice Service Designers**
+
+OpenSlice [Addons repository](https://labs.etsi.org/rep/osl/code/addons) introduces an archive of reusable and replicable projects that leverage OpenSlice architecture to enable telco cloud scenarios and expose capabilities of a modern Operator Platform.
+
+Stay tuned as addons are continuously updated!
\ No newline at end of file
diff --git a/doc/index.md b/doc/index.md
index 198cf6593a71573d949c24ee805afbcdcd677543..f2f32772fbbb9790f2e646dde31e50b69eaf6777 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -3,7 +3,7 @@
 
 <img src="images/openslice_logo.png" alt="logo" width="200"/>
 
-**Version**: {{{ documentation_version }}} ([Release Notes](https://labs.etsi.org/rep/osl/code/org.etsi.osl.main/-/releases/{{{ documentation_version }}}))
+**Version**: {{{ documentation_version }}} ([Release Notes](https://labs.etsi.org/rep/osl/code/org.etsi.osl.main/-/releases))
 
 The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open-source service-based Operations Support System (OSS) to deliver Network as a Service (NaaS) following specifications from major SDOs including ETSI, TM Forum and GSMA.
 
diff --git a/mkdocs.yml b/mkdocs.yml
index a40ae000685f0e2e08ecfb0cf692ee778cb7da6c..4ac6a61eef2edb50a4ed13d9aa3bb8f97a928ac7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -99,7 +99,7 @@ extra:
       link: https://twitter.com/OpensliceOSS
   version:
     provider: mike
-  documentation_version: "2024Q4"
+  documentation_version: "develop"
 
 # Page tree
 nav:
@@ -175,6 +175,11 @@ nav:
   # - Assurance services:
   #   - Introduction: ./assurance_services/intro.md
   #   - Alarms and Actions: ./assurance_services/alarms_actions.md
+  - Addons:
+    - Introduction: ./addons/intro.md
+    - CAMARA:
+      - Offering CAMARAaaS: ./addons/camara/intro.md
+      - Quality on Demand: ./addons/camara/qod.md
   - Design & Architecture:
       - Architecture: ./architecture/architecture.md
       - CRIDGE: ./architecture/cridge/cridge_introduction.md