diff --git a/build-tools/build-docker-images/build-stx-base.sh b/build-tools/build-docker-images/build-stx-base.sh
index 6ba1cb1b..67ad57cc 100755
--- a/build-tools/build-docker-images/build-stx-base.sh
+++ b/build-tools/build-docker-images/build-stx-base.sh
@@ -249,6 +249,15 @@ if [ "${CLEAN}" = "yes" ]; then
         exit 1
     fi
 
+    if [ "$TAG_LATEST" = "yes" ]; then
+        echo "Deleting image: ${IMAGE_NAME_LATEST}"
+        docker image rm ${IMAGE_NAME_LATEST}
+        if [ $? -ne 0 ]; then
+            echo "Failed running docker image rm command" >&2
+            exit 1
+        fi
+    fi
+
     if [ ${BASE_IMAGE_PRESENT} -ne 0 ]; then
         # The base image was not already present, so delete it
         echo "Removing docker image ${OS}:${OS_VERSION}"
diff --git a/build-tools/build-rpms-serial b/build-tools/build-rpms-serial
index 9c218667..14cac460 100755
--- a/build-tools/build-rpms-serial
+++ b/build-tools/build-rpms-serial
@@ -2013,7 +2013,7 @@ echo "CMD_OPTIONS=$CMD_OPTIONS"
 
 CMD="$CMD_PREFIX mockchain -r $BUILD_CFG -l $BUILD_BASE --recurse --log=$MOCKCHAIN_LOG --tmp_prefix=$USER --addrepo=$LOCAL_URL --addrepo=$LOCAL_SRC_URL -m --rootdir=$BUILD_BASE/mock/root $CMD_OPTIONS -m --rebuild $SRPMS_LIST"
 echo "$CMD -m --define='_tis_dist .tis' -m --define='platform_release $PLATFORM_RELEASE'" 
-trapwrap stdbuf -o0 $CMD -m --define='_tis_dist .tis' -m --define='platform_release $PLATFORM_RELEASE'
+trapwrap stdbuf -o0 $CMD -m --define='_tis_dist .tis' -m --define="platform_release $PLATFORM_RELEASE"
 MOCKCHAIN_RC=$?
 
 echo $PLATFORM_RELEASE > $LAST_PLATFORM_RELEASE_FILE