diff --git a/docs/ansible/vars.md b/docs/ansible/vars.md
index a96806667..bd808b1c5 100644
--- a/docs/ansible/vars.md
+++ b/docs/ansible/vars.md
@@ -171,6 +171,7 @@ kube_apiserver_admission_event_rate_limits:
 ```
 
 * *kube_apiserver_service_account_lookup* - Enable validation service account before validating token. Default `true`.
+* *kube_apiserver_service_account_extend_token_expiration* - Extend admission-injected service account tokens to 1 year (kube-apiserver `--service-account-extend-token-expiration`). Not set by default (kube-apiserver default `true`). Set to `false` to disable.
 
 Note, if cloud providers have any use of the ``10.233.0.0/16``, like instances'
 private addresses, make sure to pick another values for ``kube_service_addresses``
diff --git a/docs/operations/hardening.md b/docs/operations/hardening.md
index f84793128..b4aef5d50 100644
--- a/docs/operations/hardening.md
+++ b/docs/operations/hardening.md
@@ -20,6 +20,7 @@ The **kubernetes** version should be at least `v1.23.6` to have all the most rec
 authorization_modes: ['Node', 'RBAC']
 kube_apiserver_request_timeout: 120s
 kube_apiserver_service_account_lookup: true
+kube_apiserver_service_account_extend_token_expiration: false
 
 # enable kubernetes audit
 kubernetes_audit: true
@@ -120,6 +121,7 @@ kube_pod_security_default_enforce: restricted
 Let's take a deep look to the resultant **kubernetes** configuration:
 
 * The `anonymous-auth` (on `kube-apiserver`) is set to `true` by default. This is fine, because it is considered safe if you enable `RBAC` for the `authorization-mode`.
+* The `service-account-extend-token-expiration` (on `kube-apiserver`) is set to `false`. Admission-injected service account tokens then expire at their normal lifetime (about 1 hour), not after 1 year. Workloads with client libraries that do not reload the token from disk can get authentication errors. To find these workloads before you set it, use the `authentication.k8s.io/stale-token` audit annotation or the `serviceaccount_stale_tokens_total` metric.
 * The `enable-admission-plugins` includes `PodSecurity` (for more details, please take a look here: <https://kubernetes.io/docs/concepts/security/pod-security-admission/>). Then, we set the `EventRateLimit` plugin, providing additional configuration files (that are automatically created under the hood and mounted inside the `kube-apiserver` container) to make it work.
 * The `encryption-provider-config` provide encryption at rest. This means that the `kube-apiserver` encrypt data that is going to be stored before they reach `etcd`. So the data is completely unreadable from `etcd` (in case an attacker is able to exploit this).
 * The `rotateCertificates` in `KubeletConfiguration` is set to `true` along with `serverTLSBootstrap`. This could be used in alternative to `tlsCertFile` and `tlsPrivateKeyFile` parameters. Additionally it automatically generates certificates by itself. By default the CSRs are approved automatically via [kubelet-csr-approver](https://github.com/postfinance/kubelet-csr-approver). You can customize approval configuration by modifying Helm values via `kubelet_csr_approver_values`.
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
index 6c8827003..c21b5c4b1 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
@@ -178,6 +178,10 @@ apiServer:
   - name: service-account-lookup
     value: "{{ kube_apiserver_service_account_lookup }}"
 {% endif %}
+{% if kube_apiserver_service_account_extend_token_expiration is defined %}
+  - name: service-account-extend-token-expiration
+    value: "{{ kube_apiserver_service_account_extend_token_expiration }}"
+{% endif %}
 {% if kube_oidc_auth and kube_oidc_url is defined and kube_oidc_client_id is defined and not kube_apiserver_use_authentication_config_file %}
   - name: oidc-issuer-url
     value: "{{ kube_oidc_url }}"
diff --git a/tests/files/ubuntu24-calico-all-in-one-hardening.yml b/tests/files/ubuntu24-calico-all-in-one-hardening.yml
index 379b47878..1cc67fdea 100644
--- a/tests/files/ubuntu24-calico-all-in-one-hardening.yml
+++ b/tests/files/ubuntu24-calico-all-in-one-hardening.yml
@@ -15,6 +15,7 @@ enable_nodelocaldns: false
 authorization_modes: ["Node", "RBAC"]
 kube_apiserver_request_timeout: 120s
 kube_apiserver_service_account_lookup: true
+kube_apiserver_service_account_extend_token_expiration: false
 
 # enable kubernetes audit
 kubernetes_audit: true