diff --git a/.distro/plans/rpm.fmf b/.distro/plans/rpm.fmf
new file mode 100644
index 0000000..794bffe
--- /dev/null
+++ b/.distro/plans/rpm.fmf
@@ -0,0 +1,13 @@
+/rpminspect:
+  plan:
+    import:
+      url: https://github.com/packit/tmt-plans
+      ref: main
+      name: /plans/rpminspect
+
+/rpmlint:
+  plan:
+    import:
+      url: https://github.com/packit/tmt-plans
+      ref: main
+      name: /plans/rpmlint
diff --git a/.distro/plans/rpmlint.fmf b/.distro/plans/rpmlint.fmf
deleted file mode 100644
index 0db484e..0000000
--- a/.distro/plans/rpmlint.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
-summary:
-  Perform rpmlint and rpminspect tests
-prepare:
-  - name: Download the source rpm
-    how: shell
-    script: cd /tmp && curl -O ${PACKIT_SRPM_URL}
-  - name: Download rpm packages
-    how: shell
-    script: cd /tmp && dnf download ${PACKIT_COPR_RPMS}
-discover+:
-  how: fmf
-  filter: "tag: rpmlint"
-execute:
-    how: tmt
diff --git a/.packit.yaml b/.packit.yaml
index 4aab4d1..e32fa57 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -1,79 +1,85 @@
 specfile_path: .distro/json-schema-validator.spec
 files_to_sync:
-    - src: .distro/json-schema-validator.spec
-      dest: json-schema-validator.spec
-    - .packit.yaml
-    - src: .distro/json-schema-validator.rpmlintrc
-      dest: json-schema-validator.rpmlintrc
-    # tmt setup
-    - src: .distro/.fmf/
-      dest: .fmf/
-    - src: .distro/plans/
-      dest: plans/
-      filters:
-          - "- .distro/plans/main.fmf.dist-git"
-          - "- .distro/plans/rpmlint.fmf"
-    - src: .distro/plans/main.fmf.dist-git
-      dest: plans/main.fmf
+  - src: .distro/json-schema-validator.spec
+    dest: json-schema-validator.spec
+  - .packit.yaml
+  - src: .distro/json-schema-validator.rpmlintrc
+    dest: json-schema-validator.rpmlintrc
+  # tmt setup
+  - src: .distro/.fmf/
+    dest: .fmf/
+  - src: .distro/plans/
+    dest: plans/
+    filters:
+      - "- .distro/plans/main.fmf.dist-git"
+      - "- .distro/plans/rpm.fmf"
+  - src: .distro/plans/main.fmf.dist-git
+    dest: plans/main.fmf
 upstream_package_name: json-schema-validator
 downstream_package_name: json-schema-validator
 update_release: false
-upstream_tag_template: v{version}
 
 jobs:
-    - job: copr_build
-      trigger: pull_request
-      owner: lecris
-      project: json-schema-validator
-      update_release: true
-      release_suffix: "{PACKIT_RPMSPEC_RELEASE}"
-      targets:
-          - fedora-development
-    - job: tests
-      trigger: pull_request
-      targets:
-          - fedora-development
-      fmf_path: .distro
-    - job: copr_build
-      trigger: commit
-      branch: main
-      owner: lecris
-      project: nightly
-      # TODO: Remove when upstream issue is resolved
-      # https://github.com/packit/packit/issues/1924
-      additional_repos:
-          - copr://@scikit-build/release
-      targets:
-          - fedora-development-x86_64
-          - fedora-latest-x86_64
-          - fedora-development-aarch64
-          - fedora-latest-aarch64
-    - job: copr_build
-      trigger: release
-      owner: lecris
-      project: release
-      targets:
-          - fedora-development-x86_64
-          - fedora-latest-x86_64
-          - fedora-development-aarch64
-          - fedora-latest-aarch64
-    - job: tests
-      trigger: commit
-      branch: main
-      targets:
-          - fedora-development
-          - fedora-latest
-      fmf_path: .distro
-    - job: propose_downstream
-      trigger: release
-      dist_git_branches:
-          - fedora-development
-          - fedora-latest
-    - job: koji_build
-      trigger: commit
-      dist_git_branches:
-          - fedora-all
-    - job: bodhi_update
-      trigger: commit
-      dist_git_branches:
-          - fedora-branched
+  - job: copr_build
+    trigger: pull_request
+    owner: lecris
+    project: json-schema-validator
+    update_release: true
+    release_suffix: "{PACKIT_RPMSPEC_RELEASE}"
+    targets:
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+      - epel-9-x86_64
+      - epel-9-aarch64
+  - job: tests
+    trigger: pull_request
+    targets:
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+      - epel-9-x86_64
+      - epel-9-aarch64
+    fmf_path: .distro
+  - job: copr_build
+    trigger: commit
+    branch: main
+    owner: lecris
+    project: nightly
+    # TODO: Remove when upstream issue is resolved
+    # https://github.com/packit/packit/issues/1924
+    additional_repos:
+      - copr://@scikit-build/release
+    targets:
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+      - epel-9-x86_64
+      - epel-9-aarch64
+  - job: copr_build
+    trigger: release
+    owner: lecris
+    project: release
+    targets:
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+      - epel-9-x86_64
+      - epel-9-aarch64
+  - job: tests
+    trigger: commit
+    branch: main
+    targets:
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+      - epel-9-x86_64
+      - epel-9-aarch64
+    fmf_path: .distro
+  - job: propose_downstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched