diff --git a/.gitignore b/.gitignore
index f9decc7..3180c44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,19 @@
-SOURCES/ansible-sshd-v0.13.1.tar.gz
-SOURCES/auto-maintenance-ec364d2e0bd422b69f34871a1188114f368097a0.tar.gz
-SOURCES/certificate-1.0.5.tar.gz
-SOURCES/crypto_policies-1.1.0.tar.gz
-SOURCES/ha_cluster-1.2.0.tar.gz
-SOURCES/kdump-1.0.5.tar.gz
-SOURCES/kernel_settings-1.0.4.tar.gz
-SOURCES/logging-1.4.1.tar.gz
-SOURCES/metrics-1.2.4.tar.gz
-SOURCES/nbde_client-1.0.4.tar.gz
-SOURCES/nbde_server-1.0.3.tar.gz
-SOURCES/network-b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee.tar.gz
-SOURCES/postfix-1.0.0.tar.gz
-SOURCES/selinux-1.2.3.tar.gz
-SOURCES/ssh-1.0.2.tar.gz
-SOURCES/storage-1.5.2.tar.gz
-SOURCES/timesync-1.5.0.tar.gz
-SOURCES/tlog-1.1.1.tar.gz
-SOURCES/vpn-1.1.0.tar.gz
+SOURCES/ansible-sshd-1c5c48835e01adc176febf945e1fd36b7d9af7fd.tar.gz
+SOURCES/auto-maintenance-2dd50c8a16af647e4c7a768c481335e97735958a.tar.gz
+SOURCES/certificate-1.1.0.tar.gz
+SOURCES/crypto_policies-1.2.0.tar.gz
+SOURCES/ha_cluster-1.3.0.tar.gz
+SOURCES/kdump-1.1.0.tar.gz
+SOURCES/kernel_settings-1.1.0.tar.gz
+SOURCES/logging-1.5.0.tar.gz
+SOURCES/metrics-1.3.1.tar.gz
+SOURCES/nbde_client-1.1.0.tar.gz
+SOURCES/nbde_server-1.1.0.tar.gz
+SOURCES/network-1.4.0.tar.gz
+SOURCES/postfix-1.1.0.tar.gz
+SOURCES/selinux-1.3.0.tar.gz
+SOURCES/ssh-1.1.0.tar.gz
+SOURCES/storage-1.6.0.tar.gz
+SOURCES/timesync-1.6.0.tar.gz
+SOURCES/tlog-1.2.0.tar.gz
+SOURCES/vpn-1.2.0.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 31dd74f..fdc2372 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,19 +1,19 @@
-668bfd090b01b48ef3959bf499599a23ef795f76 SOURCES/ansible-sshd-v0.13.1.tar.gz
-bfd618e94056a68c75de22dfcde7b29445850176 SOURCES/auto-maintenance-ec364d2e0bd422b69f34871a1188114f368097a0.tar.gz
-3408d5c37df62b4e9e7a4499ec9015627ea9e890 SOURCES/certificate-1.0.5.tar.gz
-92387eef86823e8078bc883d53b717e58269ea32 SOURCES/crypto_policies-1.1.0.tar.gz
-f78287302516f645edd8ee469dd785d1bfab3684 SOURCES/ha_cluster-1.2.0.tar.gz
-ccf003fe359ed688cd38d909405a0cb814dafee1 SOURCES/kdump-1.0.5.tar.gz
-98688933568950c4e90c40d9d1ab8cd1a0ef7083 SOURCES/kernel_settings-1.0.4.tar.gz
-4ce4d5a1178727a0d0706ea58934374ce4666727 SOURCES/logging-1.4.1.tar.gz
-be9780403c5113d2a86c8f94d6b428a21f365b37 SOURCES/metrics-1.2.4.tar.gz
-996c1d4f2763d8ae7fe2973d48429b6fcb88d387 SOURCES/nbde_client-1.0.4.tar.gz
-717e2cd6ba686ffa7abdf885e04e185d09b03d88 SOURCES/nbde_server-1.0.3.tar.gz
-487459f2ff5856bdf7f0f7686cdfb63d5e2a5007 SOURCES/network-b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee.tar.gz
-609a44ce29de5786eaab9b8b4f0c3b0f2586a525 SOURCES/postfix-1.0.0.tar.gz
-9e060a747dda947cc87321bf472db9ecf37912a0 SOURCES/selinux-1.2.3.tar.gz
-3fa7da323b39ad6555d5232aa5fb4b7dd173c01c SOURCES/ssh-1.0.2.tar.gz
-4184728dff887a9e6c9badc41b19ca063dfafa90 SOURCES/storage-1.5.2.tar.gz
-ba01428f0812c5780d8c1c839d53f2b76ff4e9d6 SOURCES/timesync-1.5.0.tar.gz
-67a587cad5bf1716931556844a592ea348a70e5c SOURCES/tlog-1.1.1.tar.gz
-bc5dd7ab2f823c394a14c1074c709497c3d31a74 SOURCES/vpn-1.1.0.tar.gz
+81dc493a73559dc310a806c8dad6c310f2456512 SOURCES/ansible-sshd-1c5c48835e01adc176febf945e1fd36b7d9af7fd.tar.gz
+88baab8db9cba232b8deb8c690dccf2d3ef77b31 SOURCES/auto-maintenance-2dd50c8a16af647e4c7a768c481335e97735958a.tar.gz
+b677782b53c4ffe790528b4b2c12f31b07523b4c SOURCES/certificate-1.1.0.tar.gz
+1dea114d52dd032bde01a2a64a9b8233daeaa8dc SOURCES/crypto_policies-1.2.0.tar.gz
+d3c6ec22b1e60ad3b53b07009ac54e946355aa75 SOURCES/ha_cluster-1.3.0.tar.gz
+3e3e61b4a8fecc8fb649ab32a3751bd3a3930281 SOURCES/kdump-1.1.0.tar.gz
+90ea8d850a2c46988e4128df36c1254b787d2fb7 SOURCES/kernel_settings-1.1.0.tar.gz
+7e9aebad75c4285651699b5e418a1896db4deca7 SOURCES/logging-1.5.0.tar.gz
+170825f78241811a16095f795a93cc9144c39a98 SOURCES/metrics-1.3.1.tar.gz
+f3298859354c92921a3b68fa76f877d4596915d6 SOURCES/nbde_client-1.1.0.tar.gz
+a2c85f6a850285c8afb8635de0cbbb7eb2b46530 SOURCES/nbde_server-1.1.0.tar.gz
+73207015b9e48cd2bdf86fab68f8f34e2181a94b SOURCES/network-1.4.0.tar.gz
+8f10d7be6d7ea3d855cf5d22f32b5ba7bb8302be SOURCES/postfix-1.1.0.tar.gz
+0f6894033fc2110eac6b81b5e6b4ca9ca0af6632 SOURCES/selinux-1.3.0.tar.gz
+b5e0786216e22508435c13b4da7b6fcce4ad82fe SOURCES/ssh-1.1.0.tar.gz
+d37eda462a1ed27d91594373b1526669213112f6 SOURCES/storage-1.6.0.tar.gz
+7bf364246b52dd8df3de6b6c9bf4553410983439 SOURCES/timesync-1.6.0.tar.gz
+ad38181af7223caa21b602e91d0feeb9085451e0 SOURCES/tlog-1.2.0.tar.gz
+9f91e40a6657e262893f85158706934954bcbcb2 SOURCES/vpn-1.2.0.tar.gz
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 9a9f7b0..4cc4c7d 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -21,7 +21,7 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.6.6
+Version: 1.7.1
 Release: 1%{?dist}
 
 #Group: Development/Libraries
@@ -109,79 +109,79 @@ BuildRequires: ansible >= 2.9.10
 
 #%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895
 %global rolename1 postfix
-%deftag 1 1.0.0
+%deftag 1 1.1.0
 
 #%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda
 %global rolename2 selinux
-%deftag 2 1.2.3
+%deftag 2 1.3.0
 
 #%%defcommit 3 8db8f9ed9088432bac7abf68f1b284475a3baa38
 %global rolename3 timesync
-%deftag 3 1.5.0
+%deftag 3 1.6.0
 
 #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
 %global rolename4 kdump
-%deftag 4 1.0.5
+%deftag 4 1.1.0
 
-%defcommit 5 b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee
+#%%defcommit 5 b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee
 %global rolename5 network
-#%%deftag 5 1.0.0
+%deftag 5 1.4.0
 
 #%%defcommit 6 b3b456183edb7b8aa6ceff7ce667d8e22009ef6a
 %global rolename6 storage
-%deftag 6 1.5.2
+%deftag 6 1.6.0
 
 #%%defcommit 7 0673d842fb32c437501e2aada2e38921da98e115
 %global rolename7 metrics
-%deftag 7 1.2.4
+%deftag 7 1.3.1
 
 #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
 %global rolename8 tlog
-%deftag 8 1.1.1
+%deftag 8 1.2.0
 
 #%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
 %global rolename9 kernel_settings
-%deftag 9 1.0.4
+%deftag 9 1.1.0
 
 #%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
 %global rolename10 logging
-%deftag 10 1.4.1
+%deftag 10 1.5.0
 
 #%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
 %global rolename11 nbde_server
-%deftag 11 1.0.3
+%deftag 11 1.1.0
 
 #%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f
 %global rolename12 nbde_client
-%deftag 12 1.0.4
+%deftag 12 1.1.0
 
 #%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83
 %global rolename13 certificate
-%deftag 13 1.0.5
+%deftag 13 1.1.0
 
 #%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
 %global rolename14 crypto_policies
-%deftag 14 1.1.0
+%deftag 14 1.2.0
 
 %global forgeorg15 https://github.com/willshersystems
 %global repo15 ansible-sshd
 %global rolename15 sshd
-#%%defcommit 15 32f9d0dda5a801cbefad09214ec2d88b6838b943
-%deftag 15 v0.13.1
+%defcommit 15 1c5c48835e01adc176febf945e1fd36b7d9af7fd
+#%%deftag 15 v0.13.1
 
 #%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a
 %global rolename16 ssh
-%deftag 16 1.0.2
+%deftag 16 1.1.0
 
 #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
 %global rolename17 ha_cluster
-%deftag 17 1.2.0
+%deftag 17 1.3.0
 
 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
 %global rolename18 vpn
-%deftag 18 1.1.0
+%deftag 18 1.2.0
 
-%global mainid ec364d2e0bd422b69f34871a1188114f368097a0
+%global mainid 2dd50c8a16af647e4c7a768c481335e97735958a
 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@@ -290,7 +290,8 @@ cd %{rolename5}
 cd ..
 cd %{rolename15}
 sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" tests/*.yml examples/*.yml
-sed -r -i  -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" tests/*.yml examples/*.yml README.md
+sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" tests/*.yml examples/*.yml README.md
+sed -r -i -e "s/min_ansible_version: 2.8/min_ansible_version: 2.9/" meta/main.yml
 cd ..
 
 # Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role
@@ -615,6 +616,27 @@ fi
 %endif
 
 %changelog
+* Mon Aug 16 2021 Rich Megginson <rmeggins@redhat.com> - 1.7.1-1
+- metrics - the bpftrace role does not properly configure bpftrace agent
+  Resolves rhbz#1994180 (EL9)
+  Resolves rhbz#1993240 (EL8)
+
+* Thu Aug 12 2021 Rich Megginson <rmeggins@redhat.com> - 1.7.0-1
+- drop support for Ansible 2.8 - min_ansible_version is now 2.9
+  Resolves rhbz#1989197 (EL9)
+  Resolves rhbz#1989199 (EL8)
+- sshd - fix rhel6 support - failed to validate: error:Missing Match criteria for all Bad Match condition
+  Resolves rhbz#1991598 (EL9)
+  Resolves rhbz#1990947 (EL8)
+
+* Fri Aug 06 2021 Rich Megginson <rmeggins@redhat.com> - 1.6.7-1
+- storage - tests_create_lvmvdo_then_remove fails - Module dm-vdo not found
+  Resolves rhbz#1991141 (EL8)
+  Resolves rhbz#1991062 (EL9)
+- storage - Get syntax errors in tests_lvm_errors.yml
+  Resolves rhbz#1990793 (EL8)
+  Resolves rhbz#1991142 (EL9)
+
 * Fri Aug 06 2021 Rich Megginson <rmeggins@redhat.com> - 1.6.6-1
 - logging, certificate - Instead of the archive module, use "tar" command for backup.
   Resolves rhbz#1984182 (EL9)