diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md
index bc53a8a..9556614 100644
--- a/charts/spire/charts/spire-agent/README.md
+++ b/charts/spire/charts/spire-agent/README.md
@@ -123,7 +123,6 @@ A Helm chart to install the SPIRE agent.
 | `experimental.syncInterval`                       | Sync interval with SPIRE server with exponential backoff                                                                                                                                          | `5s`                                                                             |
 | `experimental.featureFlags`                       | List of developer feature flags                                                                                                                                                                   | `[]`                                                                             |
 | `agents`                                          | Configure multiple agent DaemonSets. Useful when you have different node types and nodeAttestors                                                                                                  | `{}`                                                                             |
-| `installAndUpgradeHook.enabled`                   | Enable Helm hook to autofix common install/upgrade issues (should be disabled when using `helm template`)                                                                                         | `true`                                                                           |
 | `tools.kubectl.image.registry`                    | The OCI registry to pull the image from                                                                                                                                                           | `docker.io`                                                                      |
 | `tools.kubectl.image.repository`                  | The repository within the registry                                                                                                                                                                | `rancher/kubectl`                                                                |
 | `tools.kubectl.image.pullPolicy`                  | The image pull policy                                                                                                                                                                             | `IfNotPresent`                                                                   |
diff --git a/charts/spire/charts/spire-agent/templates/pre-upgrade-hook.yaml b/charts/spire/charts/spire-agent/templates/pre-upgrade-hook.yaml
deleted file mode 100644
index e28c2bc..0000000
--- a/charts/spire/charts/spire-agent/templates/pre-upgrade-hook.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-{{- if eq ((dig "installAndUpgradeHooks" "enabled" .Values.installAndUpgradeHook.enabled .Values.global) | toString) "true" }}
-{{- $ds := lookup "apps/v1" "DaemonSet" (include "spire-agent.namespace" .) (include "spire-agent.fullname" .) }}
-{{- if and $ds (not (hasKey $ds.metadata.labels "app.kubernetes.io/component")) }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "spire-agent.serviceAccountName" . }}-pre-upgrade
-  namespace: {{ include "spire-agent.namespace" . }}
-  labels:
-    {{- include "spire-agent.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "spire-agent.fullname" . }}-pre-upgrade
-  namespace: {{ include "spire-agent.namespace" . }}
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed
-rules:
-  - apiGroups: ["apps"]
-    resources: ["daemonsets"]
-    resourceNames: [{{ include "spire-agent.fullname" . | quote }}]
-    verbs: ["get", "delete"]
----
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "spire-agent.fullname" . }}-pre-upgrade
-  namespace: {{ include "spire-agent.namespace" . }}
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "spire-agent.serviceAccountName" . }}-pre-upgrade
-    namespace: {{ include "spire-agent.namespace" . }}
-roleRef:
-  kind: Role
-  name: {{ include "spire-agent.fullname" . }}-pre-upgrade
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "spire-agent.fullname" . }}-pre-upgrade
-  namespace: {{ include "spire-agent.namespace" . }}
-  labels:
-    {{- include "spire-agent.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed
-spec:
-  template:
-    metadata:
-      name: {{ include "spire-agent.fullname" . }}-pre-upgrade
-    spec:
-      restartPolicy: Never
-      serviceAccountName: {{ include "spire-agent.serviceAccountName" . }}-pre-upgrade
-      securityContext:
-        {{- include "spire-lib.podsecuritycontext" . | nindent 8 }}
-      containers:
-      - name: pre-upgrade
-        securityContext:
-          {{- include "spire-lib.securitycontext" . | nindent 10 }}
-        image: {{ template "spire-lib.kubectl-image" (dict "appVersion" $.Chart.AppVersion "image" .Values.tools.kubectl.image "global" .Values.global "KubeVersion" .Capabilities.KubeVersion.Version) }}
-        args:
-          - delete
-          - daemonset
-          - {{ include "spire-agent.fullname" . }}
-          - -n
-          - {{ include "spire-agent.namespace" . }}
-{{- end }}
-{{- end }}
diff --git a/charts/spire/charts/spire-agent/values.yaml b/charts/spire/charts/spire-agent/values.yaml
index 6d7dcf0..f9ab02d 100644
--- a/charts/spire/charts/spire-agent/values.yaml
+++ b/charts/spire/charts/spire-agent/values.yaml
@@ -329,10 +329,6 @@ agents: {}
 #      tpmDirect:
 #        enabled: true
 
-installAndUpgradeHook:
-  ## @param installAndUpgradeHook.enabled Enable Helm hook to autofix common install/upgrade issues (should be disabled when using `helm template`)
-  enabled: true
-
 tools:
   kubectl:
     ## @param tools.kubectl.image.registry The OCI registry to pull the image from