diff --git a/README.md b/README.md
index ea15477..13cb4df 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Red Hat Enterprise Linux System Roles for SAP Ansible Collection
 =====================================
 
-Red Hat Enterprise Linux System Roles for SAP is a set of roles for preparing Red Hat Enterprise Linux systems for the initial installation of SAP NetWeaver and SAP HANA, and for installing SAP HANA.
+Red Hat Enterprise Linux System Roles for SAP is a set of roles for preparing Red Hat Enterprise Linux systems for the initial installation of SAP NetWeaver and SAP HANA, for installing SAP HANA Scale-Up and Scale-Out, and for installing a SAP HANA Two-Node Scale-Up cluster.
 
 ## Dependencies
 
@@ -56,4 +56,8 @@ The modules and other plugins in this collection are private, used only internal
 
 <!--ts-->
   * sap_hana_install
+  * sap_ha_install_hana_hsr
+  * sap_ha_prepare_pacemaker
+  * sap_ha_install_pacemaker
+  * sap_ha_set_hana
 <!--te-->
diff --git a/galaxy.yml b/galaxy.yml
index b8d68c3..3e58c4e 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -3,13 +3,13 @@
 # The namespace of the collection. This can be a company/brand/organization or product namespace under which all
 # content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
 # underscores or numbers and cannot contain consecutive underscores
-namespace: redhat
+namespace: __NAMESPACE__
 
 # The name of the collection. Has the same character restrictions as 'namespace'
 name: sap_install
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.0
+version: 1.1.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -21,11 +21,13 @@ authors:
 - Sean Freeman <sean.freeman@uk.ibm.com>
 - Rainer Leber <rainer.leber@sva.de>
 - Markus Koch <mkoch@redhat.com>
+- Markus Moster <mmoster@redhat.com>
+- Janine Fuchs <jfuchs@redhat.com>
 
 ### OPTIONAL but strongly recommended
 
 # A short summary description of the collection
-description: Ansible Collection for installing SAP NetWeaver or SAP HANA on Linux
+description: Collection of Ansible Roles for SAP software installation on Red Hat Enterprise Linux
 
 # Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
 # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
@@ -38,7 +40,10 @@ license:
 
 # A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
 # requirements as 'namespace' and 'name'
-tags: [sap]
+tags:
+- database
+- application
+- sap
 
 # Collections that this collection requires to be installed for it to be usable. The key of the dict is the
 # collection label 'namespace.name'. The value is a version range
@@ -57,3 +62,9 @@ homepage: https://sap-linuxlab.github.io
 
 # The URL to the collection issue tracker
 issues: https://github.com/sap-linuxlab/community.sap_install/issues
+
+# A list of file glob-like patterns used to filter any files or directories that should not be included in the build
+# artifact. A pattern is matched from the relative path of the file or directory of the collection directory. This
+# uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry',
+# and '.git' are always filtered
+build_ignore: ['tests', 'internal-*']
diff --git a/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec
index 03af112..c7d67f1 100644
--- a/rhel-system-roles-sap.spec
+++ b/rhel-system-roles-sap.spec
@@ -61,7 +61,8 @@ License: GPLv3+
 Url: https://github.com/berndfinger/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
-Source4: README.md
+Source4: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/README.md
+Source5: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/galaxy.yml
 Patch1: community.sap_install-shebang.patch
 Patch2: sap-hana-preconfigure-md2html-error.patch
 
@@ -132,7 +133,7 @@ Collection artifact for %{name}. This package contains %{collection_namespace}-%
 %setup -q -a1 -n auto-maintenance-%{mainid}
 
 # add correct version and namespace for Automation Hub and Galaxy
-cp %{github_repo_sap_install}-%{commit_id_sap_install}/galaxy.yml .
+cp %{SOURCE5} .
 sed -i -e "s|^namespace: .*|namespace: %{collection_namespace}|" galaxy.yml
 sed -i -e "s|^version: .*|version: %{collection_version}|" galaxy.yml
 
@@ -146,7 +147,7 @@ find . -type f -size 0 -delete
 find . -type l -delete
 
 pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/
-# remove all SLES stuff and RHEL 6 stuff
+# remove all SLES stuff and RHEL 5 stuff
 rm -rf */tasks/SLES/
 rm -f  */vars/SLES_15.yml
 rm -rf sap_hana_preconfigure/tasks/sapnote/1275776 # SLES - sapconf, saptune, etc