diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 181ea62..f32ea76 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -229,7 +229,7 @@
 ifeq (REL,$(PLATFORM_VERSION_CODENAME))
   PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_SDK_VERSION)
 else
-  PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_VERSION_CODENAME)
+  PLATFORM_SYSTEMSDK_VERSIONS += $(subst $(comma),$(space),$(PLATFORM_VERSION_ALL_CODENAMES))
 endif
 PLATFORM_SYSTEMSDK_VERSIONS := $(strip $(sort $(PLATFORM_SYSTEMSDK_VERSIONS)))
 .KATI_READONLY := PLATFORM_SYSTEMSDK_VERSIONS