Index: build/build.sh
===================================================================
diff -u -r68b95588b0f90670fc6ce6d14210570c6b1b0d06 -rac77da367a54820454de0e0c869c4e13e8e88e59
--- build/build.sh	(.../build.sh)	(revision 68b95588b0f90670fc6ce6d14210570c6b1b0d06)
+++ build/build.sh	(.../build.sh)	(revision ac77da367a54820454de0e0c869c4e13e8e88e59)
@@ -280,10 +280,12 @@
 	if [[ $(grep "error:" $build_err) != "" ]]
 	then
 		echo "ERROR: Application Build Failed [$gcc_out]"
-		echo "Build GCC v9.3.0, Failed, $gcc_out" >> $STATUS_REPORT
+		echo "Build GCC v9.3.0, Failed, $gcc_out" >> "$STATUS_REPORT"
 		hasTestPassed=false
 	else
-		echo "Build GCC v9.3.0, Passed" >> $STATUS_REPORT
+	  # Build passed so tag the build
+    tagUIRepository "${buildSpecs[$PROJECT_CHECKOUT_INDEX]}" "${buildSpecs[$COMMON_CHECKOUT_INDEX]}" "$STATUS_REPORT"
+		echo "Build GCC v9.3.0, Passed" >> "$STATUS_REPORT"
 		# Add the sha256sum build now
 		sha256sum -b --tag denali >> denali
 	fi
Index: build/unittest.sh
===================================================================
diff -u -r7248a1037887595af69fc1903506df5ddade67f7 -rac77da367a54820454de0e0c869c4e13e8e88e59
--- build/unittest.sh	(.../unittest.sh)	(revision 7248a1037887595af69fc1903506df5ddade67f7)
+++ build/unittest.sh	(.../unittest.sh)	(revision ac77da367a54820454de0e0c869c4e13e8e88e59)
@@ -456,9 +456,6 @@
         copy_TestsResults_IntoServer
         check_TestResults
     fi
-
-    # Call this function to check if the repository has to be tagged or not
-    tagUIRepository ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} ${buildSpecs[$COMMON_CHECKOUT_INDEX]} $STATUS_REPORT
 }
 
 main