diff --git a/.packit.yaml b/.packit.yaml
index cd89afdd4..32608d412 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -18,31 +18,27 @@ srpm_build_deps:
 
 actions:
     create-archive:
-        - bash -c "sed -i -r  \"s/^Version:.*/Version:\        ${PACKIT_PROJECT_VERSION}/\" fido-device-onboard.spec"
-        - bash -c "sed -i '/Source1/d ; /^# See make-vendored-tarfile.sh in upstream repo/d ;' fido-device-onboard.spec"
         - bash -c "cp ./patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch ."
         - bash -c "git archive --prefix=fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}/ --format=tar HEAD > fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
+        - bash -c "./make-vendored-tarfile.sh ${PACKIT_PROJECT_VERSION}"
         - bash -c "tar -xvf fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
         - bash -c "ls -1 ./fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
-    fix-spec-file:
-        - "cat fido-device-onboard.spec"
 
 jobs:
-    - job: copr_build
+    - &fdo_copr_build
+      job: copr_build
       trigger: pull_request
-      targets:
-          - fedora-development-aarch64
-          - fedora-development
-          - fedora-latest
-          - fedora-latest-aarch64
-    - job: copr_build
+      targets: &fdo_targets
+          fedora-stable: {}
+          fedora-developement: {}
+          fedora-eln:
+              additional_repos:
+                  - https://kojipkgs.fedoraproject.org/repos/eln-build/latest/$basearch/
+          epel-9: {}
+
+    - <<: *fdo_copr_build
       trigger: commit
       branch: main
       owner: "@fedora-iot"  # copr repo namespace
       project: fedora-iot   # copr repo name so you can consume the builds
-      targets:
-          - fedora-development-aarch64
-          - fedora-development
-          - fedora-latest
-          - fedora-latest-aarch64
 ...