diff --git a/nfd-daemonset-combined.yaml.template b/nfd-daemonset-combined.yaml.template
index 738fd6dab..036f92b31 100644
--- a/nfd-daemonset-combined.yaml.template
+++ b/nfd-daemonset-combined.yaml.template
@@ -62,7 +62,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0
+          image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
           name: nfd-master
           securityContext:
             allowPrivilegeEscalation: false
@@ -77,7 +77,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0
+          image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
           name: nfd-worker
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/nfd-master.yaml.template b/nfd-master.yaml.template
index d1dd32e7c..b41a46abc 100644
--- a/nfd-master.yaml.template
+++ b/nfd-master.yaml.template
@@ -79,7 +79,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0
+          image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
           name: nfd-master
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/nfd-worker-daemonset.yaml.template b/nfd-worker-daemonset.yaml.template
index 8b5871502..18094619c 100644
--- a/nfd-worker-daemonset.yaml.template
+++ b/nfd-worker-daemonset.yaml.template
@@ -21,7 +21,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0
+          image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
           name: nfd-worker
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/nfd-worker-job.yaml.template b/nfd-worker-job.yaml.template
index 0295cf68a..7b25d1444 100644
--- a/nfd-worker-job.yaml.template
+++ b/nfd-worker-job.yaml.template
@@ -30,7 +30,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0
+          image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
           name: nfd-worker
           securityContext:
             allowPrivilegeEscalation: false