diff --git a/openvpn.spec b/openvpn.spec
index 4a43423..c398fdc 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -7,7 +7,7 @@
 
 Name:              openvpn
 Version:           2.4.12
-Release:           1%{?prerelease:.%{prerelease}}%{?dist}
+Release:           2%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               https://community.openvpn.net/
 Source0:           https://build.openvpn.net/downloads/releases/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.xz
@@ -144,19 +144,25 @@ getent group openvpn &>/dev/null || groupadd -r openvpn
 getent passwd openvpn &>/dev/null || \
     /usr/sbin/useradd -r -g openvpn -s /sbin/nologin -c OpenVPN \
         -d /etc/openvpn openvpn
+exit 0
 
 %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
-%systemd_postun_with_restart openvpn@\*.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}
@@ -183,6 +189,10 @@ getent passwd openvpn &>/dev/null || \
 
 
 %changelog
+* Thu Nov 9 2023 David Sommerseth <davids@openvpn.net> - 2.4.12-2
+- Fix false exit status on pre runtime scriptlet (Elkhan Mammadli <elkhan@almalinux.org>, RHBZ#2239722)
+- Misbehaving systemctl scriptlet globbing issues (RHBZ#1887984)
+
 * Thu Mar 17 2022 David Sommerseth <davids@openvpn.net> - 2.4.12-1
 - Update to upstream OpenVPN 2.4.12
 - Fixes CVE-2022-0547