diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
index bef4511f14..8ca28c9a63 100644
--- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
+++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
@@ -130,11 +130,29 @@ artifacts_baseurl: {{ artifacts_base_url }}
 #cachedir: /var/cache/taskotron
 
 ## The location of images for disposable clients
+## File names need to adhere to the naming standard of:
+##   YYMMDD_HHMM-fedora-RELEASE-FLAVOR-ARCH.(qcow2|raw|img)
+## For example:
+##   160301_1030-fedora-23-taskotron_cloud-x86_64.img
+## Variables disposable_(release|flavor|arch) set in this config file
+## define what kind of image is looked for.
+## The newest (by YYMMDD_HHMM) image of the respective R-F-A is used.
 imagesdir: {{imagesdir}}
 
-## Temporary option to specify url of an image to download and use for disposable client
+## If set to False, latest image from imagesdir will be used instead of one at imageurl
+## [default: True]
+#force_imageurl: True
+
+## Url of an image to download and use for disposable client, if force_imageurl was set
 imageurl: file:///srv/diskimages/20160126-taskotron-f23.qcow2
 
+## Default  distro/release/flavor/arch for the disposable images discovery
+#default_disposable_distro: fedora
+#default_disposable_release: 23
+#default_disposable_flavor: taskotron_cloud
+#default_disposable_arch: x86_64
+
+
 ## Additional repos for minion to install packages from
 minion_repos:
   - https://infrastructure.fedoraproject.org/repo/infrastructure.repo