diff --git a/java-17-openj9.spec b/java-17-openj9.spec
index 7aa606a..33efaf8 100644
--- a/java-17-openj9.spec
+++ b/java-17-openj9.spec
@@ -150,6 +150,7 @@ BuildRequires:  freetype2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java-ca-certificates
+BuildRequires:  java-devel >= 16
 BuildRequires:  libX11-devel
 BuildRequires:  libXi-devel
 BuildRequires:  libXinerama-devel
@@ -180,6 +181,7 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
+BuildConflicts: java-devel >= 18
 # Requires rest of java
 Requires:       %{name}-headless = %{version}-%{release}
 Requires:       fontconfig
@@ -190,6 +192,7 @@ Requires:       fontconfig
 #was bnc#634793
 Requires:       mozilla-nss
 Requires(post): file
+ExclusiveArch:  x86_64 ppc64le s390x aarch64
 %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
 # Standard JPackage base provides.
 Provides:       java = %{javaver}
@@ -224,7 +227,6 @@ Provides:       jre1.7.x
 Provides:       jre1.8.x
 Provides:       jre1.9.x
 %endif
-ExclusiveArch:  x86_64 ppc64le s390x aarch64
 %if 0%{?suse_version} < 1500
 BuildRequires:  gcc7
 BuildRequires:  gcc7-c++
@@ -232,12 +234,6 @@ BuildRequires:  gcc7-c++
 BuildRequires:  gcc >= 7
 BuildRequires:  gcc-c++ >= 7
 %endif
-%if %{bootcycle}
-BuildRequires:  java-devel >= 16
-BuildConflicts: java-devel >= 18
-%else
-BuildRequires:  %{name}-devel
-%endif
 %if %{with_system_harfbuzz}
 BuildRequires:  harfbuzz-devel
 %endif
@@ -352,12 +348,12 @@ Requires:       jpackage-utils
 Requires(post): update-alternatives
 # Postun requires update-alternatives to uninstall javadoc alternative.
 Requires(postun):update-alternatives
+BuildArch:      noarch
 %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
 # Standard JPackage javadoc provides.
 Provides:       java-%{javaver}-javadoc = %{version}-%{release}
 Provides:       java-javadoc = %{version}-%{release}
 %endif
-BuildArch:      noarch
 
 %description javadoc
 The OpenJDK %{featurever} API documentation.