diff --git a/.buildkite/daily.yml b/.buildkite/daily.yml
new file mode 100644
index 00000000000..1a171f10663
--- /dev/null
+++ b/.buildkite/daily.yml
@@ -0,0 +1,32 @@
+steps:
+  - command:
+    - .buildkite/run.sh
+    env:
+      ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
+      ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3"
+    parallelism: 120
+    timeout_in_minutes: 150
+    retry:
+      manual: true
+    plugins:
+      - docker#v3.5.0:
+          image: "zephyrprojectrtos/ci:v0.11.8"
+          propagate-environment: true
+          volumes:
+            - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
+            - "/var/lib/buildkite-agent/zephyr-module-cache:/var/lib/buildkite-agent/zephyr-module-cache"
+            - "/var/lib/buildkite-agent/zephyr-ccache:/root/.ccache"
+          workdir: "/workdir/zephyr"
+    agents:
+    - "queue=default"
+
+  - wait: ~
+    continue_on_failure: true
+
+  - plugins:
+      - junit-annotate#v1.7.0:
+          artifacts: sanitycheck-*.xml
+
+notify:
+  - email: "builds+int+399+7809482394022958124@lists.zephyrproject.org"
+    if: build.state != "passed"
diff --git a/.buildkite/run.sh b/.buildkite/run.sh
index 0603771ca36..f36fa38cef1 100755
--- a/.buildkite/run.sh
+++ b/.buildkite/run.sh
@@ -21,13 +21,23 @@ echo ""
 echo "--- ccache stats at start"
 ccache -s
 
-if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
-   ./scripts/ci/run_ci.sh  -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \
-	   -m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST}
+if [ -n "${DAILY_BUILD}" ]; then
+   SANITYCHECK_OPTIONS=" --inline-logs -N --build-only --all --retry-failed 3 -v "
+   echo "--- DAILY BUILD"
+   west init -l .
+   west update 1> west.update.log
+   west forall -c 'git reset --hard HEAD'
+   source zephyr-env.sh
+   ./scripts/sanitycheck --subset ${JOB_NUM}/${BUILDKITE_PARALLEL_JOB_COUNT} ${SANITYCHECK_OPTIONS}
 else
-   ./scripts/ci/run_ci.sh -c -b ${BUILDKITE_BRANCH} -r origin \
+   if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
+      ./scripts/ci/run_ci.sh  -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \
+	   -m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST}
+   else
+       ./scripts/ci/run_ci.sh -c -b ${BUILDKITE_BRANCH} -r origin \
 	   -m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT};
-fi;
+   fi
+fi
 
 SANITY_EXIT_STATUS=$?