diff --git a/selinux-policy.changes b/selinux-policy.changes
index 78c8aef..d478761 100644
--- a/selinux-policy.changes
+++ b/selinux-policy.changes
@@ -4,6 +4,12 @@ Mon Jun  3 13:42:13 UTC 2024 - Johannes Segitz <jsegitz@suse.com>
 - Remove "Reference" from the package description. It's not the
   reference policy, but the Fedora branch of the policy
 
+-------------------------------------------------------------------
+Tue May 28 11:12:57 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
+
+- Use python311 tools in 15.4 and 15.5 when building selinux-policy to deprecate
+  python36 tooling
+
 -------------------------------------------------------------------
 Wed May  8 11:06:43 UTC 2024 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 0e47ad2..41e7962 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -83,14 +83,20 @@ Source95:       macros.selinux-policy
 URL:            https://github.com/fedora-selinux/selinux-policy.git
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+%if 0%{?suse_version} < 1600
+%define python_for_executables python311
+BuildRequires:  %{python_for_executables}
+BuildRequires:  %{python_for_executables}-policycoreutils
+%else
+BuildRequires:  %primary_python
+BuildRequires:  %{python_module policycoreutils}
+%endif
 BuildRequires:  checkpolicy
 BuildRequires:  gawk
 BuildRequires:  libxml2-tools
 BuildRequires:  m4
 BuildRequires:  policycoreutils
 BuildRequires:  policycoreutils-devel
-BuildRequires:  python3
-BuildRequires:  python3-policycoreutils
 # we need selinuxenabled
 Requires(pre):  policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre):  pam-config