diff --git a/apache-parent.spec b/apache-parent.spec
index 4fa6aa7..49bebfc 100644
--- a/apache-parent.spec
+++ b/apache-parent.spec
@@ -1,6 +1,12 @@
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
+
 Name:           apache-parent
 Version:        23
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parent POM file for Apache projects
 License:        ASL 2.0
 URL:            http://apache.org/
@@ -8,11 +14,17 @@ Source0:        https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac
 BuildArch:      noarch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+%endif
 
 # Not generated automatically
+%if %{without bootstrap}
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
+%endif
 Requires:       mvn(org.apache:apache-jar-resource-bundle)
 
 %description
@@ -33,8 +45,12 @@ This package contains the parent pom file for apache projects.
 %doc LICENSE NOTICE
 
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 23-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 23-6
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 23-5
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -48,15 +64,24 @@ This package contains the parent pom file for apache projects.
 * Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 23-1
 - Update to version 23.
 
+* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 23-1
+- Update to upstream version 23
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
 * Fri Jan 17 2020 Fabio Valentini <decathorpe@gmail.com> - 22-1
 - Update to version 22.
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-3
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-2
+- Mass rebuild for javapackages-tools 201901
+
 * Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-1
 - Update to upstream version 21