diff --git a/QoDProvisioning/Makefile b/QoDProvisioning/Makefile
index b109f4892f007b6c8788d3adbcbe8bbb3d10d9f0..848f34802bd5eb9fa121462109f2c6d3d550546d 100644
--- a/QoDProvisioning/Makefile
+++ b/QoDProvisioning/Makefile
@@ -36,7 +36,7 @@ describe-dummy-operator-cr:
 
 # CAMARAaaS QoD Provisioning API
 build-api-docker-image:
-	docker build -t $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/API
+	docker build --no-cache -t $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/API
 
 tag-api-docker-image:
 	docker tag $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) $(REPOSITORY_HOST)/$(API_DOCKER_IMAGE_NAME_ON_REPOSITORY):$(API_DOCKER_IMAGE_TAG_ON_REPOSITORY)
@@ -49,7 +49,7 @@ api-docker-image: build-api-docker-image tag-api-docker-image push-api-docker-im
 
 # CAMARAaaS QoD Provisioning API Operator
 build-operator-docker-image:
-	docker build -t $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/Operator
+	docker build --no-cache -t $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/Operator
 
 tag-operator-docker-image:
 	docker tag $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) $(REPOSITORY_HOST)/$(OPERATOR_DOCKER_IMAGE_NAME_ON_REPOSITORY):$(OPERATOR_DOCKER_IMAGE_TAG_ON_REPOSITORY)
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/main.py b/QoDProvisioning/QoDProvisioningAPI/API/src/main.py
index e2a6fce312d5fc8d10e57f98494eceeec83ac676..f401db305b0526ed7405075184c5615d3b95b31b 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/main.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/main.py
@@ -29,8 +29,8 @@ from routers.qod_provisioning_router import router as QoDProvisioningApiRouter
 from routers.osl import router as OSLRouter
 
 from database.db import init_db, get_db
-from aux.service_event_manager.service_event_manager import ServiceEventManager
-from aux.service_event_manager.camara_results_processor import CamaraResultsProcessor
+from utils.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.camara_results_processor import CamaraResultsProcessor
 from config import Config
 
 # Set up logging
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py
index d4e528f52be36ebcbb98b4fc96644ec221119069..60ec78300129e9c8bfe2ec4490710ca97c746ae9 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py
@@ -40,13 +40,13 @@ from schemas.retrieve_provisioning_by_device import RetrieveProvisioningByDevice
 from schemas.status import Status
 from schemas.status_info import StatusInfo
 from database import crud
-from aux import mappers
+from utils import mappers
 from datetime import datetime
 import logging
-from aux.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.service_event_manager import ServiceEventManager
 import json
 from config import Config
-from aux.constants import Constants
+from utils.constants import Constants
 # Set up logging
 logger = Config.setup_logging()
 
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py
index f199afbdf963a46c6dc384a65152ebeecb79bc9a..8749f17903e2eb2509ccd08769e47668043b48f7 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py
@@ -41,10 +41,10 @@ from schemas.retrieve_provisioning_by_device import RetrieveProvisioningByDevice
 from schemas.status import Status
 from schemas.status_info import StatusInfo
 from database import crud
-from aux import mappers
+from utils import mappers
 from datetime import datetime
 import logging
-from aux.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.service_event_manager import ServiceEventManager
 import json
 from config import Config
 
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/constants.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/constants.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/constants.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/constants.py
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/mappers.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/mappers.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/mappers.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/mappers.py
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/__init__.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/__init__.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/__init__.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/__init__.py
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/camara_results_processor.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/camara_results_processor.py
similarity index 96%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/camara_results_processor.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/camara_results_processor.py
index ea22ca46a80abaa41bafa2a159a4bae3bbcfcbc9..4dd7de0db6309e7ed9245e1721f12c616a3a2a36 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/camara_results_processor.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/camara_results_processor.py
@@ -10,12 +10,12 @@
 
 import asyncio
 
-from aux.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.service_event_manager import ServiceEventManager
 from config import Config
 import json
 from database import crud
 from database.db import get_db
-from aux.constants import Constants
+from utils.constants import Constants
 # Set up logging
 logger = Config.setup_logging()
 
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/service_event_manager.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/service_event_manager.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/service_event_manager.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/service_event_manager.py