diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index 98a011cc1a3c4b7ae557b2f4ede20b18288d664f..354f0c70413315583fb08a43ab729f91d5cdf6f3 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -475,6 +475,9 @@ actions:
   - action: overlay
     source: overlays/create-homedir
 
+  - action: overlay
+    source: overlays/sudo-fqdn
+
   - action: overlay
     source: overlays/default-locale-c-utf8
 
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index d3fabab86e953d7bc91f47dee2dbc8051ad6ec09..cf2a37ae636fba9df1b236c440121fee6828e379 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -377,6 +377,9 @@ actions:
   - action: overlay
     source: overlays/create-homedir
 
+  - action: overlay
+    source: overlays/sudo-fqdn
+
   - action: overlay
     source: overlays/default-locale-c-utf8
 
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index a2b91915e78840b36a31caebfd2326182ef18fb8..a5c458da2c3eb9c883bd8ed0155a214ba17b6219 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -97,6 +97,9 @@ actions:
   - action: overlay
     source: overlays/create-homedir
 
+  - action: overlay
+    source: overlays/sudo-fqdn
+
   - action: overlay
     source: overlays/default-locale-c-utf8
 
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index fa5a396528d548f8aa1b9ebf1e3afb50c8277abc..4d146fd4d3d48d90d74981cca5a2e15fd21c36a2 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -673,6 +673,9 @@ actions:
   - action: overlay
     source: overlays/create-homedir
 
+  - action: overlay
+    source: overlays/sudo-fqdn
+
   - action: overlay
     source: overlays/default-locale-c-utf8
 
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index 1ac135cf410168177922b4d9a70b886c2afc5b9d..b7513960356b7cce106a8324a335a0bbf089ffec 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -210,6 +210,9 @@ actions:
   - action: overlay
     source: overlays/create-homedir
 
+  - action: overlay
+    source: overlays/sudo-fqdn
+
   - action: overlay
     source: overlays/default-locale-c-utf8
 
diff --git a/overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn b/overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn
new file mode 100644
index 0000000000000000000000000000000000000000..4937aff8278c5685013919ebb9562d1f54ea7828
--- /dev/null
+++ b/overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn
@@ -0,0 +1,3 @@
+# FQDN lookup is painfully slow if the DNS server is misconfigured.
+# Use gethostname() instead.
+Defaults !fqdn