diff --git a/.packit.yml b/.packit.yml
deleted file mode 100644
index e7509c15..00000000
--- a/.packit.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-# vi: set ts=2 sw=2 et:
-#
-# Docs: https://packit.dev/docs/
-
-specfile_path: .packit_rpm/dbus-broker.spec
-files_to_sync:
-  - .packit.yml
-  - src: .packit_rpm/dbus-broker.spec
-    dest: dbus-broker.spec
-srpm_build_deps:
-  - meson
-upstream_package_name: dbus-broker
-downstream_package_name: dbus-broker
-upstream_tag_template: "v{version}"
-
-actions:
-  post-upstream-clone:
-    # Download all subprojects in advance, as we won't have networking during RPM build
-    - meson subprojects download
-    # Use the Fedora Rawhide specfile
-    - git clone https://src.fedoraproject.org/rpms/dbus-broker .packit_rpm --depth=1
-    # Drop the "sources" file so rebase-helper doesn't think we're a dist-git
-    - rm -fv .packit_rpm/sources
-    # Drop backported patches from the specfile
-    - sed -ri '/^Patch.*\\:.+\\.patch/d' .packit_rpm/dbus-broker.spec
-
-  create-archive:
-    # We have to override the default archive command (which is 'git archive'), since that ignores
-    # files in subprojects
-    - bash -c 'tar -pczf .packit_rpm/$PACKIT_PROJECT_NAME_VERSION.tar.gz --exclude="./.*" --transform="s/^\./$PACKIT_PROJECT_NAME_VERSION/" .'
-    - bash -c "echo .packit_rpm/$PACKIT_PROJECT_NAME_VERSION.tar.gz"
-
-jobs:
-- job: copr_build
-  trigger: pull_request
-  targets:
-    - fedora-all-aarch64
-    - fedora-all-i386
-    - fedora-all-ppc64le
-    - fedora-all-s390x
-    - fedora-all-x86_64
-
-- job: tests
-  trigger: pull_request
-  fmf_path: test/integration/
-  tmt_plan: upstream_ci
-  targets:
-    # Limit the Testing Farm jobs to the latest stable and rawhide releases to conserve resources
-    # See: https://packit.dev/docs/configuration#aliases
-    - fedora-latest-stable-aarch64
-    - fedora-latest-stable-x86_64
-    - fedora-rawhide-aarch64
-    - fedora-rawhide-x86_64
diff --git a/packit.yml b/packit.yml
new file mode 100644
index 00000000..7ded34ca
--- /dev/null
+++ b/packit.yml
@@ -0,0 +1,73 @@
+downstream_package_name: "dbus-broker"
+upstream_package_name: "dbus-broker"
+upstream_tag_template: "v{version}"
+
+specfile_path: ".dist-git/dbus-broker.spec"
+
+files_to_sync:
+- "packit.yml"
+- src: ".dist-git/dbus-broker.spec"
+  dest: "dbus-broker.spec"
+
+srpm_build_deps:
+- "meson"
+
+actions:
+  post-upstream-clone:
+    # Prepare sources for offline builds
+    - meson subprojects download
+    # Use the downstream configuration
+    - git clone --depth=1 "https://src.fedoraproject.org/rpms/dbus-broker" ".dist-git"
+    # Drop "sources" so rebase-helper does not treat this as dist-git
+    - rm -fv ".dist-git/sources"
+    # Drop backported patches
+    - sed -ri '/^Patch.*\\:.+\\.patch/d' ".dist-git/dbus-broker.spec"
+
+  create-archive:
+    # Override `git archive`, since we use subprojects.
+    - bash -c 'tar -pczf .dist-git/$PACKIT_PROJECT_NAME_VERSION.tar.gz --exclude="./.*" --transform="s/^\./$PACKIT_PROJECT_NAME_VERSION/" .'
+    - bash -c "echo .dist-git/$PACKIT_PROJECT_NAME_VERSION.tar.gz"
+
+jobs:
+- job: copr_build
+  trigger: commit
+  targets:
+  - fedora-all-aarch64
+  - fedora-all-i386
+  - fedora-all-ppc64le
+  - fedora-all-s390x
+  - fedora-all-x86_64
+
+- job: copr_build
+  trigger: pull_request
+  targets:
+  - fedora-all-aarch64
+  - fedora-all-i386
+  - fedora-all-ppc64le
+  - fedora-all-s390x
+  - fedora-all-x86_64
+
+- job: tests
+  trigger: commit
+  fmf_path: test/integration/
+  tmt_plan: upstream_ci
+  targets:
+  - fedora-latest-stable-aarch64
+  - fedora-latest-stable-x86_64
+  - fedora-rawhide-aarch64
+  - fedora-rawhide-x86_64
+
+- job: tests
+  trigger: pull_request
+  fmf_path: test/integration/
+  tmt_plan: upstream_ci
+  targets:
+  - fedora-latest-stable-aarch64
+  - fedora-latest-stable-x86_64
+  - fedora-rawhide-aarch64
+  - fedora-rawhide-x86_64
+
+- job: propose_downstream
+  trigger: release
+  dist_git_branches:
+  - main