diff --git a/infra/k8s/gpu-overlays/ml-training-service-gpu.yaml b/infra/k8s/gpu-overlays/ml-training-service-gpu.yaml
index 2650bad28..642e959b8 100644
--- a/infra/k8s/gpu-overlays/ml-training-service-gpu.yaml
+++ b/infra/k8s/gpu-overlays/ml-training-service-gpu.yaml
@@ -24,9 +24,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9094"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9094"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: ml-training-service
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/gpu-overlays/trading-service-gpu.yaml b/infra/k8s/gpu-overlays/trading-service-gpu.yaml
index 52dcf2ed1..a66b4f619 100644
--- a/infra/k8s/gpu-overlays/trading-service-gpu.yaml
+++ b/infra/k8s/gpu-overlays/trading-service-gpu.yaml
@@ -24,9 +24,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9092"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9092"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: trading-service
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/monitoring/dcgm-exporter.yaml b/infra/k8s/monitoring/dcgm-exporter.yaml
index 5bf5b2add..8e798e96b 100644
--- a/infra/k8s/monitoring/dcgm-exporter.yaml
+++ b/infra/k8s/monitoring/dcgm-exporter.yaml
@@ -51,9 +51,6 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9400"
         prometheus.io/path: "/metrics"
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9400"
-        gitlab.com/prometheus_path: "/metrics"
     spec:
       # Only schedule on nodes that have GPUs
       affinity:
@@ -118,8 +115,6 @@ metadata:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "9400"
-    gitlab.com/prometheus_scrape: "true"
-    gitlab.com/prometheus_port: "9400"
 spec:
   type: ClusterIP
   selector:
diff --git a/infra/k8s/monitoring/node-exporter.yaml b/infra/k8s/monitoring/node-exporter.yaml
index ade560ebd..88b7f1b8b 100644
--- a/infra/k8s/monitoring/node-exporter.yaml
+++ b/infra/k8s/monitoring/node-exporter.yaml
@@ -30,9 +30,7 @@ spec:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9100"
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9100"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/path: "/metrics"
     spec:
       serviceAccountName: node-exporter
       hostPID: true
diff --git a/infra/k8s/services/api.yaml b/infra/k8s/services/api.yaml
index 5abcc7243..46acd2158 100644
--- a/infra/k8s/services/api.yaml
+++ b/infra/k8s/services/api.yaml
@@ -19,9 +19,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9091"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9091"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: api
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/services/backtesting-service.yaml b/infra/k8s/services/backtesting-service.yaml
index ce3285ed3..01214a954 100644
--- a/infra/k8s/services/backtesting-service.yaml
+++ b/infra/k8s/services/backtesting-service.yaml
@@ -19,9 +19,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9093"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9093"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: backtesting-service
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/services/broker-gateway.yaml b/infra/k8s/services/broker-gateway.yaml
index b6cb916ff..05b22638b 100644
--- a/infra/k8s/services/broker-gateway.yaml
+++ b/infra/k8s/services/broker-gateway.yaml
@@ -19,9 +19,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9096"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9096"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: broker-gateway
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/services/data-acquisition-service.yaml b/infra/k8s/services/data-acquisition-service.yaml
index 8cdd23fd0..59bb0292f 100644
--- a/infra/k8s/services/data-acquisition-service.yaml
+++ b/infra/k8s/services/data-acquisition-service.yaml
@@ -19,9 +19,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9097"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9097"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: data-acquisition-service
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/services/ml-training-service.yaml b/infra/k8s/services/ml-training-service.yaml
index e473e9a83..15903a83d 100644
--- a/infra/k8s/services/ml-training-service.yaml
+++ b/infra/k8s/services/ml-training-service.yaml
@@ -61,9 +61,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9094"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9094"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: ml-training-service
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/services/trading-agent-service.yaml b/infra/k8s/services/trading-agent-service.yaml
index 5123180de..085477fa4 100644
--- a/infra/k8s/services/trading-agent-service.yaml
+++ b/infra/k8s/services/trading-agent-service.yaml
@@ -19,9 +19,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9095"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9095"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: trading-agent-service
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/services/trading-service.yaml b/infra/k8s/services/trading-service.yaml
index bb6711a9f..4104ffa22 100644
--- a/infra/k8s/services/trading-service.yaml
+++ b/infra/k8s/services/trading-service.yaml
@@ -19,9 +19,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9092"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9092"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: trading-service
         app.kubernetes.io/part-of: foxhunt
diff --git a/infra/k8s/training/job-template.yaml b/infra/k8s/training/job-template.yaml
index 565ee229b..f8235377e 100644
--- a/infra/k8s/training/job-template.yaml
+++ b/infra/k8s/training/job-template.yaml
@@ -14,9 +14,9 @@ spec:
   template:
     metadata:
       annotations:
-        gitlab.com/prometheus_scrape: "true"
-        gitlab.com/prometheus_port: "9094"
-        gitlab.com/prometheus_path: "/metrics"
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9094"
+        prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: training
         app.kubernetes.io/component: training-workflow