diff --git a/custodia.spec b/custodia.spec
index 8cae4cd96e71554b89bdfddbd88898970a24d3d5..d993437ec84e51c1d558e4ae14a61c6f9590d578 100644
--- a/custodia.spec
+++ b/custodia.spec
@@ -1,6 +1,6 @@
 Name:           custodia
 Version:        0.6.0
-Release:        6
+Release:        7
 Summary:        A tool for managing secrets other processes
 License:        GPLv3+
 URL:            https://github.com/latchset/%{name}
@@ -95,16 +95,22 @@ getent passwd custodia >/dev/null || \
 exit 0
 
 %post
-%systemd_post custodia@\*.socket
-%systemd_post custodia@\*.service
+for srv in `systemctl | awk '/custodia@.*\.service/{print $1} /custodia@.*\.socket/{print $1}'`;
+do
+	%systemd_post $srv
+done
 
 %preun
-%systemd_preun custodia@\*.socket
-%systemd_preun custodia@\*.service
+for srv in `systemctl | awk '/custodia@.*\.service/{print $1} /custodia@.*\.socket/{print $1}'`;
+do
+	%systemd_preun $srv
+done
 
 %postun
-%systemd_postun custodia@\*.socket
-%systemd_postun custodia@\*.service
+for srv in `systemctl | awk '/custodia@.*\.service/{print $1} /custodia@.*\.socket/{print $1}'`;
+do
+	%systemd_postun_with_restart $srv
+done
 
 %files
 %doc README API.md LICENSE
@@ -130,6 +136,9 @@ exit 0
 %{python3_sitelib}/%{name}-%{version}-py%{python3_version}-nspkg.pth
 
 %changelog
+* Tue Mar 01 2022 xuping <xuping33@huawei.com> 0.6.0-7
+- Fix systemd related scriptlet error
+ 
 * Fri Jan 8 2021 baizhonggui <baizhonggui> 0.6.0-6
 - Fix building for pytest