diff --git a/core/definitions.mk b/core/definitions.mk
index 82b5b84..6e7982d 100755
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -178,10 +178,21 @@ if [ $(findstring kf4sbl,$(PRIVATE_MODULE) ) ]; then \
 	echo -ne "serail_baseaddr=0x3f8 serail_type=1 serail_regwidth=1\0" > $(SBL_DIR)/cmdline-acrn; \
 	echo -ne "kernelflinger\0" > $(SBL_DIR)/cmdline-kf; \
 	cp $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out $(SBL_DIR)/acrn.32.out; \
+if [ $(findstring optee,$(TEE) ) ]; then \
+	rm -rf $(SBL_DIR)/cmdline-tee; \
+	rm -rf $(SBL_DIR)/tee.elf; \
+	echo -ne "tee_elf\0" > $(SBL_DIR)/cmdline-tee; \
+	cp $(TOP)/vendor/intel/optee/optee_release_binaries/release/tee.elf $(SBL_DIR)/tee.elf; \
+	python3 $(INTEL_PATH_BUILD)/containertool/GenContainer.py create -t MULTIBOOT \
+        -cl CMD1:$(SBL_DIR)/cmdline-acrn ELF1:$(SBL_DIR)/acrn.32.out CMD2:$(SBL_DIR)/cmdline-kf ELF2:$@ \
+        CMD3:$(SBL_DIR)/cmdline-tee ELF3:$(SBL_DIR)/tee.elf \
+        -k $(INTEL_PATH_BUILD)/testkeys/OS1_TestKey_Priv_RSA3072.pem -o $(PRODUCT_OUT)/sbl_acrn; \
+else \
 	python3 $(INTEL_PATH_BUILD)/containertool/GenContainer.py create -t MULTIBOOT \
 	-cl CMD1:$(SBL_DIR)/cmdline-acrn ELF1:$(SBL_DIR)/acrn.32.out CMD2:$(SBL_DIR)/cmdline-kf ELF2:$@ \
 	-k $(INTEL_PATH_BUILD)/testkeys/OS1_TestKey_Priv_RSA3072.pem -o $(PRODUCT_OUT)/sbl_acrn; \
 fi \
+fi \
 fi
 
 $(hide) if [ "$(PRIVATE_MODULE:debug=)" = fb4sbl-user ]; then \