diff --git a/.packit.yaml b/.packit.yaml
index 8d456d18d276..9b9987caac16 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -23,138 +23,32 @@ jobs:
   trigger: commit
   branch: "gh-readonly-queue/.*"
 
-- &test-static-checks
+- &contest-oscap
   job: tests
   trigger: pull_request
-  fmf_path: tests/tmt
-  identifier: /static-checks
-  tmt_plan: /plans/contest/static-checks$
+  fmf_url: https://github.com/RHSecurityCompliance/contest.git
+  fmf_ref: main
+  tmt_plan: /plans/upstream-parallel/oscap
+  identifier: contest-oscap
   targets:
     centos-stream-8: {}
     centos-stream-9: {}
     centos-stream-10: {}
+  tf_extra_params:
+    settings:
+      pipeline:
+        parallel-limit: 32
 
-# when modifying this, modify also tests/tmt-plans/
-
-- <<: *test-static-checks
-  identifier: /rpmbuild-ctest-fedora
-  tmt_plan: /plans/contest/rpmbuild-ctest-fedora$
-  targets:
-    fedora-all: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/anssi_bp28_high
-  tmt_plan: /plans/contest/hardening/host-os/ansible/anssi_bp28_high$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/bsi
-  tmt_plan: /plans/contest/hardening/host-os/ansible/bsi$
-  targets:
-    centos-stream-9: {}
-    centos-stream-10: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/ccn_advanced
-  tmt_plan: /plans/contest/hardening/host-os/ansible/ccn_advanced$
-  targets:
-    centos-stream-9: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/cis
-  tmt_plan: /plans/contest/hardening/host-os/ansible/cis$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/cis_server_l1
-  tmt_plan: /plans/contest/hardening/host-os/ansible/cis_server_l1$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/cis_workstation_l1
-  tmt_plan: /plans/contest/hardening/host-os/ansible/cis_workstation_l1$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/cis_workstation_l2
-  tmt_plan: /plans/contest/hardening/host-os/ansible/cis_workstation_l2$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/cui
-  tmt_plan: /plans/contest/hardening/host-os/ansible/cui$
-  targets:
-    centos-stream-8: {}
-    centos-stream-9: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/e8
-  tmt_plan: /plans/contest/hardening/host-os/ansible/e8$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/hipaa
-  tmt_plan: /plans/contest/hardening/host-os/ansible/hipaa$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/ism_o
-  tmt_plan: /plans/contest/hardening/host-os/ansible/ism_o$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/ism_o_top_secret
-  tmt_plan: /plans/contest/hardening/host-os/ansible/ism_o_top_secret$
-  targets:
-    centos-stream-10: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/ospp
-  tmt_plan: /plans/contest/hardening/host-os/ansible/ospp$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/pci-dss
-  tmt_plan: /plans/contest/hardening/host-os/ansible/pci-dss$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/ansible/stig
-  tmt_plan: /plans/contest/hardening/host-os/ansible/stig$
+- <<: *contest-oscap
+  tmt_plan: /plans/upstream-parallel/ansible
+  identifier: contest-ansible
 
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/anssi_bp28_high
-  tmt_plan: /plans/contest/hardening/host-os/oscap/anssi_bp28_high$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/bsi
-  tmt_plan: /plans/contest/hardening/host-os/oscap/bsi$
-  targets:
-    centos-stream-9: {}
-    centos-stream-10: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/ccn_advanced
-  tmt_plan: /plans/contest/hardening/host-os/oscap/ccn_advanced$
-  targets:
-    centos-stream-9: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/cis
-  tmt_plan: /plans/contest/hardening/host-os/oscap/cis$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/cis_server_l1
-  tmt_plan: /plans/contest/hardening/host-os/oscap/cis_server_l1$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/cis_workstation_l1
-  tmt_plan: /plans/contest/hardening/host-os/oscap/cis_workstation_l1$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/cis_workstation_l2
-  tmt_plan: /plans/contest/hardening/host-os/oscap/cis_workstation_l2$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/cui
-  tmt_plan: /plans/contest/hardening/host-os/oscap/cui$
-  targets:
-    centos-stream-8: {}
-    centos-stream-9: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/e8
-  tmt_plan: /plans/contest/hardening/host-os/oscap/e8$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/hipaa
-  tmt_plan: /plans/contest/hardening/host-os/oscap/hipaa$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/ism_o
-  tmt_plan: /plans/contest/hardening/host-os/oscap/ism_o$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/ism_o_top_secret
-  tmt_plan: /plans/contest/hardening/host-os/oscap/ism_o_top_secret$
-  targets:
-    centos-stream-10: {}
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/ospp
-  tmt_plan: /plans/contest/hardening/host-os/oscap/ospp$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/pci-dss
-  tmt_plan: /plans/contest/hardening/host-os/oscap/pci-dss$
-- <<: *test-static-checks
-  identifier: /hardening/host-os/oscap/stig
-  tmt_plan: /plans/contest/hardening/host-os/oscap/stig$
+# when modifying anything below, modify also tests/tmt/
 
-- <<: *test-static-checks
+- job: tests
+  trigger: pull_request
+  fmf_path: tests/tmt
+  tmt_plan: /fedora-cis/plan$
   identifier: fedora-cis
-  tmt_plan: /plans/fedora-cis$
   targets:
     fedora-all: {}
diff --git a/tests/tmt/fedora-cis/main.fmf b/tests/tmt/fedora-cis/main.fmf
new file mode 100644
index 000000000000..2fe6663887e8
--- /dev/null
+++ b/tests/tmt/fedora-cis/main.fmf
@@ -0,0 +1,22 @@
+/plan:
+    discover:
+        how: fmf
+        test: /fedora-cis/test
+    execute:
+        how: tmt
+    report:
+        how: html
+
+/test:
+    summary: Runs oscap remediation using the CIS profile
+    description: |-
+        This ensures that the CIS profile is in a fairly good condition on
+        Fedora, to be used for ComplyTime demos, and as a baseline profile
+        for the community to target if they choose to adapt the ComplyTime
+        tooling.
+    test: ./test.sh
+    duration: 1h
+    require:
+        - openscap-scanner
+        - openscap-report
+        - scap-security-guide
diff --git a/tests/tmt/tests/fedora-cis/test.sh b/tests/tmt/fedora-cis/test.sh
similarity index 100%
rename from tests/tmt/tests/fedora-cis/test.sh
rename to tests/tmt/fedora-cis/test.sh
diff --git a/tests/tmt/plans/contest.fmf b/tests/tmt/plans/contest.fmf
deleted file mode 100644
index 39056e491125..000000000000
--- a/tests/tmt/plans/contest.fmf
+++ /dev/null
@@ -1,130 +0,0 @@
-discover:
-    how: fmf
-    url: https://github.com/RHSecurityCompliance/contest.git
-execute:
-    how: tmt
-adjust:
-  - environment:
-        CONTEST_VERBOSE: 0
-report:
-    how: html
-
-#
-# Hardening via ansible-playbook remediation
-#
-
-/hardening/host-os/ansible/anssi_bp28_high:
-    discover+: {test: /hardening/host-os/ansible/anssi_bp28_high$}
-
-/hardening/host-os/ansible/bsi:
-    discover+: {test: /hardening/host-os/ansible/bsi$}
-
-/hardening/host-os/ansible/ccn_advanced:
-    discover+: {test: /hardening/host-os/ansible/ccn_advanced$}
-
-/hardening/host-os/ansible/cis:
-    discover+: {test: /hardening/host-os/ansible/cis$}
-
-/hardening/host-os/ansible/cis_server_l1:
-    discover+: {test: /hardening/host-os/ansible/cis_server_l1$}
-
-/hardening/host-os/ansible/cis_workstation_l1:
-    discover+: {test: /hardening/host-os/ansible/cis_workstation_l1$}
-
-/hardening/host-os/ansible/cis_workstation_l2:
-    discover+: {test: /hardening/host-os/ansible/cis_workstation_l2$}
-
-/hardening/host-os/ansible/cui:
-    discover+: {test: /hardening/host-os/ansible/cui$}
-
-/hardening/host-os/ansible/e8:
-    discover+: {test: /hardening/host-os/ansible/e8$}
-
-/hardening/host-os/ansible/hipaa:
-    discover+: {test: /hardening/host-os/ansible/hipaa$}
-
-/hardening/host-os/ansible/ism_o:
-    discover+: {test: /hardening/host-os/ansible/ism_o$}
-
-/hardening/host-os/ansible/ism_o_top_secret:
-    discover+: {test: /hardening/host-os/ansible/ism_o_top_secret$}
-
-/hardening/host-os/ansible/ospp:
-    discover+: {test: /hardening/host-os/ansible/ospp$}
-
-/hardening/host-os/ansible/pci-dss:
-    discover+: {test: /hardening/host-os/ansible/pci-dss$}
-
-/hardening/host-os/ansible/stig:
-    discover+: {test: /hardening/host-os/ansible/stig$}
-
-#
-# Hardening via oscap xccdf eval --remediate
-#
-
-/hardening/host-os/oscap/anssi_bp28_high:
-    discover+: {test: /hardening/host-os/oscap/anssi_bp28_high$}
-
-/hardening/host-os/oscap/bsi:
-    discover+: {test: /hardening/host-os/oscap/bsi$}
-
-/hardening/host-os/oscap/ccn_advanced:
-    discover+: {test: /hardening/host-os/oscap/ccn_advanced$}
-
-/hardening/host-os/oscap/cis:
-    discover+: {test: /hardening/host-os/oscap/cis$}
-
-/hardening/host-os/oscap/cis_server_l1:
-    discover+: {test: /hardening/host-os/oscap/cis_server_l1$}
-
-/hardening/host-os/oscap/cis_workstation_l1:
-    discover+: {test: /hardening/host-os/oscap/cis_workstation_l1$}
-
-/hardening/host-os/oscap/cis_workstation_l2:
-    discover+: {test: /hardening/host-os/oscap/cis_workstation_l2$}
-
-/hardening/host-os/oscap/cui:
-    discover+: {test: /hardening/host-os/oscap/cui$}
-
-/hardening/host-os/oscap/e8:
-    discover+: {test: /hardening/host-os/oscap/e8$}
-
-/hardening/host-os/oscap/hipaa:
-    discover+: {test: /hardening/host-os/oscap/hipaa$}
-
-/hardening/host-os/oscap/ism_o:
-    discover+: {test: /hardening/host-os/oscap/ism_o$}
-
-/hardening/host-os/oscap/ism_o_top_secret:
-    discover+: {test: /hardening/host-os/oscap/ism_o_top_secret$}
-
-/hardening/host-os/oscap/ospp:
-    discover+: {test: /hardening/host-os/oscap/ospp$}
-
-/hardening/host-os/oscap/pci-dss:
-    discover+: {test: /hardening/host-os/oscap/pci-dss$}
-
-/hardening/host-os/oscap/stig:
-    discover+: {test: /hardening/host-os/oscap/stig$}
-
-#
-# Misc smoke/sanity tests
-#
-
-/static-checks:
-    discover+:
-        test: /static-checks
-        exclude:
-          # exclude here due to the test failing frequently for short periods
-          # of time, as many websites have temporary availability issues
-          - /static-checks/html-links
-          # these always fail, meant for manual review
-          - /static-checks/diff
-          # The value of this test is debatable and therefore it should not delay upstream gating.
-          # Our SCAP datastream is often noncompliant from the start, for example by containing SCE checks.
-          - /static-checks/nist-validation
-
-
-# Fedora specific plan
-/rpmbuild-ctest-fedora:
-    discover+: {test: /static-checks/rpmbuild-ctest}
diff --git a/tests/tmt/plans/fedora-cis.fmf b/tests/tmt/plans/fedora-cis.fmf
deleted file mode 100644
index 7045aba0a895..000000000000
--- a/tests/tmt/plans/fedora-cis.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-discover:
-    how: fmf
-    test: /tests/fedora-cis
-execute:
-    how: tmt
-report:
-    how: html
diff --git a/tests/tmt/tests/fedora-cis/main.fmf b/tests/tmt/tests/fedora-cis/main.fmf
deleted file mode 100644
index f4f82cb0cd8e..000000000000
--- a/tests/tmt/tests/fedora-cis/main.fmf
+++ /dev/null
@@ -1,11 +0,0 @@
-summary: Runs oscap remediation using the CIS profile
-description: |-
-    This ensures that the CIS profile is in a fairly good condition on Fedora,
-    to be used for ComplyTime demos, and as a baseline profile for the community
-    to target if they choose to adapt the ComplyTime tooling.
-test: ./test.sh
-duration: 1h
-require:
-    - openscap-scanner
-    - openscap-report
-    - scap-security-guide