diff --git a/ansible/group_vars/all/seed b/ansible/group_vars/all/seed
index 4df06f3b5..cdb8adbcb 100644
--- a/ansible/group_vars/all/seed
+++ b/ansible/group_vars/all/seed
@@ -103,5 +103,13 @@ seed_users: "{{ users_default }}"
 ###############################################################################
 # Seed node additional containers configuration
 
-# List of additional containers to deploy
+# Dict of container images to start
+# Example:
+# seed_containers:
+#   squid:
+#     name: "squid"
+#     image: "stackhpc/squid:3.5.20-1"
+#     pre: "{{ kayobe_config_path }}/containers/squid/pre.yml"
+#     post: "{{ kayobe_config_path }}/containers/squid/post.yml"
+#
 seed_containers: {}
diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml
index bc5183634..ab47953fc 100644
--- a/etc/kayobe/compute.yml
+++ b/etc/kayobe/compute.yml
@@ -7,7 +7,7 @@
 #compute_bootstrap_user:
 
 ###############################################################################
-# Network interface attachments.
+# Compute network interface configuration.
 
 # List of networks to which compute nodes are attached.
 #compute_network_interfaces:
@@ -75,6 +75,13 @@
 # for format.
 #compute_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on compute hosts. By default
+# this contains a 'docker-volumes' logical volume for Docker volume storage. It
+# will also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#compute_lvm_group_data_enabled:
+
 # Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for
 # format.
 #compute_lvm_group_data:
diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml
index edcfdee70..2fbe85b66 100644
--- a/etc/kayobe/controllers.yml
+++ b/etc/kayobe/controllers.yml
@@ -84,6 +84,13 @@
 # for format.
 #controller_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on controller hosts. By
+# default this contains a 'docker-volumes' logical volume for Docker volume
+# storage. It will also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#controller_lvm_group_data_enabled:
+
 # Controller LVM volume group for data. See mrlesmithjr.manage-lvm role for
 # format.
 #controller_lvm_group_data:
diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
index d71544e12..e0b5e0d00 100644
--- a/etc/kayobe/seed.yml
+++ b/etc/kayobe/seed.yml
@@ -7,7 +7,7 @@
 #seed_bootstrap_user:
 
 ###############################################################################
-# Network interface attachments.
+# Seed network interface configuration.
 
 # List of networks to which seed nodes are attached.
 #seed_network_interfaces:
@@ -31,24 +31,31 @@
 #seed_luks_devices:
 
 ###############################################################################
-# LVM configuration.
+# Seed node LVM configuration.
 
-# List of seed volume groups. See mrlesmithjr.manage-lvm role for
-# format.
+# List of seed volume groups. See mrlesmithjr.manage-lvm role for format.
 #seed_lvm_groups:
 
 # Default list of seed volume groups. See mrlesmithjr.manage-lvm role for
 # format.
 #seed_lvm_groups_default:
 
-# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role
-# for format.
+# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role for
+# format.
 #seed_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on the seed. By default this
+# contains a 'docker-volumes' logical volume for Docker volume storage. It will
+# also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#seed_lvm_group_data_enabled:
+
 # Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
 #seed_lvm_group_data:
 
-# List of disks for use by seed LVM data volume group.
+# List of disks for use by seed LVM data volume group. Default to an invalid
+# value to require configuration.
 #seed_lvm_group_data_disks:
 
 # List of LVM logical volumes for the data volume group.
@@ -77,8 +84,8 @@
 #seed_users:
 
 ###############################################################################
-# Seed node containers configuration
-#
+# Seed node additional containers configuration
+
 # Dict of container images to start
 # Example:
 # seed_containers:
diff --git a/etc/kayobe/storage.yml b/etc/kayobe/storage.yml
index 624553736..c8ee66f62 100644
--- a/etc/kayobe/storage.yml
+++ b/etc/kayobe/storage.yml
@@ -7,7 +7,7 @@
 #storage_bootstrap_user:
 
 ###############################################################################
-# Network interface attachments.
+# Storage network interface configuration.
 
 # List of networks to which storage nodes are attached.
 #storage_network_interfaces:
@@ -80,6 +80,13 @@
 # for format.
 #storage_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on storage hosts. By default
+# this contains a 'docker-volumes' logical volume for Docker volume storage. It
+# will also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#storage_lvm_group_data_enabled:
+
 # Storage LVM volume group for data. See mrlesmithjr.manage-lvm role for
 # format.
 #storage_lvm_group_data: