diff --git a/src/modules/machineid/machineid.conf b/src/modules/machineid/machineid.conf
index c6189e598..15e190299 100644
--- a/src/modules/machineid/machineid.conf
+++ b/src/modules/machineid/machineid.conf
@@ -11,21 +11,39 @@
 #
 ---
 # Whether to create /etc/machine-id for systemd.
+# The default is *false*.
 systemd: true
 
 # Whether to create /var/lib/dbus/machine-id for D-Bus.
+# The default is *false*.
 dbus: true
 # Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
 # (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+# The default is *false*.
 dbus-symlink: true
 
-# Whether to create an entropy file /var/lib/urandom/random-seed
-#
-# DEPRECATED: list the file in entropy-files instead
-entropy: false
-# Whether to copy entropy from the host
+# Copy entropy from the host? If this is set to *true*, then
+# any entropy file listed below will be copied from the host
+# if it exists. Non-existent files will be generated from
+# /dev/urandom . The default is *false*.
 entropy-copy: false
-# Which files to write (paths in the target)
+# Which files to write (paths in the target). Each of these files is
+# either generated from /dev/urandom or copied from the host, depending
+# on the setting for *entropy-copy*, above.
 entropy-files:
     - /var/lib/urandom/random-seed
     - /var/lib/systemd/random-seed
+
+# Whether to create an entropy file /var/lib/urandom/random-seed
+#
+# DEPRECATED: list the file in entropy-files instead. If this key
+# exists and is set to *true*, a warning is printed and Calamares
+# behaves as if `/var/lib/urandom/random-seed` is listed in *entropy-files*.
+#
+# entropy: false
+
+# Whether to create a symlink for D-Bus
+#
+# DEPRECATED: set *dbus-symlink* with the same meaning instead.
+#
+# symlink: false
diff --git a/src/modules/machineid/machineid.schema.yaml b/src/modules/machineid/machineid.schema.yaml
index 1ae67e132..59bb5f81b 100644
--- a/src/modules/machineid/machineid.schema.yaml
+++ b/src/modules/machineid/machineid.schema.yaml
@@ -6,11 +6,11 @@ $id: https://calamares.io/schemas/machineid
 additionalProperties: false
 type: object
 properties:
-    systemd: { type: boolean, default: true }
-    dbus: { type: boolean, default: true }
-    "dbus-symlink": { type: boolean, default: true }
+    systemd: { type: boolean, default: false }
+    dbus: { type: boolean, default: false }
+    "dbus-symlink": { type: boolean, default: false }
     "entropy-copy": { type: boolean, default: false }
     "entropy-files": { type: array, items: { type: string } }
     # Deprecated properties
-    symlink: { type: boolean, default: true }
+    symlink: { type: boolean, default: false }
     entropy: { type: boolean, default: false }