diff --git a/Dockerfile.builder b/Dockerfile.builder
index dce0692..0061dbe 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -4,7 +4,7 @@ RUN urpmi --auto --auto-update --no-verify-rpm \
  && rm -f /etc/localtime \
  && ln -s /usr/share/zoneinfo/UTC /etc/localtime \
  && urpmi.addmedia builder http://abf-downloads.rosalinux.ru/rosa2016.1/repository/x86_64/main/testing/ \
- && urpmi --no-suggests --no-verify-rpm --auto mock-urpm git curl sudo builder-c xz timezone \
+ && urpmi --no-suggests --no-verify-rpm --auto mock-urpm git valgrind curl sudo builder-c xz timezone \
  && sed -i 's!openmandriva.org!rosalinux.ru!g' /etc/builder-c/filestore_upload.sh \
  && sed -i 's!file-store!abf-n-file-store!g' /etc/builder-c/filestore_upload.sh \
  && sed -i -e "s/Defaults    requiretty.*/ #Defaults    requiretty/g" /etc/sudoers \
@@ -17,4 +17,4 @@ RUN urpmi --auto --auto-update --no-verify-rpm \
  && rm -rf /usr/share/man/ /usr/share/cracklib /usr/share/doc
 
 COPY builder.conf /etc/builder-c/
-ENTRYPOINT ["/usr/bin/builder"]
+ENTRYPOINT ["/usr/bin/valgrind", "--undef-value-errors=no", "/usr/bin/builder"]
diff --git a/build-rpm.sh b/build-rpm.sh
index 065a488..5516a5c 100755
--- a/build-rpm.sh
+++ b/build-rpm.sh
@@ -276,6 +276,8 @@ arm_platform_detector
 # We will rerun the build in case when repository is modified in the middle,
 # but for safety let's limit number of retest attempts
 # (since in case when repository metadata is really broken we can loop here forever)
+
+
 MAX_RETRIES=10
 WAIT_TIME=60
 RETRY_GREP_STR="You may need to update your urpmi database\|problem reading synthesis file of medium\|retrieving failed: "
@@ -285,6 +287,7 @@ if [ "$rerun_tests" = 'true' ]; then
     return 0
 fi
 
+spec_name=`ls -1 | grep '.spec$'`
 echo '--> Build src.rpm'
 try_rebuild=true
 retry=0
@@ -307,9 +310,9 @@ do
 		sleep ${WAIT_TIME}
 	    fi
 	fi
-	$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${PACKAGE}.spec --sources=$build_package --no-cleanup-after --no-clean $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
+	$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after --no-clean $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
     else
-	$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${PACKAGE}.spec --sources=$build_package --no-cleanup-after $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
+	$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
     fi
 
     rc=${PIPESTATUS[0]}