diff --git a/.gitlab/pipelines/daily-pipeline.yml b/.gitlab/pipelines/daily-pipeline.yml
index 0aa97728d1d9ee46a854b420ac6f55c4ef7f2c24..641a0675b1ba3c353b95f980679f078efd6b0980 100644
--- a/.gitlab/pipelines/daily-pipeline.yml
+++ b/.gitlab/pipelines/daily-pipeline.yml
@@ -49,6 +49,11 @@ build-products-all-log-levels:
   stage: build
   allow_failure: true
 
+build-optee:
+  extends: .build-optee
+  stage: build
+  allow_failure: true
+
 scmi-test:
   extends: .scmi-test
   stage: scmi-test
diff --git a/.gitlab/pipelines/deployment-pipeline.yml b/.gitlab/pipelines/deployment-pipeline.yml
index 8f1b79e71ca77a22b829ff92712bdd9f08bfc829..812f3b63b4100c693280f2c4788c6c8d6d7e1999 100644
--- a/.gitlab/pipelines/deployment-pipeline.yml
+++ b/.gitlab/pipelines/deployment-pipeline.yml
@@ -107,6 +107,14 @@ build-products:
   dependencies:
     - pull-mr
 
+build-optee:
+  extends:
+    - .build-optee
+    - .git-strategy-on-mr
+  stage: build
+  dependencies:
+    - pull-mr
+
 scmi-test:
   extends:
     - .scmi-test
diff --git a/.gitlab/templates/build-test.yml b/.gitlab/templates/build-test.yml
index 28d53e24af20a058677e8032bdbe98c1d04d225e..60d9a6daf3df9fa784b38f8f83c257efc7e137a1 100644
--- a/.gitlab/templates/build-test.yml
+++ b/.gitlab/templates/build-test.yml
@@ -38,3 +38,17 @@
         - ERROR
         - CRIT
         - DISABLED
+
+.build-optee:
+  image: ${CI_REGISTRY_IMAGE}/optee-build:latest
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_DEPTH: 1
+  script:
+    - |
+      make -C /opt/optee-os/ \
+      PLATFORM=vexpress-qemu_armv8a \
+      O=/out \
+      CROSS_COMPILE=arm-none-linux-gnueabihf- \
+      CFG_SCMI_SCPFW=y \
+      CFG_SCP_FIRMWARE=$(pwd)