diff --git a/dist/ami/build_ami.sh b/dist/ami/build_ami.sh
index a2045a53b6..f4c7da1a1e 100755
--- a/dist/ami/build_ami.sh
+++ b/dist/ami/build_ami.sh
@@ -15,9 +15,9 @@ fi
 if [ ! -f files/scylla-server.rpm ]; then
     cd ../../
     dist/redhat/build_rpm.sh
+    RPM=`ls build/rpms/scylla-server-*.x86_64.rpm|grep -v debuginfo`
+    cp $RPM dist/ami/files/scylla-server.rpm
     cd -
-    RPM=`ls /var/lib/mock/*/result/scylla-server-*.x86_64.rpm|grep -v debuginfo`
-    cp $RPM files/scylla-server.rpm
 fi
 
 if [ ! -d packer ]; then
diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh
index ce5a1a7931..d93ef6d972 100755
--- a/dist/redhat/build_rpm.sh
+++ b/dist/redhat/build_rpm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 SCYLLA_VER=0.00
-RPMBUILD=~/rpmbuild
+RPMBUILD=build/rpmbuild
 
 if [ ! -e dist/redhat/build_rpm.sh ]; then
     echo "run build_rpm.sh in top of scylla dir"
@@ -9,7 +9,5 @@ if [ ! -e dist/redhat/build_rpm.sh ]; then
 fi
 mkdir -p $RPMBUILD/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 ./scripts/git-archive-all --force-submodules --prefix scylla-server-$SCYLLA_VER $RPMBUILD/SOURCES/scylla-server-$SCYLLA_VER.tar
-cp dist/redhat/scylla-server.spec $RPMBUILD/SPECS
-rpmbuild -bs --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/scylla-server.spec
-cd $RPMBUILD/SRPMS
-mock rebuild scylla-server-$SCYLLA_VER*.src.rpm
+rpmbuild -bs --define "_topdir $RPMBUILD" -ba dist/redhat/scylla-server.spec
+mock rebuild --resultdir=`pwd`/build/rpms $RPMBUILD/SRPMS/scylla-server-$SCYLLA_VER*.src.rpm