diff --git a/.gitignore b/.gitignore
index a56a7c9..d9bb731 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /osgi.core-6.0.0-sources.jar
 /osgi.core-7.0.0.jar
+/osgi.core-8.0.0.jar
diff --git a/osgi-core.spec b/osgi-core.spec
index 703d3e8..654523f 100644
--- a/osgi-core.spec
+++ b/osgi-core.spec
@@ -1,16 +1,28 @@
+# 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-core
-Version:        7.0.0
-Release:        7%{?dist}
+Version:        8.0.0
+Release:        3%{?dist}
 Summary:        OSGi Core API
+
 License:        ASL 2.0
 URL:            https://www.osgi.org
+
+Source0:        https://docs.osgi.org/download/r8/osgi.core-%{version}.jar
+
 BuildArch:      noarch
 
-Source0:        https://osgi.org/download/r7/osgi.core-%{version}.jar
-
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.osgi:osgi.annotation)
+%endif
 
 %description
 OSGi Core, Interfaces and Classes for use in compiling bundles.
@@ -56,8 +68,10 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml .
 
 %pom_add_dep org.osgi:osgi.annotation::provided
 
+%mvn_alias : org.osgi:org.osgi.core
+
 %build
-%mvn_build
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
@@ -71,12 +85,19 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml .
 %license LICENSE
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.0.0-7
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-3
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-2
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Fri Jan 15 2021 Marian Koncek <mkoncek@redhat.com> - 8.0.0-1
+- Update to upstream version 8.0.0
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -86,9 +107,18 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml .
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
 - 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-2
 - 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
+
+* Wed Apr 17 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
+- Add alias for org.osgi:org.osgi.core
+
 * Wed Mar 06 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-1
 - Update to OSGi R7
 
diff --git a/osgi.core-6.0.0.pom b/osgi.core-6.0.0.pom
deleted file mode 100644
index 00e405b..0000000
--- a/osgi.core-6.0.0.pom
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.osgi</groupId>
-  <artifactId>osgi.core</artifactId>
-  <version>6.0.0</version>
-  <description>OSGi Core Release 6, Interfaces and Classes for use in compiling bundles.</description>
-  <name>org.osgi:osgi.core</name>
-  <url>http://www.osgi.org/</url>
-  <organization>
-    <name>OSGi Alliance</name>
-    <url>http://www.osgi.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://opensource.org/licenses/apache2.0.php</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://www.osgi.org/members/git/build.git</url>
-    <connection>scm:git:https://www.osgi.org/members/git/build.git</connection>
-    <developerConnection>scm:git:https://www.osgi.org/members/git/build.git</developerConnection>
-  </scm>
-  <developers>
-    <developer>
-      <id>osgi</id>
-      <email>info@osgi.org</email>
-      <name>OSGi Alliance</name>
-      <organization>OSGi Alliance</organization>
-    </developer>
-  </developers>
-</project>
diff --git a/sources b/sources
index 21cb30f..41dbaab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osgi.core-7.0.0.jar) = 60c5e59fc1d33bcb63a0be1151af04321bf9c6c08faa910cf1a29f74b9b58d43edc2d528182edd0884d2bd44403840d8d50b6c012411892391fe28c0a2102ffb
+SHA512 (osgi.core-8.0.0.jar) = 0161f91ecb8ad102731c71ce73f96b99174b5bce2f216770226860cff8a3fcd12abec828399077a835b6765ed9bf9ec29be618de8d2a85b40d6250c00bab4404