diff --git a/openvpn.spec b/openvpn.spec
index a1e2722..b87d5a7 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -157,16 +157,23 @@ getent passwd openvpn &>/dev/null || \
         -d /etc/openvpn openvpn
 
 %post
-%systemd_post openvpn-client@\*.service
-%systemd_post openvpn-server@\*.service
+for srv in `systemctl | awk '/openvpn-client@.*\.service/{print $1} /openvpn-server@.*\.service/{print $1}'`;
+do
+    %systemd_post $srv
+done
 
 %preun
-%systemd_preun openvpn-client@\*.service
-%systemd_preun openvpn-server@\*.service
+for srv in `systemctl | awk '/openvpn-client@.*\.service/{print $1} /openvpn-server@.*\.service/{print $1}'`;
+do
+    %systemd_preun $srv
+done
 
 %postun
-%systemd_postun_with_restart openvpn-client@\*.service
-%systemd_postun_with_restart openvpn-server@\*.service
+for srv in `systemctl | awk '/openvpn-client@.*\.service/{print $1} /openvpn-server@.*\.service/{print $1}'`;
+do
+    %systemd_postun_with_restart $srv
+done
+
 
 %files
 %{_pkgdocdir}
@@ -194,6 +201,9 @@ getent passwd openvpn &>/dev/null || \
 
 
 %changelog
+* Thu Jan 27 2022 David Sommerseth <davids@openvpn.net> - 2.5.5-4
+- Fix systemd related scriptlet error (#1887984)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild