diff --git a/contrib/rh-bkr/build-from-source.sh b/contrib/rh-bkr/build-from-source.sh
index 7f6c89e520..b40d8d6233 100755
--- a/contrib/rh-bkr/build-from-source.sh
+++ b/contrib/rh-bkr/build-from-source.sh
@@ -150,11 +150,11 @@ if [[ "$DO_TEST_PACKAGE" == yes || "$DO_INSTALL" == yes ]]; then
 fi
 
 if [[ "$DO_INSTALL" == yes ]]; then
-    pushd "./contrib/fedora/rpm/latest/RPMS/$ARCH/"
-        for p in $(ls -1 ./*.rpm | sed 's#.*\(NetworkManager.*\)-1\.[0-9]\+\..*#\1#'); do
+    pushd "./contrib/fedora/rpm/latest/RPMS/"
+        for p in $(ls -1 ./{$ARCH,noarch}/*.rpm | sed -n 's#^\./[^/]\+/\(NetworkManager.*\)-1\.[0-9]\+\..*#\1#p'); do
             $SUDO rpm -e --nodeps $p || true
         done
-        $SUDO yum install -y ./*.rpm
+        $SUDO yum install -y ./{$ARCH,noarch}/*.rpm
     popd
 
     # ensure that the expected NM is installed.