diff --git a/SOURCES/bz2043016-1-SAPHanaController-SAPHanaTopology-add-systemd-support.patch b/SOURCES/bz2026278-1-SAPHanaController-SAPHanaTopology-add-systemd-support.patch
similarity index 100%
rename from SOURCES/bz2043016-1-SAPHanaController-SAPHanaTopology-add-systemd-support.patch
rename to SOURCES/bz2026278-1-SAPHanaController-SAPHanaTopology-add-systemd-support.patch
diff --git a/SOURCES/bz2043016-2-SAPHanaController-SAPHanaTopology-suppress-systemctl-output.patch b/SOURCES/bz2026278-2-SAPHanaController-SAPHanaTopology-suppress-systemctl-output.patch
similarity index 100%
rename from SOURCES/bz2043016-2-SAPHanaController-SAPHanaTopology-suppress-systemctl-output.patch
rename to SOURCES/bz2026278-2-SAPHanaController-SAPHanaTopology-suppress-systemctl-output.patch
diff --git a/SOURCES/bz2043016-3-SAPHanaController-SAPHanaTopology-fix-list-unit-files-issue.patch b/SOURCES/bz2026278-3-SAPHanaController-SAPHanaTopology-fix-list-unit-files-issue.patch
similarity index 100%
rename from SOURCES/bz2043016-3-SAPHanaController-SAPHanaTopology-fix-list-unit-files-issue.patch
rename to SOURCES/bz2026278-3-SAPHanaController-SAPHanaTopology-fix-list-unit-files-issue.patch
diff --git a/SOURCES/bz2050196-SAPHanaController-SAPHanaTopology-fix-metadata-version.patch b/SOURCES/bz2050196-SAPHanaController-SAPHanaTopology-fix-metadata-version.patch
new file mode 100644
index 0000000..773ed9c
--- /dev/null
+++ b/SOURCES/bz2050196-SAPHanaController-SAPHanaTopology-fix-metadata-version.patch
@@ -0,0 +1,41 @@
+From 5206e517e190b3c8dfc4b075cb31b5070e9670d4 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 20 Jan 2022 10:54:54 +0100
+Subject: [PATCH] SAPHana*: follow OCF standard for version and OCF version in
+ metadata
+
+---
+ heartbeat/SAPHanaController | 4 ++--
+ heartbeat/SAPHanaTopology   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/SAPHanaController b/heartbeat/SAPHanaController
+index 767af44..c365f4a 100755
+--- a/heartbeat/SAPHanaController
++++ b/heartbeat/SAPHanaController
+@@ -166,8 +166,8 @@ function saphana_meta_data() {
+     cat <<END
+ <?xml version="1.0"?>
+ <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
+-<resource-agent name="SAPHanaController">
+-<version>$SAPHanaControllerVersion</version>
++<resource-agent name="SAPHanaController" version="$SAPHanaControllerVersion">
++<version>1.0</version>
+ 
+ <shortdesc lang="en">Manages two SAP HANA database systems in system replication (SR).</shortdesc>
+ <longdesc lang="en">
+diff --git a/heartbeat/SAPHanaTopology b/heartbeat/SAPHanaTopology
+index 05014af..7f6f4d9 100755
+--- a/heartbeat/SAPHanaTopology
++++ b/heartbeat/SAPHanaTopology
+@@ -132,8 +132,8 @@ function sht_meta_data() {
+ 	cat <<END
+ <?xml version="1.0"?>
+ <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
+-<resource-agent name="SAPHanaTopology">
+-    <version>$SAPHanaTopologyVersion</version>
++<resource-agent name="SAPHanaTopology" version="$SAPHanaTopologyVersion">
++    <version>1.0</version>
+     <shortdesc lang="en">Analyzes SAP HANA System Replication Topology.</shortdesc>
+     <longdesc lang="en">This RA analyzes the SAP HANA topology and "sends" all findings via the node status attributes to
+         all nodes in the cluster. These attributes are taken by the SAPHana RA to control the SAP Hana Databases.
diff --git a/SPECS/resource-agents-sap-hana-scaleout.spec b/SPECS/resource-agents-sap-hana-scaleout.spec
index 65f40b4..cba1ef5 100644
--- a/SPECS/resource-agents-sap-hana-scaleout.spec
+++ b/SPECS/resource-agents-sap-hana-scaleout.spec
@@ -29,7 +29,7 @@ Name:		resource-agents-sap-hana-scaleout
 Summary:	SAP HANA Scale-Out cluster resource agents
 Epoch:		1
 Version:	0.180.0
-Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2
+Release:	4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+
 URL:		https://github.com/SUSE/SAPHanaSR-ScaleOut
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -39,9 +39,10 @@ Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
 Source1:	%{saphana_scaleout_prefix}-%{saphana_scaleout_hash}.tar.gz
-Patch0:		bz2043016-1-SAPHanaController-SAPHanaTopology-add-systemd-support.patch
-Patch1:		bz2043016-2-SAPHanaController-SAPHanaTopology-suppress-systemctl-output.patch
-Patch2:		bz2043016-3-SAPHanaController-SAPHanaTopology-fix-list-unit-files-issue.patch
+Patch0:		bz2026278-1-SAPHanaController-SAPHanaTopology-add-systemd-support.patch
+Patch1:		bz2026278-2-SAPHanaController-SAPHanaTopology-suppress-systemctl-output.patch
+Patch2:		bz2026278-3-SAPHanaController-SAPHanaTopology-fix-list-unit-files-issue.patch
+Patch3:		bz2050196-SAPHanaController-SAPHanaTopology-fix-metadata-version.patch
 
 BuildArch:	noarch
 
@@ -78,6 +79,7 @@ cp %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/doc/LICENSE .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 if [ ! -f configure ]; then
@@ -155,10 +157,16 @@ rm -rf %{buildroot}
 %exclude %{_mandir}/man8/SAPHanaSR-manageAttr.8.gz
 
 %changelog
-* Tue Feb  1 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.180.0-1.2
+* Thu Feb  3 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.180.0-4
+- SAPHanaController/SAPHanaTopology: follow OCF standard for version
+  and OCF version in metadata
+
+  Resolves: rhbz#2050196
+
+* Tue Feb  1 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.180.0-3
 - SAPHanaController/SAPHanaTopology: add systemd support
 
-  Resolves: rhbz#2043016
+  Resolves: rhbz#2026278
 
 * Mon Aug  2 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.180.0-1
 - Add HANA MTR multi-site cluster support