diff --git a/gating.yaml b/gating.yaml
index 5edecb0..4c41a2f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -7,8 +7,10 @@ rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk8/full.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk11/full.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk17/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk21/full.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk8/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk11/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk17/headless.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk21/headless.functional}
   # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
   - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
diff --git a/maven.spec b/maven.spec
index 8bc5301..03a5c53 100644
--- a/maven.spec
+++ b/maven.spec
@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.3
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -143,6 +143,18 @@ Conflicts: maven-jdk-binding
 %description openjdk17
 Configures Maven to run with OpenJDK 17.
 
+%package openjdk21
+Summary:        OpenJDK 21 binding for Maven
+RemovePathPostfixes: -openjdk21
+Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
+Requires: maven = %{epoch}:%{version}-%{release}
+Requires: java-21-openjdk-headless
+Recommends: java-21-openjdk-devel
+Conflicts: maven-jdk-binding
+
+%description openjdk21
+Configures Maven to run with OpenJDK 21.
+
 %{?javadoc_package}
 
 %prep
@@ -250,6 +262,7 @@ install -d -m 755 %{buildroot}%{_javaconfdir}/
 echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
 echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
 echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
+echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk21
 
 
 %post
@@ -295,7 +308,14 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %files openjdk17
 %config %{_javaconfdir}/maven.conf-openjdk17
 
+%files openjdk21
+%config %{_javaconfdir}/maven.conf-openjdk21
+
 %changelog
+* Thu Oct 17 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-16
+- Add maven-openjdk21
+- Resolves: RHEL-62407
+
 * Tue Jan 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
 - Add missing Requires on which
 - Resolves: rhbz#2165596
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index be97ea9..2b088f0 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -13,6 +13,7 @@ execute:
       exclude:
         - maven-openjdk11
         - maven-openjdk17
+        - maven-openjdk21
 
   /full:
     summary: Basic smoke tests (OpenJDK 8 full)
@@ -36,6 +37,7 @@ execute:
       exclude:
         - maven-openjdk8
         - maven-openjdk17
+        - maven-openjdk21
 
   /full:
     summary: Basic smoke tests (OpenJDK 11 full)
@@ -57,6 +59,7 @@ execute:
       exclude:
         - maven-openjdk8
         - maven-openjdk11
+        - maven-openjdk21
 
   /full:
     summary: Basic smoke tests (OpenJDK 17 full)
@@ -69,3 +72,25 @@ execute:
       - how: shell
         script: |
           dnf -y erase java-*-openjdk
+
+/jdk21:
+  environment:
+    OPENJDK_VERSION: 21
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk8
+        - maven-openjdk11
+        - maven-openjdk17
+
+  /full:
+    summary: Basic smoke tests (OpenJDK 21 full)
+
+  /headless:
+    summary: Basic smoke tests (OpenJDK 21 headless)
+    environment+:
+      OPENJDK_HEADLESS: true
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y erase java-*-openjdk