diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 2693090..e8b4d0b 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -31,7 +31,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD and Python
@@ -242,6 +242,8 @@ Source998: collection_readme.sh
 
 Patch51: network-disable-bondtests.diff
 
+Patch71: metrics-symlink_follow.diff
+
 BuildArch: noarch
 
 %if %{with html}
@@ -350,6 +352,7 @@ if [ "$rolesdir" != "$realrolesdir" ]; then
     mv "$realrolesdir" .
     rm -rf vendor
 fi
+%patch71 -p1
 cd ..
 
 %if 0%{?rhel}
@@ -710,6 +713,11 @@ fi
 %endif
 
 %changelog
+* Tue Mar  1 2022 Noriko Hosoi <nhosoi@redhat.com> - 1.15.0-2
+- metrics - follow symlinks for the mssql and elasticsearch configuration paths
+  Resolves rhbz#2058655 (EL8)
+  Resolves rhbz#2058777 (EL9)
+
 * Thu Feb 24 2022 Rich Megginson <rmeggins@redhat.com> - 1.15.0-1
 - firewall - ensure target changes take effect immediately
   Resolves rhbz#2057172 (EL8)
diff --git a/metrics-symlink_follow.diff b/metrics-symlink_follow.diff
new file mode 100644
index 0000000..bbb8242
--- /dev/null
+++ b/metrics-symlink_follow.diff
@@ -0,0 +1,44 @@
+From e7cc032dae8b740428b334eac179b4aa243f0aea Mon Sep 17 00:00:00 2001
+From: "github-actions[bot]"
+ <41898282+github-actions[bot]@users.noreply.github.com>
+Date: Tue, 1 Mar 2022 02:35:22 +0000
+Subject: [PATCH] Squashed 'vendor/github.com/performancecopilot/ansible-pcp/'
+ changes from 2da846b..e41f4bd
+
+e41f4bd Merge branch 'nhosoi-ansible_managed'
+49337e0 Add "follow: yes" to the template task in the mssql and elasticsearch subrole.
+
+git-subtree-dir: vendor/github.com/performancecopilot/ansible-pcp
+git-subtree-split: e41f4bd98809ae49534e3f24feec3ce9c49c86ed
+---
+ roles/elasticsearch/tasks/main.yml | 1 +
+ roles/mssql/tasks/main.yml         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml
+index 2ca9768..d806fad 100644
+--- a/roles/elasticsearch/tasks/main.yml
++++ b/roles/elasticsearch/tasks/main.yml
+@@ -45,6 +45,7 @@
+   template:
+     src: elasticsearch.conf.j2
+     dest: "{{ __elasticsearch_conf }}"
++    follow: yes
+     mode: 0600
+   when:
+     - elasticsearch_metrics_provider == 'pcp'
+diff --git a/roles/mssql/tasks/main.yml b/roles/mssql/tasks/main.yml
+index e951d1e..d6c9525 100644
+--- a/roles/mssql/tasks/main.yml
++++ b/roles/mssql/tasks/main.yml
+@@ -34,6 +34,7 @@
+   template:
+     src: mssql.conf.j2
+     dest: "{{ __mssql_conf }}"
++    follow: yes
+     mode: 0600
+   when: mssql_metrics_provider == 'pcp'
+
+--
+2.34.1
+