diff --git a/src/opticalattackdetector/service/OpticalAttackDetectorServiceServicerImpl.py b/src/opticalattackdetector/service/OpticalAttackDetectorServiceServicerImpl.py
index d7720e0e48e5b0ed5b669d0b31c09acb0b95e60d..ec05a2b120985e32385fb54a8b73b4e0ade52f73 100644
--- a/src/opticalattackdetector/service/OpticalAttackDetectorServiceServicerImpl.py
+++ b/src/opticalattackdetector/service/OpticalAttackDetectorServiceServicerImpl.py
@@ -43,19 +43,19 @@ LOGGER = logging.getLogger(__name__)
 METRICS_POOL = MetricsPool('OpticalAttackDetector', 'RPC')
 
 DETECTION_RESPONSE_TIME = Histogram(
-    "OPTICAL_ATTACK_DETECTOR_INFERENCE_RESPONSE_TIME",
+    "tfs_opticalattackdetector_inference_response_time",
     "Time taken by the inference component to reply"
 )
 MONITORING_RESPONSE_TIME = Histogram(
-    "OPTICAL_ATTACK_DETECTOR_MONITORING_RESPONSE_TIME",
+    "tfs_opticalattackdetector_monitoring_response_time",
     "Time taken by the monitoring component to reply"
 )
 MITIGATION_RESPONSE_TIME = Histogram(
-    "OPTICAL_ATTACK_DETECTOR_MITIGATION_RESPONSE_TIME",
+    "tfs_opticalattackdetector_mitigation_response_time",
     "Time taken by the attack mitigator to reply"
 )
 CACHE_RESPONSE_TIME = Histogram(
-    "OPTICAL_ATTACK_DETECTOR_CACHE_RESPONSE_TIME",
+    "tfs_opticalattackdetector_cache_response_time",
     "Time taken by the cache to reply"
 )
 
diff --git a/src/opticalattackmanager/service/__main__.py b/src/opticalattackmanager/service/__main__.py
index 08c0c7f77994879b44ccba956897bcd06103e4f3..aab83080e153539d4bb3a8c1b695337dba82da9a 100644
--- a/src/opticalattackmanager/service/__main__.py
+++ b/src/opticalattackmanager/service/__main__.py
@@ -80,7 +80,7 @@ MAX_NUMBER_WORKERS = int(
 # Create a metric to track time spent and requests made.
 # TODO: adjust histogram buckets to more realistic values
 LOOP_TIME = Histogram(
-    "OPTICAL_ATTACK_MANAGER_loop_seconds",
+    "tfs_opticalattackmanager_loop_seconds",
     "Time taken by each security loop",
     buckets=(
         1.0,
@@ -113,17 +113,17 @@ LOOP_TIME = Histogram(
 )
 
 CURRENT_SERVICES = Gauge(
-    "OPTICAL_ATTACK_MANAGER_active_services",
+    "tfs_opticalattackmanager_active_services",
     "Active optical services currently in the network",
 )
 
 NUMBER_WORKERS = Gauge(
-    "OPTICAL_ATTACK_MANAGER_number_workers",
+    "tfs_opticalattackmanager_number_workers",
     "Number of workers being used by the loop",
 )
 
 DESIRED_MONITORING_INTERVAL = Gauge(
-    "OPTICAL_ATTACK_MANAGER_desired_monitoring_interval",
+    "tfs_opticalattackmanager_desired_monitoring_interval",
     "Desired loop monitoring interval",
 )