diff --git a/osgi-compendium.spec b/osgi-compendium.spec
index d6c1a7b..17a2a90 100644
--- a/osgi-compendium.spec
+++ b/osgi-compendium.spec
@@ -1,9 +1,12 @@
-# Optionally build with a reduced dependency set
-%bcond_with jp_minimal
+# 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:           osgi-compendium
 Version:        7.0.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Interfaces and Classes for use in compiling OSGi bundles
 License:        ASL 2.0
 URL:            http://www.osgi.org
@@ -12,14 +15,13 @@ BuildArch:      noarch
 Source0:        https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(javax.servlet:javax.servlet-api)
-%if %{without jp_minimal}
-BuildRequires:  mvn(javax.persistence:persistence-api)
-BuildRequires:  mvn(javax.ws.rs:javax.ws.rs-api) >= 2.1.5-2
-%endif
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.osgi:osgi.annotation)
 BuildRequires:  mvn(org.osgi:osgi.core)
+%endif
 
 %description
 OSGi Compendium, Interfaces and Classes for use in compiling bundles.
@@ -69,16 +71,11 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 
 %pom_add_dep org.osgi:osgi.annotation::provided
 %pom_add_dep org.osgi:osgi.core::provided
-%pom_add_dep javax.servlet:javax.servlet-api::provided
-%if %{without jp_minimal}
-%pom_add_dep javax.persistence:persistence-api::provided
-%pom_add_dep javax.ws.rs:javax.ws.rs-api::provided
-%else
-# Don't compile in Jax RS and JPA support when jp_minimal is activated
+# Don't compile in Servlet, Jax RS and JPA support
+rm -r src/main/java/org/osgi/service/http
 rm -r src/main/java/org/osgi/service/jaxrs
 rm -r src/main/java/org/osgi/service/jpa
 rm -r src/main/java/org/osgi/service/transaction/control/jpa
-%endif
 
 %build
 %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
@@ -96,8 +93,12 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa
 
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.0.0-9
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-10
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-9
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -114,9 +115,15 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-4
+- Mass rebuild for javapackages-tools 201902
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-3
+- Mass rebuild for javapackages-tools 201901
+
 * Tue Mar 19 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-2
 - Allow conditionally compiling in support for Jax RS and JPA