diff --git a/.gitignore b/.gitignore
index f0e973a..9eacfc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,31 @@
-SOURCES/apache-maven-3.8.5-src.tar.gz
+/results_*
+/*.src.rpm
+
+/apache-maven-3.0-src.tar.gz
+/apache-maven-3.0.2-src.tar.gz
+/apache-maven-3.0.3-RC1-src.tar.gz
+/apache-maven-3.0.3-src.tar.gz
+/apache-maven-3.0.4-src.tar.gz
+/apache-maven-3.0.5-src.tar.gz
+/apache-maven-3.1.0-src.tar.gz
+/apache-maven-3.1.1-src.tar.gz
+/apache-maven-3.2.0-src.tar.gz
+/apache-maven-3.2.1-src.tar.gz
+/apache-maven-3.2.2-src.tar.gz
+/apache-maven-3.2.3-src.tar.gz
+/apache-maven-3.2.5-src.tar.gz
+/apache-maven-3.3.0-src.tar.gz
+/apache-maven-3.3.1-src.tar.gz
+/apache-maven-3.3.3-src.tar.gz
+/apache-maven-3.3.8-src.tar.gz
+/apache-maven-3.3.9-src.tar.gz
+/apache-maven-3.4.0-SNAPSHOT-src.tar.gz
+/apache-maven-3.5.0-src.tar.gz
+/apache-maven-3.5.2-src.tar.gz
+/apache-maven-3.5.3-src.tar.gz
+/apache-maven-3.5.4-src.tar.gz
+/apache-maven-3.6.1-src.tar.gz
+/apache-maven-3.6.2-src.tar.gz
+/apache-maven-3.6.3-src.tar.gz
+/apache-maven-3.8.4-src.tar.gz
 /apache-maven-3.8.5-src.tar.gz
diff --git a/gating.yaml b/gating.yaml
index 5edecb0..24a4107 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,14 +1,13 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - fedora-*
 decision_contexts:
-  - osci_compose_gate
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
 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/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}
-  # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
-  - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk8.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk11.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk17.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk8.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk11.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk17.functional}
diff --git a/plans/javapackages-jdk11.fmf b/plans/javapackages-jdk11.fmf
new file mode 100644
index 0000000..6bfdb67
--- /dev/null
+++ b/plans/javapackages-jdk11.fmf
@@ -0,0 +1,12 @@
+summary:
+    Run javapackages-specific tests - OpenJDK 11
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk17
+discover:
+    how: fmf
+    url: https://pagure.io/javapackages-validator-tests
+execute:
+    how: tmt
diff --git a/plans/javapackages-jdk17.fmf b/plans/javapackages-jdk17.fmf
new file mode 100644
index 0000000..ae04747
--- /dev/null
+++ b/plans/javapackages-jdk17.fmf
@@ -0,0 +1,12 @@
+summary:
+    Run javapackages-specific tests - OpenJDK 17
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk11
+discover:
+    how: fmf
+    url: https://pagure.io/javapackages-validator-tests
+execute:
+    how: tmt
diff --git a/plans/javapackages-jdk8.fmf b/plans/javapackages-jdk8.fmf
new file mode 100644
index 0000000..d35bc4e
--- /dev/null
+++ b/plans/javapackages-jdk8.fmf
@@ -0,0 +1,12 @@
+summary:
+    Run javapackages-specific tests - OpenJDK 8
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk11
+    - maven-openjdk17
+discover:
+    how: fmf
+    url: https://pagure.io/javapackages-validator-tests
+execute:
+    how: tmt
diff --git a/plans/smoke-jdk11.fmf b/plans/smoke-jdk11.fmf
new file mode 100644
index 0000000..4ad3c5f
--- /dev/null
+++ b/plans/smoke-jdk11.fmf
@@ -0,0 +1,8 @@
+summary: Basic smoke test - OpenJDK 11
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk17
+execute:
+  script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke-jdk17.fmf b/plans/smoke-jdk17.fmf
new file mode 100644
index 0000000..1200458
--- /dev/null
+++ b/plans/smoke-jdk17.fmf
@@ -0,0 +1,8 @@
+summary: Basic smoke test - OpenJDK 17
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk11
+execute:
+  script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke-jdk8.fmf b/plans/smoke-jdk8.fmf
new file mode 100644
index 0000000..c83338c
--- /dev/null
+++ b/plans/smoke-jdk8.fmf
@@ -0,0 +1,8 @@
+summary: Basic smoke test - OpenJDK 8
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk11
+    - maven-openjdk17
+execute:
+  script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
deleted file mode 100644
index be97ea9..0000000
--- a/plans/smoke.fmf
+++ /dev/null
@@ -1,71 +0,0 @@
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/maven
-
-execute:
-  how: tmt
-
-/jdk8:
-  environment:
-    OPENJDK_VERSION: 1.8.0
-  prepare:
-    - how: install
-      exclude:
-        - maven-openjdk11
-        - maven-openjdk17
-
-  /full:
-    summary: Basic smoke tests (OpenJDK 8 full)
-
-  /headless:
-    summary: Basic smoke tests (OpenJDK 8 headless)
-    discover+:
-      filter: tag:-java-compiler
-    environment+:
-      OPENJDK_HEADLESS: true
-    prepare+:
-      - how: shell
-        script: |
-          dnf -y erase java-*-openjdk
-
-/jdk11:
-  environment:
-    OPENJDK_VERSION: 11
-  prepare:
-    - how: install
-      exclude:
-        - maven-openjdk8
-        - maven-openjdk17
-
-  /full:
-    summary: Basic smoke tests (OpenJDK 11 full)
-
-  /headless:
-    summary: Basic smoke tests (OpenJDK 11 headless)
-    environment+:
-      OPENJDK_HEADLESS: true
-    prepare+:
-      - how: shell
-        script: |
-          dnf -y erase java-*-openjdk
-
-/jdk17:
-  environment:
-    OPENJDK_VERSION: 17
-  prepare:
-    - how: install
-      exclude:
-        - maven-openjdk8
-        - maven-openjdk11
-
-  /full:
-    summary: Basic smoke tests (OpenJDK 17 full)
-
-  /headless:
-    summary: Basic smoke tests (OpenJDK 17 headless)
-    environment+:
-      OPENJDK_HEADLESS: true
-    prepare+:
-      - how: shell
-        script: |
-          dnf -y erase java-*-openjdk