diff --git a/perestroika/build-deb.sh b/perestroika/build-deb.sh
index ff10565..057fb70 100755
--- a/perestroika/build-deb.sh
+++ b/perestroika/build-deb.sh
@@ -164,6 +164,7 @@ main () {
   esac
 
   if [ "$GERRIT_CHANGE_STATUS" == "NEW" ] && [ -n "$LP_BUG" -o -n "$CUSTOM_REPO_ID" ] ; then
+      local DEB_REQUEST_REPO_PATH=${DEB_REQUEST_REPO_PATH:-$DEB_REPO_PATH}
       case true in
           "$IS_HOTFIX" )
               local DEB_REQUEST_DIST_NAME=$DEB_HOTFIX_DIST_NAME
@@ -178,7 +179,7 @@ main () {
               local DEB_REQUEST_DIST_NAME=$DEB_DIST_NAME
               ;;
       esac
-      EXTRAREPO="${EXTRAREPO}|http://${REMOTE_REPO_HOST}/${REPO_REQUEST_PATH_PREFIX}/${REQUEST}/${DEB_REPO_PATH} ${DEB_REQUEST_DIST_NAME} ${COMPONENTS}"
+      EXTRAREPO="${EXTRAREPO}|http://${REMOTE_REPO_HOST}/${REPO_REQUEST_PATH_PREFIX}/${REQUEST}/${DEB_REQUEST_REPO_PATH} ${DEB_REQUEST_DIST_NAME} ${COMPONENTS}"
   fi
 
   export EXTRAREPO
diff --git a/perestroika/build-rpm.sh b/perestroika/build-rpm.sh
index 92e7ac2..48d7d6f 100755
--- a/perestroika/build-rpm.sh
+++ b/perestroika/build-rpm.sh
@@ -153,18 +153,22 @@ This package provides the %{-n*} kernel modules
   esac
 
   if [ "$GERRIT_CHANGE_STATUS" == "NEW" ] && [ -n "$LP_BUG" -o -n "$CUSTOM_REPO_ID" ] ; then
+      local RPM_REQUEST_HOTFIX_REPO_PATH=${RPM_REQUEST_HOTFIX_REPO_PATH:-$RPM_HOTFIX_REPO_PATH}
+      local RPM_REQUEST_SECURITY_REPO_PATH=${RPM_REQUEST_SECURITY_REPO_PATH:-$RPM_SECURITY_REPO_PATH}
+      local RPM_REQUEST_PROPOSED_REPO_PATH=${RPM_REQUEST_PROPOSED_REPO_PATH:-$RPM_PROPOSED_REPO_PATH}
+      local RPM_REQUEST_OS_REPO_PATH=${RPM_REQUEST_OS_REPO_PATH:-$RPM_OS_REPO_PATH}
       case true in
           "$IS_HOTFIX" )
-              local RPM_REQUEST_REPO_PATH=$RPM_HOTFIX_REPO_PATH
+              local RPM_REQUEST_REPO_PATH=$RPM_REQUEST_HOTFIX_REPO_PATH
               ;;
           "$IS_SECURITY" )
-              local RPM_REQUEST_REPO_PATH=$RPM_SECURITY_REPO_PATH
+              local RPM_REQUEST_REPO_PATH=$RPM_REQUEST_SECURITY_REPO_PATH
               ;;
           "$IS_UPDATES" )
-              local RPM_REQUEST_REPO_PATH=$RPM_PROPOSED_REPO_PATH
+              local RPM_REQUEST_REPO_PATH=$RPM_REQUEST_PROPOSED_REPO_PATH
               ;;
           * )
-              local RPM_REQUEST_REPO_PATH=$RPM_OS_REPO_PATH
+              local RPM_REQUEST_REPO_PATH=$RPM_REQUEST_OS_REPO_PATH
               ;;
       esac
       EXTRAREPO="${EXTRAREPO}|repo5,http://${REMOTE_REPO_HOST}/${REPO_REQUEST_PATH_PREFIX}/${REQUEST}/${RPM_REQUEST_REPO_PATH}/x86_64"