diff --git a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2
index 83b131835f..c55e6c3f24 100644
--- a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2
+++ b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2
@@ -1,18 +1,22 @@
-# Commented out default values with details are displayed below. To override
-# these default values, uncomment the values, rename the file to settings.py
-# and place it in a supported config location
+# Commented out default values with details are displayed below. If you want
+# to change the values, make sure this file is available in one of the three
+# supported config locations:
+# - conf/settings.py in the git checkout
+# - ~/.config/testcloud/settings.py
+# - /etc/testcloud/settings.py
 
-# Do not modify this file directly, it will not be picked up unless the filename
-# is changed to settings.py
 
 #DOWNLOAD_PROGRESS = True
 #LOG_FILE = None
 
-# Directories for data and cached downloaded images
+
+## Directories for data and cached downloaded images ##
+
 #DATA_DIR = "/var/lib/testcloud/"
 #STORE_DIR = "/var/lib/testcloud/backingstores"
 
-# Data for cloud-init
+
+## Data for cloud-init ##
 
 #PASSWORD = 'passw0rd'
 #HOSTNAME = 'testcloud'
@@ -20,6 +24,8 @@
 #META_DATA = """instance-id: iid-123456
 #local-hostname: %s
 #"""
+## Read http://cloudinit.readthedocs.io/en/latest/topics/examples.html to see
+## what options you can use here.
 USER_DATA = """#cloud-config
 users:
     - default
@@ -38,9 +44,10 @@ runcmd:
 #runcmd:
 #  - [ sh, -c, 'echo -e "ROOT_SIZE=4G\nDATA_SIZE=10G" > /etc/sysconfig/docker-storage-setup']
 #"""
-#
-# Extra cmdline args for the qemu invocation.
-# Customize as needed :)
+
+
+## Extra cmdline args for the qemu invocation ##
+## Customize as needed :)
 
 #CMD_LINE_ARGS = []
 
@@ -55,3 +62,12 @@ RAM = 6144
 # Desired size, in GiB of instance disks. 0 leaves disk capacity
 # identical to source image
 DISK_SIZE = 40
+
+# Number of retries when stopping of instance fails (host is busy)
+#STOP_RETRIES = 3
+
+# Waiting time between stop retries, in seconds
+#STOP_RETRY_WAIT = 1
+
+# Desired VM type: False = BIOS, True = UEFI
+UEFI = True
diff --git a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2.dev b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2.dev
deleted file mode 100644
index c55e6c3f24..0000000000
--- a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2.dev
+++ /dev/null
@@ -1,73 +0,0 @@
-# Commented out default values with details are displayed below. If you want
-# to change the values, make sure this file is available in one of the three
-# supported config locations:
-# - conf/settings.py in the git checkout
-# - ~/.config/testcloud/settings.py
-# - /etc/testcloud/settings.py
-
-
-#DOWNLOAD_PROGRESS = True
-#LOG_FILE = None
-
-
-## Directories for data and cached downloaded images ##
-
-#DATA_DIR = "/var/lib/testcloud/"
-#STORE_DIR = "/var/lib/testcloud/backingstores"
-
-
-## Data for cloud-init ##
-
-#PASSWORD = 'passw0rd'
-#HOSTNAME = 'testcloud'
-
-#META_DATA = """instance-id: iid-123456
-#local-hostname: %s
-#"""
-## Read http://cloudinit.readthedocs.io/en/latest/topics/examples.html to see
-## what options you can use here.
-USER_DATA = """#cloud-config
-users:
-    - default
-    - name: root
-      password: %s
-      chpasswd: { expire: False }
-      ssh-authorized-keys:
-        - {{ buildslave_pubkey }}
-runcmd:
-    - [dnf, update, libtaskotron, python-resultsdb_api]
-"""
-#ATOMIC_USER_DATA = """#cloud-config
-#password: %s
-#chpasswd: { expire: False }
-#ssh_pwauth: True
-#runcmd:
-#  - [ sh, -c, 'echo -e "ROOT_SIZE=4G\nDATA_SIZE=10G" > /etc/sysconfig/docker-storage-setup']
-#"""
-
-
-## Extra cmdline args for the qemu invocation ##
-## Customize as needed :)
-
-#CMD_LINE_ARGS = []
-
-# The timeout, in seconds, to wait for an instance to boot before
-# failing the boot process. Setting this to 0 disables waiting and
-# returns immediately after starting the boot process.
-BOOT_TIMEOUT = 90
-
-# ram size, in MiB
-RAM = 6144
-
-# Desired size, in GiB of instance disks. 0 leaves disk capacity
-# identical to source image
-DISK_SIZE = 40
-
-# Number of retries when stopping of instance fails (host is busy)
-#STOP_RETRIES = 3
-
-# Waiting time between stop retries, in seconds
-#STOP_RETRY_WAIT = 1
-
-# Desired VM type: False = BIOS, True = UEFI
-UEFI = True
diff --git a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2.stg b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2.stg
deleted file mode 100644
index c55e6c3f24..0000000000
--- a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2.stg
+++ /dev/null
@@ -1,73 +0,0 @@
-# Commented out default values with details are displayed below. If you want
-# to change the values, make sure this file is available in one of the three
-# supported config locations:
-# - conf/settings.py in the git checkout
-# - ~/.config/testcloud/settings.py
-# - /etc/testcloud/settings.py
-
-
-#DOWNLOAD_PROGRESS = True
-#LOG_FILE = None
-
-
-## Directories for data and cached downloaded images ##
-
-#DATA_DIR = "/var/lib/testcloud/"
-#STORE_DIR = "/var/lib/testcloud/backingstores"
-
-
-## Data for cloud-init ##
-
-#PASSWORD = 'passw0rd'
-#HOSTNAME = 'testcloud'
-
-#META_DATA = """instance-id: iid-123456
-#local-hostname: %s
-#"""
-## Read http://cloudinit.readthedocs.io/en/latest/topics/examples.html to see
-## what options you can use here.
-USER_DATA = """#cloud-config
-users:
-    - default
-    - name: root
-      password: %s
-      chpasswd: { expire: False }
-      ssh-authorized-keys:
-        - {{ buildslave_pubkey }}
-runcmd:
-    - [dnf, update, libtaskotron, python-resultsdb_api]
-"""
-#ATOMIC_USER_DATA = """#cloud-config
-#password: %s
-#chpasswd: { expire: False }
-#ssh_pwauth: True
-#runcmd:
-#  - [ sh, -c, 'echo -e "ROOT_SIZE=4G\nDATA_SIZE=10G" > /etc/sysconfig/docker-storage-setup']
-#"""
-
-
-## Extra cmdline args for the qemu invocation ##
-## Customize as needed :)
-
-#CMD_LINE_ARGS = []
-
-# The timeout, in seconds, to wait for an instance to boot before
-# failing the boot process. Setting this to 0 disables waiting and
-# returns immediately after starting the boot process.
-BOOT_TIMEOUT = 90
-
-# ram size, in MiB
-RAM = 6144
-
-# Desired size, in GiB of instance disks. 0 leaves disk capacity
-# identical to source image
-DISK_SIZE = 40
-
-# Number of retries when stopping of instance fails (host is busy)
-#STOP_RETRIES = 3
-
-# Waiting time between stop retries, in seconds
-#STOP_RETRY_WAIT = 1
-
-# Desired VM type: False = BIOS, True = UEFI
-UEFI = True
diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
index 7723fc1018..3f791845be 100644
--- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
+++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
@@ -160,11 +160,7 @@ force_imageurl: False
 
 ## Default  distro/release/flavor/arch for the disposable images discovery
 #default_disposable_distro: fedora
-{% if deployment_type in ['dev', 'stg'] %}
 default_disposable_release: '30'
-{% else %}
-default_disposable_release: '28'
-{% endif %}
 #default_disposable_flavor: taskotron_cloud
 #default_disposable_arch: x86_64