diff --git a/mtps-get-builds b/mtps-get-builds
index 3fdd86a..46a7b63 100755
--- a/mtps-get-builds
+++ b/mtps-get-builds
@@ -361,7 +361,7 @@ which 'createrepo' >/dev/null 2>&1 && GB_CREATEREPO_BIN="createrepo" || :
 which 'createrepo_c' >/dev/null 2>&1 && GB_CREATEREPO_BIN="createrepo_c" || :
 if [ -z "$GB_CREATEREPO_BIN" ]; then
     echo "Install createrepo[_c] to create repositories."
-    exit 0
+    exit 1
 fi
 echo "Using $GB_CREATEREPO_BIN"
 "$GB_CREATEREPO_BIN" --database "$GB_REPODIR"
diff --git a/mtps-get-module b/mtps-get-module
index a660b19..df70804 100755
--- a/mtps-get-module
+++ b/mtps-get-module
@@ -545,7 +545,7 @@ which 'modifyrepo' >/dev/null 2>&1 && MODIFYREPO_BIN="modifyrepo" || :
 which 'modifyrepo_c' >/dev/null 2>&1 && MODIFYREPO_BIN="modifyrepo_c" || :
 if [[ -z "$CREATEREPO_BIN" || -z "$MODIFYREPO_BIN" ]]; then
     echo "Install createrepo[_c] to create repositories."
-    exit 0
+    exit 1
 fi
 
 echo "Using $CREATEREPO_BIN"
diff --git a/mtps-get-task b/mtps-get-task
index 655cdc2..2db8d15 100755
--- a/mtps-get-task
+++ b/mtps-get-task
@@ -755,7 +755,7 @@ which 'createrepo' >/dev/null 2>&1 && CREATEREPO_BIN="createrepo" || :
 which 'createrepo_c' >/dev/null 2>&1 && CREATEREPO_BIN="createrepo_c" || :
 if [ -z "$CREATEREPO_BIN" ]; then
     echo "Install createrepo[_c] to create repositories."
-    exit 0
+    exit 1
 fi
 echo "Using $CREATEREPO_BIN"
 "$CREATEREPO_BIN" --database "$REPODIR"
diff --git a/profiles/rhel/prepare-system b/profiles/rhel/prepare-system
index a3b7f28..f77f036 100644
--- a/profiles/rhel/prepare-system
+++ b/profiles/rhel/prepare-system
@@ -58,11 +58,9 @@ if [ -n "$ENABLE_BUILD_ROOT" ]; then
     yum-config-manager --enable "$buildroot_repo"
 fi
 
-# repoquery util acts not on live system, but rather on set of enabled repos. mini-tps hold personal list of protected packages, such as openssh-server
-# yum config-manager --set-enabled astepano-mini-tps || :
-
 echo "Installing required packages for testing"
-yum -y install createrepo_c which procps-ng
+yum -y install createrepo_c || yum -y install createrepo
+yum -y install which procps-ng
 
 yum -y upgrade
 yum clean all