diff --git a/scripts/mash_run.sh b/scripts/mash_run.sh
index 3cabbbf..65f3658 100755
--- a/scripts/mash_run.sh
+++ b/scripts/mash_run.sh
@@ -123,9 +123,9 @@ mash_prepare ()
 	local arches=$3
 	local conf=`mktemp`
 	( $optionv ) && echo "* Checking ${tag} mash config..."
-	# config mash already ok 
+	# config mash already ok
 	( $optionv ) && echo " -> [INFO] creating mash config: ${tag}.mash..."
-	print_mash_template "${tag}" "${arches}" > $conf 
+	print_mash_template "${tag}" "${arches}" > $conf
 	[ -f ${MASH_CONF}/${tag}.mash ] && diff ${MASH_CONF}/${tag}.mash $conf &>> $log
 	if [ $? -gt 0 ]
 	then
@@ -179,8 +179,13 @@ do
 	ARCHES=""
 	BUILDTAG=""
 	LOG="${LOG_DIR}/mash.${TAG}.log"
-	FAKETAG=${TAG/testing/candidate}
-	FAKETAG=${FAKETAG/release/candidate}
+	if [[ $TAG = *"infrastructure"* ]]
+    then
+		FAKETAG=${TAG/release/testing}
+	else
+		FAKETAG=${TAG/testing/candidate}
+		FAKETAG=${TAG/release/candidate}
+	fi
 	BUILDTAG=`grep ${FAKETAG} ${TARGETS} | awk '{print $2}'`
 	[ ! -z "$BUILDTAG" ] && ARCHES=`${KOJI} taginfo ${BUILDTAG} | grep Arches | cut -d ":" -f 2-`
 	[ -z "$ARCHES" ] && ARCHES="x86_64"