diff --git a/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/node-problem-detector.yaml b/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/node-problem-detector.yaml
index a015c201ff6b..d0611831bf0c 100644
--- a/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/node-problem-detector.yaml
+++ b/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/node-problem-detector.yaml
@@ -42,7 +42,7 @@ spec:
         command:
         - /node-problem-detector
         - --logtostderr
-        - --config.system-log-monitor=/config/kernel-monitor.json,/config/docker-monitor.json
+        - --config.system-log-monitor=/config/kernel-monitor.json,/config/containerd-monitor.json
         image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.7
         resources:
           limits:
@@ -92,8 +92,8 @@ spec:
           items:
           - key: kernel-monitor.json
             path: kernel-monitor.json
-          - key: docker-monitor.json
-            path: docker-monitor.json
+          - key: containerd-monitor.json
+            path: containerd-monitor.json
       tolerations:
         - effect: NoSchedule
           operator: Exists
diff --git a/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/update.bash b/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/update.bash
index 1a41dfba94c8..1c38b9850f9d 100755
--- a/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/update.bash
+++ b/infra/aws/terraform/prow-build-cluster/resources/node-problem-detector/update.bash
@@ -29,11 +29,10 @@ for f in "${files[@]}"; do
 done
 
 function boilerplate() {
-  cat ${dir}/../../../../../../../hack/boilerplate/boilerplate.sh.txt | sed -e "s/\<YEAR\>/$(date +'%Y')/"
+  cat ${dir}/../../../../../../hack/boilerplate/boilerplate.sh.txt | sed -e "s/\<YEAR\>/$(date +'%Y')/"
 }
 
 for f in "${files[@]}"; do 
-    cat <(boilerplate) "$f" > tmp.yaml
-    mv tmp.yaml "$f"
+    cat <(boilerplate) "${dir}/$f" > tmp.yaml
+    mv tmp.yaml "${dir}/$f"
 done
-