diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 7a139fd..48c1569 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -577,62 +577,62 @@
 		       ENABLE_STACK_PROTECTOR=strong \
 		       PLAT=stm32mp1"
 
-stm32mp13_common_flags="$(stm32mp1_common_flags) \
-			AARCH32_SP=optee \
-			STM32MP13=1"
-
 # STM32MP1 SDMMC boot
-make $(stm32mp1_common_flags) STM32MP_SDMMC=1 \
+make ${stm32mp1_common_flags} STM32MP_SDMMC=1 \
     BUILD_PLAT=build/stm32mp1-sdmmc/debug \
     AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 eMMC boot
-make $(stm32mp1_common_flags) STM32MP_EMMC=1 \
+make ${stm32mp1_common_flags} STM32MP_EMMC=1 \
     BUILD_PLAT=build/stm32mp1-emmc/debug \
     AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 Raw NAND boot
-make $(stm32mp1_common_flags) STM32MP_RAW_NAND=1 \
+make ${stm32mp1_common_flags} STM32MP_RAW_NAND=1 \
     BUILD_PLAT=build/stm32mp1-nand/debug \
     AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 SPI NAND boot
-make $(stm32mp1_common_flags) STM32MP_SPI_NAND=1 \
+make ${stm32mp1_common_flags} STM32MP_SPI_NAND=1 \
     BUILD_PLAT=build/stm32mp1-snand/debug \
     AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 SPI NOR boot
-make $(stm32mp1_common_flags) STM32MP_SPI_NOR=1 \
+make ${stm32mp1_common_flags} STM32MP_SPI_NOR=1 \
     BUILD_PLAT=build/stm32mp1-snor/debug \
-    AARCH32_SP=sp_minbl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 UART boot
-make $(stm32mp1_common_flags) STM32MP_UART_PROGRAMMER=1 \
+make ${stm32mp1_common_flags} STM32MP_UART_PROGRAMMER=1 \
     BUILD_PLAT=build/stm32mp1-uart/debug \
     AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 USB boot
-make $(stm32mp1_common_flags) STM32MP_USB_PROGRAMMER=1 \
+make ${stm32mp1_common_flags} STM32MP_USB_PROGRAMMER=1 \
     BUILD_PLAT=build/stm32mp1-usb/debug \
     AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 TBBR
-make $(stm32mp1_common_flags) STM32MP_SDMMC=1 \
+make ${stm32mp1_common_flags} STM32MP_SDMMC=1 \
     BUILD_PLAT=build/stm32mp1-sdmmc-tbbr/debug \
     MBEDTLS_DIR=$(pwd)/mbedtls TRUSTED_BOARD_BOOT=1 \
     AARCH32_SP=sp_min bl2 bl32
 
+stm32mp13_common_flags="${stm32mp1_common_flags} \
+			AARCH32_SP=optee \
+			STM32MP13=1"
+
 # STM32MP13 SDMMC boot
-make $(stm32mp13_common_flags) STM32MP_SDMMC=1 \
+make ${stm32mp13_common_flags} STM32MP_SDMMC=1 \
     BUILD_PLAT=build/stm32mp1-mp13-sdmmc/debug bl2
 
 # STM32MP13 TBBR
-make $(stm32mp13_common_flags) STM32MP_SDMMC=1 \
+make ${stm32mp13_common_flags} STM32MP_SDMMC=1 \
     MBEDTLS_DIR=$(pwd)/mbedtls TRUSTED_BOARD_BOOT=1 \
     BUILD_PLAT=build/stm32mp1-mp13-sdmmc-tbbr/debug bl2
 
 # STM32MP13 TBBR DECRYPTION AES GCM
-make $(stm32mp13_common_flags) STM32MP_SDMMC=1 \
+make ${stm32mp13_common_flags} STM32MP_SDMMC=1 \
     MBEDTLS_DIR=$(pwd)/mbedtls TRUSTED_BOARD_BOOT=1 \
     DECRYPTION_SUPPORT=aes_gcm ENCRYPT_BL32=1 \
     BUILD_PLAT=build/stm32mp1-mp13-sdmmc-tbbr-dec/debug bl2