diff --git a/.gitignore b/.gitignore
index 6a5856e..6a22353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /corosync-qdevice-3.0.0.tar.gz
 /corosync-qdevice-3.0.1.tar.gz
 /corosync-qdevice-3.0.2.tar.gz
+/corosync-qdevice-3.0.4.tar.gz
diff --git a/bz2180045-1-qdevice-Destroy-non-blocking-client-on-failure.patch b/bz2180045-1-qdevice-Destroy-non-blocking-client-on-failure.patch
deleted file mode 100644
index 227015b..0000000
--- a/bz2180045-1-qdevice-Destroy-non-blocking-client-on-failure.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4331c7d5650a8bf44c16512419f1954d0ef96df5 Mon Sep 17 00:00:00 2001
-From: Jan Friesse <jfriesse@redhat.com>
-Date: Mon, 20 Mar 2023 11:01:46 +0100
-Subject: [PATCH] qdevice: Destroy non blocking client on failure
-
-This fixes regression introduced in patch
-8217e33e86bca79dc307e112f0c0c4a278f9a568 which made qdevice assert when
-PR_GetError in nss_sock_non_blocking_client_try_next called by
-qdevice_model_net_pre_poll_loop returns error other than
-PR_IN_PROGRESS_ERROR. This is usually not happening - only way to get
-such error seems to be to ifdown ALL network interfaces other than
-loopback and returned error is then PR_NETWORK_UNREACHABLE_ERROR
-(-5980).
-
-Fix is rather simple (and present in pre
-8217e33e86bca79dc307e112f0c0c4a278f9a568) - just call
-nss_sock_non_blocking_client_destroy.
-
-Signed-off-by: Jan Friesse <jfriesse@redhat.com>
----
- qdevices/qdevice-model-net.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/qdevices/qdevice-model-net.c b/qdevices/qdevice-model-net.c
-index afcc649..f63e4bd 100644
---- a/qdevices/qdevice-model-net.c
-+++ b/qdevices/qdevice-model-net.c
-@@ -211,6 +211,10 @@ qdevice_model_net_pre_poll_loop(struct qdevice_instance *instance)
- 	res = nss_sock_non_blocking_client_try_next(&net_instance->non_blocking_client);
- 	if (res == -1) {
- 		log_nss(LOG_ERR, "Can't connect to qnetd host");
-+		/*
-+		 * To prevent adding non_blocking_client into loop but still keep loop running
-+		 */
-+		nss_sock_non_blocking_client_destroy(&net_instance->non_blocking_client);
- 	}
- 
- 	res = qdevice_net_socket_add_to_main_poll_loop(net_instance);
--- 
-2.39.1
-
diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index d2106f5..528f0a2 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -3,35 +3,24 @@
 # to disable or enable specific features
 %bcond_without userflags
 %bcond_with runautogen
-%bcond_without systemd
-
-%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
-%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
 
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
-Version: 3.0.2
-Release: 3%{?gitver}%{?dist}
-License: BSD
+Version: 3.0.4
+Release: 1%{?gitver}%{?dist}
+License: BSD-3-Clause
 URL: https://github.com/corosync/corosync-qdevice
-Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz
+Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1: corosync-qnetd.sysusers.conf
 
-Patch0: bz2180045-1-qdevice-Destroy-non-blocking-client-on-failure.patch
-
 # Runtime bits
 Requires: corosync >= 2.4.0
 Requires: corosynclib >= 2.4.0
 Requires: nss-tools
 
-%if %{with systemd}
 %{?systemd_requires}
 BuildRequires: systemd
 BuildRequires: systemd-devel
-%else
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-%endif
 
 # Build bits
 BuildRequires: gcc
@@ -45,12 +34,11 @@ BuildRequires: nss-devel
 BuildRequires: autoconf automake libtool
 %endif
 BuildRequires: make
+BuildRequires: git
 BuildRequires: systemd-rpm-macros
 
 %prep
-%setup -q -n %{name}-%{version}%{?gittarver}
-
-%patch0 -p1 -b .bz2180045-1
+%autosetup -S git_am
 
 %build
 %if %{with runautogen}
@@ -61,9 +49,7 @@ BuildRequires: systemd-rpm-macros
 %if %{with userflags}
 	--enable-user-flags \
 %endif
-%if %{with systemd}
 	--enable-systemd \
-%endif
 	--enable-qdevices \
 	--enable-qnetd \
 	--with-initddir=%{_initrddir} \
@@ -86,13 +72,8 @@ install -p -m 644 init/corosync-qdevice.sysconfig.example \
 install -p -m 644 init/corosync-qnetd.sysconfig.example \
    %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
 
-%if %{with systemd}
 sed -i -e 's/^#User=/User=/' \
    %{buildroot}%{_unitdir}/corosync-qnetd.service
-%else
-sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \
-   %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
-%endif
 
 install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/corosync-qnetd.conf
 
@@ -101,28 +82,13 @@ This package contains the Corosync Cluster Engine Qdevice, script for creating
 NSS certificates and an init script.
 
 %post
-%if %{with systemd} && 0%{?systemd_post:1}
 %systemd_post corosync-qdevice.service
-%else
-if [ $1 -eq 1 ]; then
-	/sbin/chkconfig --add corosync-qdevice || :
-fi
-%endif
 
 %preun
-%if %{with systemd} && 0%{?systemd_preun:1}
 %systemd_preun corosync-qdevice.service
-%else
-if [ $1 -eq 0 ]; then
-	/sbin/service corosync-qdevice stop &>/dev/null || :
-	/sbin/chkconfig --del corosync-qdevice || :
-fi
-%endif
 
 %postun
-%if %{with systemd} && 0%{?systemd_postun:1}
 %systemd_postun corosync-qdevice.service
-%endif
 
 %files
 %license LICENSE
@@ -133,11 +99,7 @@ fi
 %{_sbindir}/corosync-qdevice-net-certutil
 %{_sbindir}/corosync-qdevice-tool
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync-qdevice
-%if %{with systemd}
 %{_unitdir}/corosync-qdevice.service
-%else
-%{_initrddir}/corosync-qdevice
-%endif
 %{_mandir}/man8/corosync-qdevice-tool.8*
 %{_mandir}/man8/corosync-qdevice-net-certutil.8*
 %{_mandir}/man8/corosync-qdevice.8*
@@ -158,9 +120,7 @@ The Corosync Cluster Engine Qdevice
 Summary: The Corosync Cluster Engine Qdevice Network Daemon
 Requires: nss-tools
 
-%if %{with systemd}
 %{?systemd_requires}
-%endif
 
 %{?sysusers_requires_compat}
 
@@ -172,28 +132,13 @@ script for creating NSS certificates and an init script.
 %sysusers_create_compat %{SOURCE1}
 
 %post -n corosync-qnetd
-%if %{with systemd} && 0%{?systemd_post:1}
 %systemd_post corosync-qnetd.service
-%else
-if [ $1 -eq 1 ]; then
-	/sbin/chkconfig --add corosync-qnetd || :
-fi
-%endif
 
 %preun -n corosync-qnetd
-%if %{with systemd} && 0%{?systemd_preun:1}
 %systemd_preun corosync-qnetd.service
-%else
-if [ $1 -eq 0 ]; then
-	/sbin/service corosync-qnetd stop &>/dev/null || :
-	/sbin/chkconfig --del corosync-qnetd || :
-fi
-%endif
 
 %postun -n corosync-qnetd
-%if %{with systemd} && 0%{?systemd_postun:1}
 %systemd_postun corosync-qnetd.service
-%endif
 
 %files -n corosync-qnetd
 %license LICENSE
@@ -203,17 +148,21 @@ fi
 %{_bindir}/corosync-qnetd-certutil
 %{_bindir}/corosync-qnetd-tool
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync-qnetd
-%if %{with systemd}
 %{_unitdir}/corosync-qnetd.service
-%else
-%{_initrddir}/corosync-qnetd
-%endif
 %{_mandir}/man8/corosync-qnetd-tool.8*
 %{_mandir}/man8/corosync-qnetd-certutil.8*
 %{_mandir}/man8/corosync-qnetd.8*
 %{_sysusersdir}/corosync-qnetd.conf
 
 %changelog
+* Tue Nov 25 2025 Jan Friesse <jfriesse@redhat.com> - 3.0.4-1
+- Resolves: RHEL-123650
+- Resolves: RHEL-67471
+
+- New upstream release (RHEL-123650)
+- Support for running corosync-qnetd-tool and corosync-qdevice-tool
+  as a non-root user (RHEL-67471)
+
 * Tue Feb 18 2025 Jan Friesse <jfriesse@redhat.com> - 3.0.2-3
 - Resolves: RHEL-7637
 
diff --git a/sources b/sources
index 19e00b2..2dd25f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (corosync-qdevice-3.0.2.tar.gz) = ca2410b873f872ab40156ccb46ce4504e479db02ab3af56bbbfdb634a474ca9759db09b605356414467b3c22f7baad082613b2bf5d5d017e9fa532baa940c2e2
+SHA512 (corosync-qdevice-3.0.4.tar.gz) = a7e2e1fcab699c6deb0ae01725df6a1d3870c0f874b7dff96f657ac3e0d9fadb682ae145d6a9d29c592ca8f34ad12b8523c6adf9b14b0a01e59d998d8cb8c25f