diff --git a/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml b/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml
index b5ac31d..36b3a7b 100644
--- a/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml
+++ b/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml
@@ -14,60 +14,6 @@ spec:
       labels:
         app: iperf3-exporter
     spec:
-      serviceAccountName: iperf3-server
-      initContainers:
-      - name: create-exporter-service
-        image: bitnami/kubectl:latest
-        env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        command:
-          - /bin/bash
-          - -c
-          - |
-            # Clean node name for service name
-            NODE_CLEAN=$(echo "$NODE_NAME" | cut -d'.' -f1 | tr '[:upper:]' '[:lower:]' | tr '_' '-')
-            SERVICE_NAME="iperf3-exporter-${NODE_CLEAN}"
-            
-            # Create service for this exporter pod
-            kubectl apply -f - <<EOF
-            apiVersion: v1
-            kind: Service
-            metadata:
-              name: ${SERVICE_NAME}
-              namespace: iperf3
-              labels:
-                app: iperf3-exporter-service
-                target-node: "${NODE_NAME}"
-            spec:
-              type: ClusterIP
-              ports:
-                - name: metrics
-                  port: 9579
-                  protocol: TCP
-            ---
-            apiVersion: v1
-            kind: Endpoints
-            metadata:
-              name: ${SERVICE_NAME}
-              namespace: iperf3
-              labels:
-                app: iperf3-exporter-service
-                target-node: "${NODE_NAME}"
-            subsets:
-              - addresses:
-                  - ip: ${POD_IP}
-                ports:
-                  - name: metrics
-                    port: 9579
-                    protocol: TCP
-            EOF
       containers:
       - name: iperf3-exporter
         image: ghcr.io/edgard/iperf3_exporter:1.2.2
diff --git a/k8s/apps/iperf3/servicemonitor.yaml b/k8s/apps/iperf3/servicemonitor.yaml
index cc66436..161fd6c 100644
--- a/k8s/apps/iperf3/servicemonitor.yaml
+++ b/k8s/apps/iperf3/servicemonitor.yaml
@@ -16,28 +16,105 @@ spec:
       interval: 5m
       scrapeTimeout: 30s
       params:
-        target:
-          - "iperf3-ch.iperf3.svc.cluster.local:5201"
-          - "iperf3-us.iperf3.svc.cluster.local:5201"
-          - "iperf3-iris.iperf3.svc.cluster.local:5201"
-          - "iperf3-home.iperf3.svc.cluster.local:5201"
-          - "iperf3-master.iperf3.svc.cluster.local:5201"
-          - "iperf3-it.iperf3.svc.cluster.local:5201"
-          - "iperf3-nas.iperf3.svc.cluster.local:5201"
-          - "iperf3-spb.iperf3.svc.cluster.local:5201"
-        duration:
-          - "10"
-        streams:
-          - "4"
+        target: ['iperf3-ch.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
       relabelings:
         - sourceLabels: [__param_target]
           targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+    - port: metrics
+      path: /probe
+      interval: 5m
+      scrapeTimeout: 30s
+      params:
+        target: ['iperf3-us.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
+      relabelings:
         - sourceLabels: [__param_target]
-          targetLabel: __param_target
+          targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+    - port: metrics
+      path: /probe
+      interval: 5m
+      scrapeTimeout: 30s
+      params:
+        target: ['iperf3-iris.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
+      relabelings:
         - sourceLabels: [__param_target]
-          targetLabel: __address__
-          regex: iperf3-(.+)\.iperf3\.svc\.cluster\.local:5201
-          replacement: iperf3-exporter-${1}.iperf3.svc.cluster.local:9579
+          targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+    - port: metrics
+      path: /probe
+      interval: 5m
+      scrapeTimeout: 30s
+      params:
+        target: ['iperf3-home.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
+      relabelings:
+        - sourceLabels: [__param_target]
+          targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+    - port: metrics
+      path: /probe
+      interval: 5m
+      scrapeTimeout: 30s
+      params:
+        target: ['iperf3-master.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
+      relabelings:
+        - sourceLabels: [__param_target]
+          targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+    - port: metrics
+      path: /probe
+      interval: 5m
+      scrapeTimeout: 30s
+      params:
+        target: ['iperf3-it.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
+      relabelings:
+        - sourceLabels: [__param_target]
+          targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+    - port: metrics
+      path: /probe
+      interval: 5m
+      scrapeTimeout: 30s
+      params:
+        target: ['iperf3-nas.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
+      relabelings:
+        - sourceLabels: [__param_target]
+          targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+    - port: metrics
+      path: /probe
+      interval: 5m
+      scrapeTimeout: 30s
+      params:
+        target: ['iperf3-spb.iperf3.svc.cluster.local:5201']
+        period: ['10s']
+        streams: ['4']
+      relabelings:
+        - sourceLabels: [__param_target]
+          targetLabel: instance
+        - targetLabel: __address__
+          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
       metricRelabelings:
         - sourceLabels: [__name__]
           regex: iperf3_(.+)