diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
index 8163657cf..6f3cc6859 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
@@ -8,8 +8,6 @@ metadata:
   name: '{{ .Values.hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name }}'
 data:
   values.yaml: |-
-    image:
-      tag: v{{ .Chart.Version }}-minimal
     master:
       extraLabelNs:
         - nvidia.com
diff --git a/pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go b/pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go
index c86946969..54caeeee9 100644
--- a/pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go
+++ b/pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go
@@ -66,6 +66,11 @@ func (s helmAddonStrategy) apply(
 		)
 	}
 
+	values += fmt.Sprintf(`
+image:
+  tag: v%s-minimal
+`, s.helmChart.Version)
+
 	hcp := &caaphv1.HelmChartProxy{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: caaphv1.GroupVersion.String(),