diff --git a/laborious/activities/opc.py b/laborious/activities/opc.py
index 7d9a81a..89073a5 100644
--- a/laborious/activities/opc.py
+++ b/laborious/activities/opc.py
@@ -49,7 +49,6 @@ class OPC(SientiaMonitoring):
         SientiaMonitoring.__init__(self, logger, notification_handler, metrics_controller)
 
         self.opc_repository: dict[str, OpcRepository] = {}
-        self.opc_servers = opc_servers
 
     async def init_opc(self):
         """
diff --git a/laborious/utils/repository/opc_repository.py b/laborious/utils/repository/opc_repository.py
index 9dbd2b1..cfa1a09 100644
--- a/laborious/utils/repository/opc_repository.py
+++ b/laborious/utils/repository/opc_repository.py
@@ -161,6 +161,10 @@ class OpcRepository(SientiaMonitoring):
                 - dict: Error information if connection failed
         """
 
+        tags = {
+            'pod_id': self.pod_id,
+            'server_name': self.server_name,
+        }
         try:
             self.last_reconnection_time = datetime.now()
             if self.client is None:
@@ -172,11 +176,7 @@ class OpcRepository(SientiaMonitoring):
                 }
             await self.client.connect()
 
-            tags = {
-                'pod_id': self.pod_id,
-                'server_name': self.server_name,
-            }
-
+        
             await self.emit_metric(
                 metric_object=metrics.OPC_CONNECTION_STATUS,
                 method='set',
@@ -260,7 +260,7 @@ class OpcRepository(SientiaMonitoring):
             method='set',
             tags={
                 'pod_id': self.pod_id,
-                'opc_server_id': self.id,
+                'server_name': self.server_name,
             },
             value=0,
         )