diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 732a91e..4b63638 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -321,7 +321,7 @@
 %endif
 
 %ifarch %{systemtap_arches}
-%if (0%{?rhel} > 0)
+%if (0%{?rhel} > 0 && !0%{?epel})
 %global with_systemtap 1
 %else
 %global with_systemtap 0
@@ -1783,6 +1783,7 @@ done
 * Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-1.rolling
 - updated to 22+36
 - tmp comment out of ea exit 17
+- fixed condition for taspets
 
 * Wed Jan 24 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.32-2.rolling
 - Move to -P<n> usage for patch macro which works on all RPM versions