diff --git a/.distro/plans/rpmlint.fmf b/.distro/plans/rpmlint.fmf
deleted file mode 100644
index 1d28ff952..000000000
--- a/.distro/plans/rpmlint.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-prepare:
-  - how: shell
-    script: cp ./*.rpmlintrc $TMT_PLAN_DATA/
-discover:
-  how: fmf
-  filter: "tag: rpmlint"
-  url: https://github.com/packit/tmt-plans
-  ref: main
-execute:
-  how: tmt
diff --git a/.distro/python-scikit-build-core.rpmlintrc b/.distro/python-scikit-build-core.rpmlintrc
deleted file mode 100644
index 8d11c14bb..000000000
--- a/.distro/python-scikit-build-core.rpmlintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-addFilter("python.?-scikit-build-core\+pyproject.* spelling-error \('[Mm]etapackage")
-addFilter("python.?-scikit-build-core\+.* no-documentation")
-addFilter("python.?-scikit-build-core.* files-duplicate .*__init__.py .*")
diff --git a/.distro/python-scikit-build-core.spec b/.distro/python-scikit-build-core.spec
index 3298459e2..f26e86ccf 100644
--- a/.distro/python-scikit-build-core.spec
+++ b/.distro/python-scikit-build-core.spec
@@ -1,11 +1,3 @@
-# Testing dependencies not satisfied on epel
-# build, cattrs, hatch-fancy-pypi-readme, pytest-subprocess
-%if 0%{?el10}
-%bcond_with tests
-%else
-%bcond_without tests
-%endif
-
 %global debug_package %{nil}
 
 Name:           python-scikit-build-core
@@ -37,32 +29,12 @@ A next generation Python CMake adapter and Python API for plugins
 %package -n python3-scikit-build-core
 Summary:        %{summary}
 Requires:       cmake
-Recommends:     (ninja-build or make)
-Recommends:     python3-scikit-build-core+pyproject = %{version}-%{release}
-Suggests:       ninja-build
-Suggests:       gcc
-Provides:       bundled(python3dist(pyproject-metadata))
+Requires:       ninja-build
 BuildArch:      noarch
-%description -n python3-scikit-build-core %_description
-
 
-# Add %%pyproject_extras_subpkg results manually because BuildArch: noarch is not injected
-# https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/174
-# %%pyproject_extras_subpkg -n python3-scikit-build-core pyproject
+Obsoletes:      python3-scikit-build-core+pyproject < 0.10.7-3
 
-%package -n python3-scikit-build-core+pyproject
-Summary: Metapackage for python3-scikit-build-core: pyproject extras
-Requires: python3-scikit-build-core = %{?epoch:%{epoch}:}%{version}-%{release}
-BuildArch:      noarch
-# Deprecated empty extras package
-# Note: Cannot use Obsoletes + Provides here. python3dist() does not seem to be picked up
-Provides:  deprecated()
-%description -n python3-scikit-build-core+pyproject
-This is a metapackage bringing in pyproject extras requires for
-python3-scikit-build-core.
-It makes sure the dependencies are installed.
-
-%files -n python3-scikit-build-core+pyproject -f %{_pyproject_ghost_distinfo}
+%description -n python3-scikit-build-core %_description
 
 
 %prep
@@ -72,7 +44,7 @@ cp -p src/scikit_build_core/_vendor/pyproject_metadata/LICENSE LICENSE-pyproject
 
 
 %generate_buildrequires
-%pyproject_buildrequires %{?with_tests:-x test,test-meta,test-numpy}
+%pyproject_buildrequires -x test,test-meta,test-numpy
 
 
 %build
@@ -86,10 +58,8 @@ cp -p src/scikit_build_core/_vendor/pyproject_metadata/LICENSE LICENSE-pyproject
 
 %check
 %pyproject_check_import
-%if %{with tests}
 %pytest \
     -m "not network"
-%endif
 
 
 %files -n python3-scikit-build-core -f %{pyproject_files}
diff --git a/.packit.yaml b/.packit.yaml
index d2b071162..1ed320c31 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -6,7 +6,7 @@ files_to_sync:
       - "protect .git*"
       - "protect sources"
       - "protect changelog"
-      - "- plans/rpmlint.fmf"
+      - "protect gating.yaml"
   - .packit.yaml
 
 upstream_package_name: scikit-build-core
@@ -20,31 +20,36 @@ targets: &targets
   - epel-10-x86_64
   - epel-10-aarch64
 
-jobs:
-  - &copr_build
+_:
+  # Job templates
+  - &build-in-packit
     job: copr_build
-    trigger: pull_request
+  - &build-in-scikit-build
+    <<: *build-in-packit
+    owner: "@scikit-build"
   - &tests
     job: tests
-    trigger: pull_request
     fmf_path: .distro
-    targets:
-      - fedora-all-x86_64
-      - fedora-all-aarch64
-  - <<: *copr_build
+
+jobs:
+  # Upstream jobs
+  - <<: *build-in-scikit-build
     trigger: release
-    owner: "@scikit-build"
     project: release
   - <<: *tests
     trigger: release
-  - <<: *copr_build
+  - <<: *build-in-scikit-build
     trigger: commit
     branch: main
-    owner: "@scikit-build"
     project: nightly
   - <<: *tests
     trigger: commit
     branch: main
+  - <<: *build-in-packit
+    trigger: pull_request
+  - <<: *tests
+    trigger: pull_request
+  # Downstream jobs
   - job: propose_downstream
     trigger: release
     dist_git_branches: