diff --git a/docker_rpmbuild-rebuild_msmtp.sh b/docker_rpmbuild-rebuild_msmtp.sh
index 901da74..f9a3236 100755
--- a/docker_rpmbuild-rebuild_msmtp.sh
+++ b/docker_rpmbuild-rebuild_msmtp.sh
@@ -19,18 +19,26 @@ VERSION=$(echo "${JSONLINE}" | sed -e "s/^\s*\"stable\": \"${PACKAGE}-\(.*\)\.fc
 
 ARCH=$(${DOCKER} run --rm docker.io/library/rockylinux:8 uname -i)
 
-${DOCKER} build -t docker-${PACKAGE}-build -f- . <<EOF
+${DOCKER} build -t localhost/docker-${PACKAGE}-build -f- . <<EOF
 FROM docker.io/library/rockylinux:8
 RUN dnf install -y epel-release dnf-plugins-core && \
 dnf config-manager --set-enabled powertools && \
 dnf install -y rpm-build gcc make gettext gnutls-devel libgsasl-devel libidn-devel libsecret-devel && \
 useradd -m dontbuildasroot -s /bin/bash
 USER dontbuildasroot
-RUN curl https://download-ib01.fedoraproject.org/pub/fedora/linux/updates/${FROMFEDORA}/Everything/SRPMS/Packages/m/${PACKAGE}-${VERSION}.fc${FROMFEDORA}.src.rpm -o /tmp/package.src.rpm && \
-rpmbuild --rebuild /tmp/package.src.rpm
+RUN rpmbuild --rebuild https://download-ib01.fedoraproject.org/pub/fedora/linux/updates/${FROMFEDORA}/Everything/SRPMS/Packages/m/${PACKAGE}-${VERSION}.fc${FROMFEDORA}.src.rpm
 EOF
 
-${DOCKER} create -ti --name docker-${PACKAGE}-xfer docker-${PACKAGE}-build bash
-${DOCKER} cp docker-${PACKAGE}-xfer:/home/dontbuildasroot/rpmbuild/RPMS/${ARCH}/${PACKAGE}-${VERSION}.el8.${ARCH}.rpm ./files/
-${DOCKER} rm -fv docker-${PACKAGE}-xfer
-${DOCKER} rmi -f docker-${PACKAGE}-build
+[[ $? = 0 ]] && mkdir /tmp/dockerrpmbuild-$$
+
+${DOCKER} build --no-cache -v /tmp/dockerrpmbuild-$$:/out:Z -t docker-${PACKAGE}-xfer -f- . <<EOF
+FROM localhost/docker-${PACKAGE}-build
+USER root
+RUN mv /home/dontbuildasroot/rpmbuild/RPMS/*/*.rpm /out/
+EOF
+
+[[ $? == 0 ]] && mv -i /tmp/dockerrpmbuild-$$/*.rpm ${ABSDIR}/files/ &&
+rm -rf /tmp/dockerrpmbuild-$$ &&
+
+${DOCKER} rmi -f docker-${PACKAGE}-build &&
+${DOCKER} rmi -f docker-${PACKAGE}-xfer