diff --git a/powerpc-utils.spec b/powerpc-utils.spec
index 4fdcc02..0b79e9d 100644
--- a/powerpc-utils.spec
+++ b/powerpc-utils.spec
@@ -1,6 +1,6 @@
 Name:           powerpc-utils
 Version:        1.3.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PERL-based scripts for maintaining and servicing PowerPC systems
 
 License:        GPLv2
@@ -103,26 +103,20 @@ ln -s serv_config.8 %{buildroot}%{_mandir}/man8/uspchrp.8
 rm -f $RPM_BUILD_ROOT%{_sbindir}/snap $RPM_BUILD_ROOT%{_mandir}/man8/snap.8*
 
 %post core
-systemctl daemon-reload >/dev/null 2>&1 || :
-systemctl start hcn-init.service >/dev/null 2>&1 || :
-systemctl enable hcn-init.service >/dev/null 2>&1 || :
+%systemd_post hcn-init.service
 # update the smt.state file with current SMT
 /usr/sbin/smtstate --save >/dev/null 2>&1 || :
 
- 
 %preun core
-svc=$(systemctl list-units -la | grep -Fq smtstate.service; echo $?)
-if [ "$svc" = "0" ]; then
-    systemctl stop smtstate.service >/dev/null 2>&1 || :
-    systemctl disable smtstate.service >/dev/null 2>&1 || :
-fi
-if systemctl is-enabled hcn-init.service |grep -q "enabled"; then
-        systemctl stop hcn-init.service >/dev/null 2>&1 || :
-        systemctl disable hcn-init.service >/dev/null 2>&1 || :
-fi
+%systemd_preun smtstate.service
+%systemd_preun hcn-init.service
 
 %postun core
-systemctl daemon-reload >/dev/null 2>&1 || :
+%systemd_postun_with_restart smtstate.service
+%systemd_postun_with_restart hcn-init.service
+
+%posttrans core
+systemctl enable hcn-init.service >/dev/null 2>&1 || :
 
 %files
 # PERL-based scripts for maintaining and servicing PowerPC systems
@@ -210,6 +204,9 @@ systemctl daemon-reload >/dev/null 2>&1 || :
 
 
 %changelog
+* Tue Dec 07 2021 Than Ngo <than@redhat.com> - 1.3.9-5
+- Resolves: #2024038 - HNV interface fails to configure when added in lpar shutdown state
+
 * Thu Nov 11 2021 Than Ngo <than@redhat.com> - 1.3.9-4
 - enable support vnic as backend for HNV interface
 - fixed hexdump format