diff --git a/test/e2e/node_feature_discovery.go b/test/e2e/node_feature_discovery.go
index 8986b4977..915568a97 100644
--- a/test/e2e/node_feature_discovery.go
+++ b/test/e2e/node_feature_discovery.go
@@ -47,8 +47,9 @@ import (
 )
 
 var (
-	dockerRepo = flag.String("nfd.repo", "gcr.io/k8s-staging-nfd/node-feature-discovery", "Docker repository to fetch image from")
-	dockerTag  = flag.String("nfd.tag", "master", "Docker tag to use")
+	dockerRepo  = flag.String("nfd.repo", "gcr.io/k8s-staging-nfd/node-feature-discovery", "Docker repository to fetch image from")
+	dockerTag   = flag.String("nfd.tag", "master", "Docker tag to use")
+	dockerImage = fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)
 )
 
 // cleanupNode deletes all NFD-related metadata from the Node object, i.e.
@@ -151,7 +152,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
 
 			// Launch nfd-master
 			By("Creating nfd master pod and nfd-master service")
-			imageOpt := testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag))
+			imageOpt := testpod.SpecWithContainerImage(dockerImage)
 			masterPod = e2epod.NewPodClient(f).CreateSync(testpod.NFDMaster(imageOpt))
 
 			// Create nfd-master service
@@ -197,7 +198,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
 				By("Creating a nfd worker pod")
 				podSpecOpts := []testpod.SpecOption{
 					testpod.SpecWithRestartPolicy(corev1.RestartPolicyNever),
-					testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)),
+					testpod.SpecWithContainerImage(dockerImage),
 					testpod.SpecWithContainerExtraArgs("-oneshot", "-label-sources=fake"),
 				}
 				workerPod := testpod.NFDWorker(podSpecOpts...)
@@ -246,7 +247,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
 				fConf := cfg.DefaultFeatures
 
 				By("Creating nfd-worker daemonset")
-				podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag))}
+				podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(dockerImage)}
 				workerDS := testds.NFDWorker(podSpecOpts...)
 				workerDS, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(context.TODO(), workerDS, metav1.CreateOptions{})
 				Expect(err).NotTo(HaveOccurred())
@@ -377,7 +378,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
 
 				By("Creating nfd-worker daemonset with configmap mounted")
 				podSpecOpts := []testpod.SpecOption{
-					testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)),
+					testpod.SpecWithContainerImage(dockerImage),
 					testpod.SpecWithConfigMap(cm1.Name, filepath.Join(custom.Directory, "cm1")),
 					testpod.SpecWithConfigMap(cm2.Name, filepath.Join(custom.Directory, "cm2")),
 				}
@@ -439,7 +440,7 @@ core:
 
 				By("Creating nfd-worker daemonset")
 				podSpecOpts := []testpod.SpecOption{
-					testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)),
+					testpod.SpecWithContainerImage(dockerImage),
 					testpod.SpecWithConfigMap(cm.Name, "/etc/kubernetes/node-feature-discovery"),
 				}
 				workerDS := testds.NFDWorker(podSpecOpts...)
diff --git a/test/e2e/topology_updater.go b/test/e2e/topology_updater.go
index af6991994..8afd1399b 100644
--- a/test/e2e/topology_updater.go
+++ b/test/e2e/topology_updater.go
@@ -115,7 +115,7 @@ var _ = SIGDescribe("Node Feature Discovery topology updater", func() {
 			kcfg := cfg.GetKubeletConfig()
 			By(fmt.Sprintf("Using config (%#v)", kcfg))
 
-			podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag))}
+			podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(dockerImage)}
 			topologyUpdaterDaemonSet = testds.NFDTopologyUpdater(kcfg, podSpecOpts...)
 		})
 
@@ -281,7 +281,7 @@ excludeList:
 			By(fmt.Sprintf("Using config (%#v)", kcfg))
 
 			podSpecOpts := []testpod.SpecOption{
-				testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)),
+				testpod.SpecWithContainerImage(dockerImage),
 				testpod.SpecWithConfigMap(cm.Name, "/etc/kubernetes/node-feature-discovery"),
 			}
 			topologyUpdaterDaemonSet = testds.NFDTopologyUpdater(kcfg, podSpecOpts...)