diff --git a/docker_rebuild_msmtp_rpm.sh b/docker_rebuild_msmtp_rpm.sh
index febe038..171ec60 100755
--- a/docker_rebuild_msmtp_rpm.sh
+++ b/docker_rebuild_msmtp_rpm.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-FROMFEDORA='36'
+FROMFEDORA='37'
 PACKAGE='msmtp'
 
 ABSDIR="$( dirname "$(readlink -f -- "$0")" )"
@@ -44,5 +44,4 @@ runuser -l mockbuilder -c 'mock --localrepo=/tmp/ --chain -r rocky+epel-8-${ARCH
 mv -f /tmp/results/*/${PACKAGE}-*/*.rpm /out/
 EOF
 
-[[ $? == 0 ]] && mv -i /tmp/dockerrpmbuild-$$/*.rpm ${ABSDIR}/files/ &&
-rm -rf /tmp/dockerrpmbuild-$$ &&
+[[ $? == 0 ]] && mv -i /tmp/dockerrpmbuild-$$/*.rpm ${ABSDIR}/files/ && rm -rf /tmp/dockerrpmbuild-$$