diff --git a/Makefile.cmake b/Makefile.cmake
index d46e93c335c82c0bf9f003fd13fbe79e0edadde7..d4ce01fc1191cd15cf05cac382d7c6d923460fc9 100644
--- a/Makefile.cmake
+++ b/Makefile.cmake
@@ -1,6 +1,6 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2021-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -126,7 +126,9 @@ ENABLE_COVERAGE ?= $(DEFAULT_ENABLE_COVERAGE)
 #
 # Products
 #
-PRODUCTS := $(sort $(shell find product -name "product.mk" -printf "%h\n" | cut -d'/' -f2-3))
+PRODUCTS := $(sort $(patsubst product/%/product.mk, %, \
+             $(wildcard product/*/product.mk \
+                       product/*/*/product.mk)))
 
 #
 # Deprecated Products/Platforms