diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 22b5f73..90d016a 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -343,7 +343,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      4
+%global rpmrelease      5
 # Settings used by the portable build
 %global portablerelease 1
 %global portablesuffix el8
@@ -1136,8 +1136,8 @@ Provides: java-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
 %if %is_system_jdk
 Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release}
 Provides: jre-%{origin}%{?1} = %{epoch}:%{version}-%{release}
-Provides: java%{?1} = %{epoch}:%{version}-%{release}
-Provides: jre%{?1} = %{epoch}:%{version}-%{release}
+Provides: java%{?1} = %{epoch}:%{javaver}
+Provides: jre%{?1} = %{epoch}:%{javaver}
 %endif
 }
 
@@ -1185,8 +1185,8 @@ Provides: java-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release}
 %if %is_system_jdk
 Provides: java-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
 Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
-Provides: jre-headless%{?1} = %{epoch}:%{version}-%{release}
-Provides: java-headless%{?1} = %{epoch}:%{version}-%{release}
+Provides: jre-headless%{?1} = %{epoch}:%{javaver}
+Provides: java-headless%{?1} = %{epoch}:%{javaver}
 %endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1312019
@@ -1215,8 +1215,8 @@ Provides: java-%{javaver}-%{origin}-devel%{?1} = %{epoch}:%{version}-%{release}
 %if %is_system_jdk
 Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}-%{release}
 Provides: java-sdk-%{origin}%{?1} = %{epoch}:%{version}-%{release}
-Provides: java-devel%{?1} = %{epoch}:%{version}-%{release}
-Provides: java-sdk%{?1} = %{epoch}:%{version}-%{release}
+Provides: java-devel%{?1} = %{epoch}:%{javaver}
+Provides: java-sdk%{?1} = %{epoch}:%{javaver}
 %endif
 }
 
@@ -2636,6 +2636,10 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Sat Dec 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-5
+- Restore %%{epoch}:%%{javaver} versioning to jre, java, jre-headless, java-headless, java-devel & java-sdk
+- Resolves: RHEL-19631
+
 * Mon Oct 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-4
 - Revert jcmd move as jcmd will not operate without tools.jar
 - Related: RHEL-13607