diff --git a/SPECS/PyYAML.spec b/SPECS/PyYAML.spec
index b6bc144..59545a4 100644
--- a/SPECS/PyYAML.spec
+++ b/SPECS/PyYAML.spec
@@ -7,7 +7,7 @@
 
 Name:           PyYAML
 Version:        5.4.1
-Release:        4%{?dist}
+Release:        6%{?dist}
 %global uversion %{version}
 Summary:        YAML parser and emitter for Python
 
@@ -60,13 +60,8 @@ Provides:       PyYAML%{?_isa} = %{version}-%{release}
 
 %package -n python3-pyyaml
 Summary:        %summary
-Provides:       python3-yaml = %{version}-%{release}
-Provides:       python3-yaml%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-pyyaml}
-# Remove before F31
-Provides:       python3-PyYAML = %{version}-%{release}
-Provides:       python3-PyYAML%{?_isa} = %{version}-%{release}
-Obsoletes:      python3-PyYAML < 4.1-5
+%py_provides    python3-yaml
+%py_provides    python3-PyYAML
 
 %description -n python3-pyyaml %_description
 
@@ -116,6 +111,16 @@ rm -rf ext/_yaml.c
 
 
 %changelog
+* Tue Feb 08 2022 Miro Hrončok <mhroncok@redhat.com> - 5.4.1-6
+- Remove some outdated Obsoletes and Provides,
+  but keep providing python3-yaml and python3-PyYAML for users
+- Related: rhbz#1990421
+
+* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 5.4.1-5
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.4.1-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688