diff --git a/.gitignore b/.gitignore
index 48ac721..1d379a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,7 @@
 /sap-hana-preconfigure-a53a244c4e774e17cf427b51d7be36336fd21a7f.tar.gz
 /sap-netweaver-preconfigure-32d59f5c419b0a9997207e2e11cb215b5e616250.tar.gz
 /sap-preconfigure-108c1d7f754debc58e1e29bb72c3dcb11e3721b0.tar.gz
+/auto-maintenance-411f58b0e8da72cd69827d6ed30d8925bea5cb23.tar.gz
+/sap-hana-preconfigure-b6a188c4f29c185da7cc68704b83e0a447563496.tar.gz
+/sap-netweaver-preconfigure-34f6dc9421cfa6af951c9b8f2315f1b52bd75e0a.tar.gz
+/sap-preconfigure-ba8714a7683ace6172b8b1cf787a9699fbe2b24c.tar.gz
diff --git a/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec
index 0c8c0e6..0ea6cdf 100644
--- a/rhel-system-roles-sap.spec
+++ b/rhel-system-roles-sap.spec
@@ -23,24 +23,24 @@
 %global collection_name linux
 %endif
 
-%global mainid ec364d2e0bd422b69f34871a1188114f368097a0
-%global gitcommit_sap 108c1d7f754debc58e1e29bb72c3dcb11e3721b0
-%global gitcommit_sap_hana a53a244c4e774e17cf427b51d7be36336fd21a7f
-%global gitcommit_sap_netweaver 32d59f5c419b0a9997207e2e11cb215b5e616250
+# collection_version has to be increased by every rebuild
+# otherwise, it cannot be uploaded to Automation Hub and Galaxy
+# due to version conflict
+%define collection_version 3.1.3
+
+%global mainid 411f58b0e8da72cd69827d6ed30d8925bea5cb23
+%global gitcommit_sap ba8714a7683ace6172b8b1cf787a9699fbe2b24c
+%global gitcommit_sap_hana b6a188c4f29c185da7cc68704b83e0a447563496
+%global gitcommit_sap_netweaver 34f6dc9421cfa6af951c9b8f2315f1b52bd75e0a
 %global rolename1 sap-preconfigure
 %global rolename2 sap-hana-preconfigure
 %global rolename3 sap-netweaver-preconfigure
 %global src_owner linux-system-roles
 
-# collection_version has to be increased by every rebuild
-# otherwise, it cannot be uploaded to Automation Hub and Galaxy
-# due to version conflict
-%define collection_version 3.1.2
-
 Name: %{package_name}
 Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
 Version: 3.1.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv3+
 Url: https://github.com/berndfinger
 Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
@@ -51,6 +51,7 @@ Source4: README.md
 Source5: galaxy.yml
 # patches 0-49 for sap-preconfigure
 # patches 50-99 for sap-hana-preconfigure
+Patch50: sap-hana-preconfigure-md2html-error.patch
 # patches 100-149 for sap-netweaver-preconfigur
 
 BuildArch: noarch
@@ -135,6 +136,14 @@ sed -i -e "s|name: rhel|name: %{collection_name}|" galaxy.yml
 # add correct version for Automation Hub and Galaxy
 sed -i -e "s|version: 3.1.1|version: %{collection_version}|" galaxy.yml
 
+pushd sap-preconfigure
+popd
+pushd sap-hana-preconfigure
+%patch50 -p1
+popd
+pushd sap-netweaver-preconfigure
+popd
+
 # remove git stuff
 rm -rf *-preconfigure/.git*
 # remove zero file
@@ -187,8 +196,7 @@ done
 # removing dot files/dirs
 rm -rf .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.[A-Za-z]*
 
-cp -p galaxy.yml lsr_role2collection/.ansible-lint \
-    .collections/ansible_collections/%{collection_namespace}/%{collection_name}
+cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name}
 
 # build collection file
 cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
@@ -236,6 +244,9 @@ popd
 %endif
 
 %changelog
+* Tue Nov 16 2021 Than Ngo <than@redhat.com> - 3.1.1-14
+- Resolves: #2021579, ansible-lint cleanup
+
 * Fri Oct 15 2021 Than Ngo <than@redhat.com> - 3.1.1-13
 - Fix the version of the collection tar file
 
diff --git a/sources b/sources
index 842013b..2d0405b 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (auto-maintenance-ec364d2e0bd422b69f34871a1188114f368097a0.tar.gz) = 5cbbd64ccb77c8ecd9cf20eb55747fc51e539692bc20d746ecf63345b64dda5cddb3e6f1c69f684495247e329f2930f46147c8fcd851e5a47fd27471cb5ec0b5
-SHA512 (galaxy.yml) = 6fb23d6100e2ad9c19dc4b2baa671a1f7cb9516a86601e79dcebf5a479c21d212c95a5b86b620c61114d3248a0e676b81e68f8980a621eebd87b8cef97662cb6
 SHA512 (README.md) = ef4fc905c824b1701e27543f7335584406f35873c34915b2aa355a73b8b469d2b7d9d33722769403451f5d7d78127cbb87bfb4f0ae56fdfafe3fc26cc1a44af2
-SHA512 (sap-hana-preconfigure-a53a244c4e774e17cf427b51d7be36336fd21a7f.tar.gz) = 3ddb9ef2940a0f0f349e76758eab0a652a31954eb34c9b2c42013960850b9928e72f4f291b760982ea5a341f5178583437a7f7e1c97a36ec62950ef399249d07
-SHA512 (sap-netweaver-preconfigure-32d59f5c419b0a9997207e2e11cb215b5e616250.tar.gz) = 97336c8369b3c94bd2215d4a4d0d82847699195d95083660f77fe12ab430ca551e4ad219af80019028d909cd86ae54f99a05b0bd67b9c9214997b311035bbb95
-SHA512 (sap-preconfigure-108c1d7f754debc58e1e29bb72c3dcb11e3721b0.tar.gz) = 30ccb075232f4c1116246aa904e02eabe85fa62e4f789cf0db4ff40a1d7876690d0b3cca0423212362b925193635a23520894c6c91563c6a0002023fddcc1c0d
+SHA512 (auto-maintenance-411f58b0e8da72cd69827d6ed30d8925bea5cb23.tar.gz) = 5204949ee46811bf15bd7d9517472e3e8f923ebc0d0b31f7e243e775c1cccb35d47f1fe47d58403c959eec38cba28b44060acec6b44198cc2f93030f6f8eac1e
+SHA512 (sap-hana-preconfigure-b6a188c4f29c185da7cc68704b83e0a447563496.tar.gz) = aee52ea2923ad3c3430c9bca66f5859814039621b9242e405a859c94cb4385047dbde55b75eaaaab9952ba3eb1985b64823db2892560f1e45b2d3212cfcf83d0
+SHA512 (sap-netweaver-preconfigure-34f6dc9421cfa6af951c9b8f2315f1b52bd75e0a.tar.gz) = 0358642ad365c58b7b4ed4d43bb62a62282a0c456fa7621510d32a7a616b44b620272f233dd47f222e9e7c8098dc991c0d8d8c19e5f43d82bb21d8bddb566094
+SHA512 (sap-preconfigure-ba8714a7683ace6172b8b1cf787a9699fbe2b24c.tar.gz) = 805f2a72a53fb1c5317e2f26379ef1412b42bf5f27d77e7b8f8fcaf2fb48d87deb7654f0069b7e01d9abab94161c69122e97a7490353101b8f24656c909bde4c
+SHA512 (galaxy.yml) = 7b7b7482bfec398e25107715c96b9c13f98263f22b9406e6a65a4b46d197546208fc183cbed60d82c29ef3a9bd0036f8dd64162de47c8d0271a0eb15e539a214