diff --git a/.packit.yaml b/.packit.yaml
index afaf522e50..fd777765f6 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -45,19 +45,13 @@ jobs:
       - fedora-all
       - centos-stream-10
 
-  # Use fedora-latest as host for centos-10 tests due to memory constraints
-  # that cause swapping issues with centos-10 containers on centos hosts
+  # Run TMT tests after COPR builds complete
   - job: tests
     trigger: pull_request
-    identifier: "centos-stream-10"
     packages:
       - upstream
     targets:
-      - fedora-latest
-    tf_extra_params:
-      environments:
-        - variables:
-            CONTAINER_TARGET: "centos-10"
+      - centos-stream-10
 
   # Create Fedora pull request on release
   - job: propose_downstream
diff --git a/plans/passkey.fmf b/plans/passkey.fmf
index 4625b8c4ed..615ac04e57 100644
--- a/plans/passkey.fmf
+++ b/plans/passkey.fmf
@@ -6,12 +6,17 @@ tag: passkey
 
 provision:
     how: virtual
-    # Testing Farm provides a maximum of 4GB RAM,
-    # but 16GB allows smoother operation by avoiding memory swap
-    # when running locally or if memory limits increase
-    memory: 16384
+    hardware:
+      memory: ">= 16 GB"
 
 prepare:
+    - name: Enable EPEL repository for CentOS Stream
+      how: shell
+      script: |
+        if grep -q "CentOS Stream" /etc/os-release 2>/dev/null; then
+          dnf install -y epel-release
+        fi
+
     - name: Install general dependencies
       how: install
       package:
@@ -33,11 +38,13 @@ prepare:
           ln -sf $(command -v podman-compose) /usr/local/bin/docker-compose
         fi
 
-    - name: Install and load kernel module for passkey testing
+    - name: Install and load kernel module for passkey testing on Fedora
       how: shell
       script: |
-        dnf install -y kernel-modules-extra-$(uname -r)
-        modprobe vhci_hcd
+        if grep -q "^ID=fedora" /etc/os-release 2>/dev/null; then
+          dnf install -y kernel-modules-extra-$(uname -r)
+          modprobe vhci_hcd
+        fi
 
     - name: Clone sssd
       how: shell
@@ -78,11 +85,11 @@ prepare:
         setsebool container_manage_cgroup true
         cp env.example .env
 
-        # Use CONTAINER_TARGET from packit if provided, otherwise use Fedora
-        if [ -n "$CONTAINER_TARGET" ]; then
-            CONTAINER_TAG="$CONTAINER_TARGET"
+        # Detect system distribution and set appropriate container tag
+        . /tmp/sssd/contrib/ci/distro.sh
+        if [ "$DISTRO_ID" = "centos" ]; then
+            CONTAINER_TAG="centos-$DISTRO_RELEASE"
         else
-            . /tmp/sssd/contrib/ci/distro.sh
             CONTAINER_TAG="fedora-$DISTRO_RELEASE"
         fi
         echo "Using container tag: $CONTAINER_TAG"
@@ -144,7 +151,9 @@ prepare:
 
         echo "Using COPR repo: $COPR_REPO"
 
-        if [[ "$CONTAINER_TARGET" == "centos-10" ]]; then
+        # Detect system distribution and set appropriate COPR command
+        . /tmp/sssd/contrib/ci/distro.sh
+        if [ "$DISTRO_ID" = "centos" ] && [ "$DISTRO_RELEASE" = "10" ]; then
           COPR_ENABLE_CMD="dnf copr enable -y $COPR_REPO centos-stream-10-x86_64"
         else
           COPR_ENABLE_CMD="dnf copr enable -y $COPR_REPO"
@@ -154,7 +163,7 @@ prepare:
         ssh -i /tmp/sssd-ci-containers/data/ssh-keys/root.id_rsa \
             -o StrictHostKeyChecking=no \
             root@client.test "
-          $COPR_ENABLE_CMD
+          $COPR_ENABLE_CMD && \
           dnf upgrade -y --refresh sssd*
         "
 
@@ -162,7 +171,7 @@ prepare:
         ssh -i /tmp/sssd-ci-containers/data/ssh-keys/root.id_rsa \
             -o StrictHostKeyChecking=no \
             root@master.ipa.test "
-          $COPR_ENABLE_CMD
+          $COPR_ENABLE_CMD && \
           dnf upgrade -y --refresh sssd*
         "