diff --git a/laborious/utils/repository/opc_repository.py b/laborious/utils/repository/opc_repository.py
index cfa1a09..5abef53 100644
--- a/laborious/utils/repository/opc_repository.py
+++ b/laborious/utils/repository/opc_repository.py
@@ -180,14 +180,14 @@ class OpcRepository(SientiaMonitoring):
             await self.emit_metric(
                 metric_object=metrics.OPC_CONNECTION_STATUS,
                 method='set',
-                tags=tags,
+                tags={
+                    **tags,
+                    'server_url': self.url,
+                },
                 value=1,
             )
 
-            await self.emit_metric(metrics.OPC_CONNECTIONS_TOTAL, {
-                **tags,
-                'server_url': self.url,
-            })
+            await self.emit_metric(metrics.OPC_CONNECTIONS_TOTAL, tags)
 
             return True, {}
         except Exception as e:
@@ -261,6 +261,7 @@ class OpcRepository(SientiaMonitoring):
             tags={
                 'pod_id': self.pod_id,
                 'server_name': self.server_name,
+                'server_url': self.url,
             },
             value=0,
         )