diff --git a/gating.yaml b/gating.yaml
index a10bfea..58a6a98 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,12 +4,8 @@ product_versions:
 decision_contexts:
   - osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk8/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk11/full.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/full.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk8/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk11/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
diff --git a/maven.spec b/maven.spec
index 102a7a4..cf351f7 100644
--- a/maven.spec
+++ b/maven.spec
@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.9.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is Apache-2.0
 # bundled slf4j is MIT
@@ -111,30 +111,6 @@ Provides:       bundled(slf4j) = %{bundled_slf4j_version}
 %description lib
 Core part of Apache Maven that can be used as a library.
 
-%package openjdk8
-Summary:        OpenJDK 8 binding for Maven
-RemovePathPostfixes: -openjdk8
-Provides: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java-1.8.0-openjdk-headless
-Recommends: java-1.8.0-openjdk-devel
-Conflicts: %{name}-jdk-binding
-
-%description openjdk8
-Configures Maven to run with OpenJDK 8.
-
-%package openjdk11
-Summary:        OpenJDK 11 binding for Maven
-RemovePathPostfixes: -openjdk11
-Provides: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java-11-openjdk-headless
-Recommends: java-11-openjdk-devel
-Conflicts: %{name}-jdk-binding
-
-%description openjdk11
-Configures Maven to run with OpenJDK 11.
-
 %package openjdk17
 Summary:        OpenJDK 17 binding for Maven
 RemovePathPostfixes: -openjdk17
@@ -262,8 +238,6 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v
 
 # JDK bindings
 install -d -m 755 %{buildroot}%{_javaconfdir}/
-echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk8
-echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk11
 echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
 echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
 
@@ -302,12 +276,6 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %{_mandir}/man1/mvnDebug%{maven_version_suffix}.1.gz
 %endif
 
-%files openjdk8
-%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk8
-
-%files openjdk11
-%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk11
-
 %files openjdk17
 %config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
 
@@ -315,6 +283,9 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
 
 %changelog
+* Tue Jul 02 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.6-6
+- Drop openjdk8 and openjdk11 subpackages
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:3.9.6-5
 - Bump release for June 2024 mass rebuild
 
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index eaca4e8..bce05fe 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -6,8 +6,6 @@ discover:
 prepare:
   how: install
   exclude:
-    - maven-openjdk8
-    - maven-openjdk11
     - maven-openjdk17
     - maven-openjdk21
 execute:
diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index b661f7c..bb328ff 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -5,66 +5,12 @@ discover:
 execute:
   how: tmt
 
-/jdk8:
-  environment:
-    OPENJDK_VERSION: 1.8.0
-  prepare:
-    - how: install
-      exclude:
-        - maven-openjdk11
-        - maven-openjdk17
-        - maven-openjdk21
-
-  /full:
-    summary: Maven matrix tests - OpenJDK 8 full
-    discover+:
-      filter: tag:jdk8
-
-  /headless:
-    summary: Maven matrix tests - OpenJDK 8 headless
-    discover+:
-      filter: tag:jre8
-    environment+:
-      OPENJDK_HEADLESS: "true"
-    prepare+:
-      - how: shell
-        script: |
-          dnf -y remove java-*-openjdk
-
-/jdk11:
-  environment:
-    OPENJDK_VERSION: 11
-  prepare:
-    - how: install
-      exclude:
-        - maven-openjdk8
-        - maven-openjdk17
-        - maven-openjdk21
-
-  /full:
-    summary: Maven matrix tests - OpenJDK 11 full
-    discover+:
-      filter: tag:jdk11
-
-  /headless:
-    summary: Maven matrix tests - OpenJDK 11 headless
-    discover+:
-      filter: tag:jre11
-    environment+:
-      OPENJDK_HEADLESS: "true"
-    prepare+:
-      - how: shell
-        script: |
-          dnf -y remove java-*-openjdk
-
 /jdk17:
   environment:
     OPENJDK_VERSION: 17
   prepare:
     - how: install
       exclude:
-        - maven-openjdk8
-        - maven-openjdk11
         - maven-openjdk21
 
   /full:
@@ -89,8 +35,6 @@ execute:
   prepare:
     - how: install
       exclude:
-        - maven-openjdk8
-        - maven-openjdk11
         - maven-openjdk17
 
   /full: