diff --git a/rq/default.yaml b/rq/default.yaml
index c0bcb34..c6daa08 100644
--- a/rq/default.yaml
+++ b/rq/default.yaml
@@ -1,26 +1,30 @@
 files:
-  __default: ['/etc/resolv.conf', '/etc/mcollective', '/etc/astute.yaml', '/root/anaconda*', '/root/*.log', '/root/*.ks', '/var/lib/puppet/state/last_run_summary.yaml', '/var/run/pcap_dir', '/var/lib/cloud']
+  __default: ['/etc/resolv.conf', '/etc/mcollective', '/etc/astute.yaml', '/root/anaconda*', '/root/*.log', '/root/*.ks', '/var/lib/puppet/state/last_run_summary.yaml', '/var/run/pcap_dir', '/var/lib/cloud', '/etc/default']
   by_roles:
-    controller: ['/etc/apache2', '/etc/keystone', '/etc/swift']
-    fuel: ['/etc/astute', '/etc/dnsmasq.conf', '/etc/centos-release', '/etc/fuel_build_number', '/etc/fuel_build_id', '/etc/cobbler', '/etc/cobbler.dnsmasq.conf', '/root/*.log']
-    ceph: ['/root/.ceph*']
-    no_fuel: '/etc/hiera'
+    controller: ['/etc/apache2', '/etc/keystone', '/etc/swift', '/etc/ceph', '/etc/cinder', '/etc/glance', '/etc/haproxy', '/etc/heat', '/etc/mysql', '/etc/nova']
+    cinder: ['/etc/cinder']
+    fuel: ['/etc/astute', '/etc/dnsmasq.conf', '/etc/centos-release', '/etc/fuel_build_number', '/etc/fuel_build_id', '/etc/cobbler', '/etc/cobbler.dnsmasq.conf', '/root/*.log', '/etc/fuel', '/etc/nailgun']
+    ceph: ['/root/.ceph*', '/etc/ceph']
+    compute: ['/etc/libvirt', '/etc/nova']
+    no_fuel: ['/etc/hiera', '/etc/neutron']
   by_os_platform:
-    ubuntu: ['/etc/lsb-release', '/etc/network']
-    centos: ['/etc/redhat-release', '/etc/sysconfig']
-filelists:
-  by_roles:
-    fuel: [etc-nailgun, etc-fuel]
-    ceph-osd: [etc-ceph]
-    cinder: [etc-cinder]
-    compute: [etc-nova, etc-libvirt]
-    controller: [etc-glance, etc-haproxy, etc-nova,
-      etc-keystone, etc-neutron, etc-mysql]
-    # f3flight: removed etc-heat, etc-ceph-controller from controller since it's not always present, gives a warning
-    # f3flight: need to make a better way to decide which files to collect
-  by_os_platform:
-    centos: [etc-yum]
-    ubuntu: [etc-apt]
+    ubuntu: ['/etc/apt', '/etc/lsb-release', '/etc/network']
+    centos: ['/etc/redhat-release', '/etc/sysconfig', '/etc/yum', '/etc/yum.d']
+  by_release:
+    '9.0': ['/etc/fuel']
+    '9.1': ['/etc/fuel']
+# filelists:
+#   by_roles:
+#     fuel: [etc-nailgun, etc-fuel]
+#     ceph-osd: [etc-ceph]
+#     cinder: [etc-cinder]
+#     compute: [etc-nova, etc-libvirt]
+#     controller: [etc-glance, etc-haproxy, etc-nova,
+#       etc-keystone, etc-neutron, etc-mysql, etc-ceph, etc-heat]
+#     # f3flight: need to make a better way to decide which files to collect
+#   by_os_platform:
+#     centos: [etc-yum]
+#     ubuntu: [etc-apt]
 scripts:
   by_release:
     '4.1':
diff --git a/rq/filelists/etc-ceph b/rq/filelists/etc-ceph
index f0669fe..dd85968 100644
--- a/rq/filelists/etc-ceph
+++ b/rq/filelists/etc-ceph
@@ -1,3 +1,2 @@
 #ceph configs
-/etc/ceph/ceph.client.admin.keyring
-/etc/ceph/ceph.conf
+/etc/ceph/
diff --git a/rq/filelists/etc-ceph-controller b/rq/filelists/etc-ceph-controller
deleted file mode 100644
index db90000..0000000
--- a/rq/filelists/etc-ceph-controller
+++ /dev/null
@@ -1 +0,0 @@
-/etc/ceph/ceph.conf
diff --git a/rq/filelists/etc-cinder b/rq/filelists/etc-cinder
index 6640e2e..af79d07 100644
--- a/rq/filelists/etc-cinder
+++ b/rq/filelists/etc-cinder
@@ -1,2 +1 @@
-/etc/cinder/api-paste.ini
-/etc/cinder/cinder.conf
+/etc/cinder/
diff --git a/rq/filelists/etc-glance b/rq/filelists/etc-glance
index c85a174..930a6de 100644
--- a/rq/filelists/etc-glance
+++ b/rq/filelists/etc-glance
@@ -1,5 +1 @@
-/etc/glance/glance-api.conf
-/etc/glance/glance-api-paste.ini
-/etc/glance/glance-cache.conf
-/etc/glance/glance-registry.conf
-/etc/glance/glance-registry-paste.ini
+/etc/glance/
diff --git a/rq/filelists/etc-haproxy b/rq/filelists/etc-haproxy
index 28a6ea4..9c72f3a 100644
--- a/rq/filelists/etc-haproxy
+++ b/rq/filelists/etc-haproxy
@@ -1 +1 @@
-/etc/haproxy/conf.d/
+/etc/haproxy/
diff --git a/rq/filelists/etc-heat b/rq/filelists/etc-heat
index d711888..07a9ad1 100644
--- a/rq/filelists/etc-heat
+++ b/rq/filelists/etc-heat
@@ -1,2 +1 @@
-/etc/heat/heat.conf
-/etc/heat/heat-engine.conf
+/etc/heat/
diff --git a/rq/filelists/etc-keystone b/rq/filelists/etc-keystone
index 6d24ddc..53e67dd 100644
--- a/rq/filelists/etc-keystone
+++ b/rq/filelists/etc-keystone
@@ -1 +1 @@
-/etc/keystone/keystone.conf
+/etc/keystone/
diff --git a/rq/filelists/etc-libvirt b/rq/filelists/etc-libvirt
index 1063a6b..32cfc45 100644
--- a/rq/filelists/etc-libvirt
+++ b/rq/filelists/etc-libvirt
@@ -1 +1 @@
-/etc/libvirt/libvirtd.conf
+/etc/libvirt/
diff --git a/rq/filelists/etc-nailgun b/rq/filelists/etc-nailgun
index d0415f6..2bf074d 100644
--- a/rq/filelists/etc-nailgun
+++ b/rq/filelists/etc-nailgun
@@ -1 +1 @@
-/etc/nailgun/version.yaml
+/etc/nailgun/
diff --git a/timmy/env.py b/timmy/env.py
index ed8f8f6..5d6d2e6 100644
--- a/timmy/env.py
+++ b/timmy/env.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 project_name = 'timmy'
-version = '1.19.2'
+version = '1.19.3'
 
 if __name__ == '__main__':
     import sys