diff --git a/k8s/apps/iperf3/daemonset.yaml b/k8s/apps/iperf3/daemonset.yaml
index 61ccd44..d911896 100644
--- a/k8s/apps/iperf3/daemonset.yaml
+++ b/k8s/apps/iperf3/daemonset.yaml
@@ -11,23 +11,61 @@ spec:
       labels:
         app: iperf3-server
     spec:
+      serviceAccountName: iperf3-server
       subdomain: iperf3
       initContainers:
-      - name: set-hostname
-        image: busybox:1.35
-        command: ['sh', '-c']
-        args:
-          - |
-            NODE_NAME=$(echo $NODE_NAME | cut -d'.' -f1 | tr '[:upper:]' '[:lower:]')
-            echo "iperf3-${NODE_NAME}" > /etc/hostname
-            hostname "iperf3-${NODE_NAME}"
-        securityContext:
-          privileged: true
+      - name: create-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-${NODE_CLEAN}"
+            
+            # Create service for this pod
+            kubectl apply -f - <<EOF
+            apiVersion: v1
+            kind: Service
+            metadata:
+              name: ${SERVICE_NAME}
+              namespace: iperf3
+              labels:
+                app: iperf3-node-service
+                target-node: "${NODE_NAME}"
+            spec:
+              type: ClusterIP
+              ports:
+                - name: iperf3
+                  port: 5201
+                  protocol: TCP
+            ---
+            apiVersion: v1
+            kind: Endpoints
+            metadata:
+              name: ${SERVICE_NAME}
+              namespace: iperf3
+              labels:
+                app: iperf3-node-service
+                target-node: "${NODE_NAME}"
+            subsets:
+              - addresses:
+                  - ip: ${POD_IP}
+                ports:
+                  - name: iperf3
+                    port: 5201
+                    protocol: TCP
+            EOF
       containers:
       - name: iperf3-server
         image: networkstatic/iperf3:latest
@@ -40,8 +78,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        - name: HOSTNAME
-          value: $(NODE_NAME)
         resources:
           requests:
             memory: "64Mi"
diff --git a/k8s/apps/iperf3/kustomization.yaml b/k8s/apps/iperf3/kustomization.yaml
index 3272b19..3d54059 100644
--- a/k8s/apps/iperf3/kustomization.yaml
+++ b/k8s/apps/iperf3/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - rbac.yaml
   - daemonset.yaml
   - service-headless.yaml
   - iperf3-exporter-daemonset.yaml
diff --git a/k8s/apps/iperf3/rbac.yaml b/k8s/apps/iperf3/rbac.yaml
new file mode 100644
index 0000000..dca86c4
--- /dev/null
+++ b/k8s/apps/iperf3/rbac.yaml
@@ -0,0 +1,36 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: iperf3-server
+  namespace: iperf3
+  labels:
+    app: iperf3-server
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: iperf3-service-manager
+  namespace: iperf3
+  labels:
+    app: iperf3-server
+rules:
+  - apiGroups: [""]
+    resources: ["services", "endpoints"]
+    verbs: ["get", "list", "create", "update", "patch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: iperf3-service-manager
+  namespace: iperf3
+  labels:
+    app: iperf3-server
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: iperf3-service-manager
+subjects:
+  - kind: ServiceAccount
+    name: iperf3-server
+    namespace: iperf3
\ No newline at end of file
diff --git a/k8s/apps/iperf3/servicemonitor.yaml b/k8s/apps/iperf3/servicemonitor.yaml
index 37092a0..b664255 100644
--- a/k8s/apps/iperf3/servicemonitor.yaml
+++ b/k8s/apps/iperf3/servicemonitor.yaml
@@ -16,17 +16,17 @@ spec:
       interval: 5m
       scrapeTimeout: 30s
       params:
+        target:
+          - "iperf3.iperf3.svc.cluster.local:5201"
         duration:
           - "10"
         streams:
           - "4"
       relabelings:
-        - sourceLabels: [__address__]
-          targetLabel: __param_target
-          regex: (.+):9579
-          replacement: iperf3-${1}.iperf3.iperf3.svc.cluster.local:5201
         - sourceLabels: [__param_target]
           targetLabel: instance
+        - sourceLabels: [__param_target]
+          targetLabel: __param_target
         - targetLabel: __address__
           replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
       metricRelabelings: