diff --git a/cmd/k8s-node-labeller/main.go b/cmd/k8s-node-labeller/main.go
index b745e972bd3c9deb26982460b3fb1e2b09ee5af6..b8a960eac4dcb8ce97f41e0c2316a4461dbca619 100644
--- a/cmd/k8s-node-labeller/main.go
+++ b/cmd/k8s-node-labeller/main.go
@@ -293,11 +293,7 @@ func main() {
 	}
 
 	// laballer only respond to event about the node it is on by matching hostname
-	b, err := ioutil.ReadFile("/labeller/hostname")
-	if err != nil {
-		entryLog.Error(err, "Cannot read hostname")
-	}
-	hostname := strings.TrimSpace(string(b))
+	hostname := os.Getenv("DS_NODE_NAME")
 
 	pred := predicate.Funcs{
 		// Create returns true if the Create event should be processed
diff --git a/k8s-ds-amdgpu-labeller.yaml b/k8s-ds-amdgpu-labeller.yaml
index c417df1c786dbba66c67c90620c4993a677ad979..8c896ab9c3877b21adec1810fbbc91a7deaf7426 100644
--- a/k8s-ds-amdgpu-labeller.yaml
+++ b/k8s-ds-amdgpu-labeller.yaml
@@ -49,9 +49,15 @@ spec:
       containers:
       - image: rocm/k8s-device-plugin:labeller-latest
         name: amdgpu-lr-cntr
+        imagePullPolicy: Always
         workingDir: /root
         command: ["./k8s-node-labeller"]
         args: ["-vram", "-cu-count", "-simd-count", "-device-id", "-family"]
+        env:
+          - name: DS_NODE_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
         securityContext:
           privileged: true #Needed for /dev
           capabilities:
@@ -61,8 +67,6 @@ spec:
             mountPath: /sys
           - name: dev
             mountPath: /dev
-          - name: etc
-            mountPath: /labeller
       volumes:
         - name: sys
           hostPath:
@@ -70,6 +74,3 @@ spec:
         - name: dev
           hostPath:
             path: /dev
-        - name: etc
-          hostPath:
-            path: /etc