diff --git a/.gitignore b/.gitignore
index b9983f9..78db6b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-SOURCES/community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz
+SOURCES/community.sap_install-60f5f40497d54c46b0bd3f79ef1fef4ada148119.tar.gz
 SOURCES/prepare-redhat.sap_install-main.tar.bz2
diff --git a/.rhel-system-roles-sap.metadata b/.rhel-system-roles-sap.metadata
index 6860696..4cf0eab 100644
--- a/.rhel-system-roles-sap.metadata
+++ b/.rhel-system-roles-sap.metadata
@@ -1,3 +1,3 @@
 584f8d1681adf13cb7af256a7b38d94ca80dcab2 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-d991a279d5d4b5a991f229a29d20e772132af519 SOURCES/community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz
-017c84ab579375755b104b85d5eb77b26a117a80 SOURCES/prepare-redhat.sap_install-main.tar.bz2
+7189971675a00ae0c56a2ea4776f4d9975c8b624 SOURCES/community.sap_install-60f5f40497d54c46b0bd3f79ef1fef4ada148119.tar.gz
+8aa3602249c3bef424ce51ab1d4c4b2fb686d674 SOURCES/prepare-redhat.sap_install-main.tar.bz2
diff --git a/SPECS/rhel-system-roles-sap.spec b/SPECS/rhel-system-roles-sap.spec
index a14fd5d..866f244 100644
--- a/SPECS/rhel-system-roles-sap.spec
+++ b/SPECS/rhel-system-roles-sap.spec
@@ -26,10 +26,10 @@
 # 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 1.2.1
+%define collection_version 1.2.3
 
 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0
-%global commit_id_sap_install f0deb287aaa0fb7d992b95a04b14e263b6690c23
+%global commit_id_sap_install 60f5f40497d54c46b0bd3f79ef1fef4ada148119
 %global rolename1 sap_general_preconfigure
 %global rolename2 sap_hana_preconfigure
 %global rolename3 sap_netweaver_preconfigure
@@ -53,12 +53,12 @@
 
 Name: %{package_name}
 Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
-Version: 3.4.0
-Release: 3%{?dist}
-License: GPLv3+
-Url: https://github.com/berndfinger/community.sap_install
+Version: 3.5.0
+Release: 1%{?dist}
+License: GPL-3.0-or-later
+Url: https://github.com/sap-linuxlab/community.sap_install
 Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
-Source1: https://github.com/berndfinger/%{github_repo_sap_install}/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz
+Source1: https://github.com/sap-linuxlab/%{github_repo_sap_install}/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz
 # files/README.md, files/roles/sap_swpm/README.md from https://gitlab.cee.redhat.com/sap-linuxlab/prepare-redhat.sap_install
 Source2: prepare-redhat.sap_install-main.tar.bz2
 Patch1: community.sap_install-shebang.patch
@@ -135,13 +135,16 @@ sed -i -e "s|^namespace: .*|namespace: %{collection_namespace}|" galaxy.yml
 sed -i -e "s|^version: .*|version: %{collection_version}|" galaxy.yml
 
 # update README.md and roles/sap_swpm/README.md
-cp prepare-redhat.sap_install-main/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/
+cp prepare-redhat.sap_install-main/files/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/
 cp prepare-redhat.sap_install-main/files/roles/sap_swpm/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_swpm/README.md
 
+# remove roles/sap_swpm/requirements.yml
+rm -f %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_swpm/requirements.yml
+
 pushd %{github_repo_sap_install}-%{commit_id_sap_install}/
 # workaround for md2html error
 sed -i -e "s|for POWER ||g" roles/sap_hana_preconfigure/README.md
-%patch1 -p1
+%patch -P1 -p1
 
 # modify collection-requirements.yml, fedora.linux_system_roles -> redhat.rhel_system_roles
 for r in %{rolenames} ; do
@@ -200,6 +203,8 @@ LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 lsr_role2collection.py --role "$role
 done
 
 cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name}
+# update README.md 
+cp %{github_repo_sap_install}-%{commit_id_sap_install}/README.md .collections/ansible_collections/%{collection_namespace}/%{collection_name}
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles \
@@ -256,6 +261,14 @@ popd
 %endif
 
 %changelog
+* Mon May 08 2023 Than Ngo <than@redhat.com> - 3.5.0-1
+- updated README.md files for sap and sap_swpm roles
+- migrated to SPDX license
+- converted patch macro use to the most compatible syntax
+- rebased sap roles to version 1.2.3
+Resolves: #2185037
+
+
 * Mon Jan 30 2023 Than Ngo <than@redhat.com> - 3.4.0-3
 - Related: #2155876, rebase sap roles to version 1.2.1