diff --git a/jobs/scripts/nightly-builds/nightly-builds.sh b/jobs/scripts/nightly-builds/nightly-builds.sh
index 67ecef1..7131470 100755
--- a/jobs/scripts/nightly-builds/nightly-builds.sh
+++ b/jobs/scripts/nightly-builds/nightly-builds.sh
@@ -3,6 +3,7 @@
 artifact()
 {
     #Copy the RPMS using scp
+    rm -rf ${RESULTDIR}/*.log
     [ -e ~/gluster-ssh-privatekey ] || return 0
     scp -q -o StrictHostKeyChecking=no -i ~/gluster-ssh-privatekey -r "${@}" gluster@artifacts.ci.centos.org:/srv/artifacts/gluster/nightly/
 }
@@ -118,7 +119,8 @@ esac
 
 # do the actual RPM build in mock
 # TODO: use a CentOS Storage SIG buildroot
-RESULTDIR=/srv/gluster/nightly/${GITHUB_BRANCH}/${CENTOS_VERSION}/${CENTOS_ARCH}
+VERSION_STRING=$(echo $CENTOS_VERSION | cut -d '-' -f1)
+RESULTDIR=/srv/gluster/nightly/${GITHUB_BRANCH}/${VERSION_STRING}/${CENTOS_ARCH}
 /usr/bin/mock \
     --root ${MOCK_CHROOT} \
     ${MOCK_RPM_OPTS} \
@@ -140,7 +142,7 @@ fi
 
 cat > /srv/gluster/nightly/${REPO_NAME}.repo <<< "[gluster-nightly-${REPO_VERSION}]
 name=Gluster Nightly builds (${GITHUB_BRANCH} branch)
-baseurl=http://artifacts.ci.centos.org/gluster/nightly/${GITHUB_BRANCH}/\$stream/\$basearch
+baseurl=http://artifacts.ci.centos.org/gluster/nightly/${GITHUB_BRANCH}/$releasever/$basearch
 enabled=1
 gpgcheck=0"
 
diff --git a/tests/Containerfile b/tests/Containerfile
index bbaabb6..f4af1cd 100644
--- a/tests/Containerfile
+++ b/tests/Containerfile
@@ -3,6 +3,7 @@ FROM quay.io/centos/centos:stream
 RUN true \
  && dnf -y install python3-pip \
  && pip3 install jenkins-job-builder \
+ && pip3 install dataclasses \
  && dnf -y clean all \
  && true