diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02f32927fd302c87a495a60d4c5332cb7079ce71..8bdd9287cf176e2e6e57c31b9c2d5613b05e62bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -187,3 +187,28 @@ lava-report:
       changes:
         - .oniro-ci/containers/$CONTAINER_PATH/*
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+
+build-bitbake-builder:
+  extends: .build-with-kaniko
+  variables:
+    CONTAINER_PATH: bitbake-builder
+
+build-docs-builder:
+  extends: .build-with-kaniko
+  variables:
+    CONTAINER_PATH: docs-builder
+
+build-dco-check:
+  extends: .build-with-kaniko
+  variables:
+    CONTAINER_PATH: dco-check
+
+build-reuse:
+  extends: .build-with-kaniko
+  variables:
+    CONTAINER_PATH: reuse
+
+build-npm-cspell:
+  extends: .build-with-kaniko
+  variables:
+    CONTAINER_PATH: npm-cspell
diff --git a/.oniro-ci/containers/README.md b/.oniro-ci/containers/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d254ca4275edb1f87cba7fbcb526399f74f4826d
--- /dev/null
+++ b/.oniro-ci/containers/README.md
@@ -0,0 +1,9 @@
+<!--
+SPDX-FileCopyrightText: 2020 Huawei Inc.
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# Reference docker containers
+
+This repository contains definitions of reference docker containers
+used for various build tasks.
diff --git a/.oniro-ci/containers/bitbake-builder/.gitconfig b/.oniro-ci/containers/bitbake-builder/.gitconfig
new file mode 100644
index 0000000000000000000000000000000000000000..8b2e0662e836a5cc68d2c0770408e1dd10c7e034
--- /dev/null
+++ b/.oniro-ci/containers/bitbake-builder/.gitconfig
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2021 Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+[user]
+	name = OSTC Builder 
+	email = ostc-builder@example.org
diff --git a/.oniro-ci/containers/bitbake-builder/Dockerfile b/.oniro-ci/containers/bitbake-builder/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..d7fe0eb10333f71dc39483efc69480c9cdaf0cd5
--- /dev/null
+++ b/.oniro-ci/containers/bitbake-builder/Dockerfile
@@ -0,0 +1,40 @@
+# Copyright 2021 Huawei Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+FROM ubuntu:20.04
+
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools-focal.list /etc/apt/sources.list.d/
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools.gpg /etc/apt/trusted.gpg.d/
+
+ARG DEBIAN_FRONTEND="noninteractive"
+RUN apt-get update -qq \
+ && apt-get install -y eatmydata \
+ && eatmydata apt-get install -qq -y \
+        bash git-repo apt-utils build-essential chrpath cpio diffstat gawk git sudo wget \
+	language-pack-en-base time locales python-is-python3 python3-distutils libssl-dev \
+        iproute2 iputils-ping curl jq \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20210119~20.04.2' \
+ && eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN locale-gen
+
+# Let's just have /bin/sh as bash
+RUN echo "dash dash/sh boolean false" | debconf-set-selections \
+ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
+
+RUN useradd --create-home --uid 1000 --shell /usr/bin/bash builder
+COPY --chown=builder:builder .gitconfig /home/builder/.gitconfig
+USER builder
+WORKDIR /home/builder
diff --git a/.oniro-ci/containers/bitbake-builder/README.md b/.oniro-ci/containers/bitbake-builder/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..24ade74ec434be27d3abd8a274990994fb70e4c5
--- /dev/null
+++ b/.oniro-ci/containers/bitbake-builder/README.md
@@ -0,0 +1,8 @@
+<!--
+SPDX-FileCopyrightText: 2021 Huawei Inc.
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# Bitbake builder for Oniro
+
+This container provides repo and dependencies for using bitbake.
diff --git a/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools-focal.list b/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools-focal.list
new file mode 100644
index 0000000000000000000000000000000000000000..729b1c91794444b3e94ceab467f20b74e3d4ef74
--- /dev/null
+++ b/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools-focal.list
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2020 Huawei Inc.
+deb http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
+# deb-src http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
diff --git a/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools.gpg b/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..b64a0ccb8bff314af290156d2c4c564edea3eca3
Binary files /dev/null and b/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools.gpg differ
diff --git a/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools.gpg.license b/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools.gpg.license
new file mode 100644
index 0000000000000000000000000000000000000000..5f636925ff0fa51836752e0fdbbf1d0cd908992e
--- /dev/null
+++ b/.oniro-ci/containers/bitbake-builder/ppa/zyga-ubuntu-oh-tools.gpg.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: 2020 Huawei Inc.
diff --git a/.oniro-ci/containers/dco-check/Dockerfile b/.oniro-ci/containers/dco-check/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..449a167abac9fbacdf10f4cfee328395538fa17a
--- /dev/null
+++ b/.oniro-ci/containers/dco-check/Dockerfile
@@ -0,0 +1,27 @@
+# Copyright 2021 Huawei Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+FROM ubuntu:20.04
+
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools-focal.list /etc/apt/sources.list.d/
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools.gpg /etc/apt/trusted.gpg.d/
+
+ARG DEBIAN_FRONTEND="noninteractive"
+RUN apt-get update -qq \
+ && apt-get install -y eatmydata \
+ && eatmydata apt-get install -qq -y 'dco-check=0.1.1-1+ostc2' \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20210119~20.04.2' \
+ && eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/.oniro-ci/containers/dco-check/README.md b/.oniro-ci/containers/dco-check/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..30486486dd87803c4668ecb8466d49c69d2b1927
--- /dev/null
+++ b/.oniro-ci/containers/dco-check/README.md
@@ -0,0 +1,8 @@
+<!--
+SPDX-FileCopyrightText: 2021 Huawei Inc.
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# DCO check for Oniro
+
+This container provides the dco-check package.
diff --git a/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools-focal.list b/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools-focal.list
new file mode 100644
index 0000000000000000000000000000000000000000..729b1c91794444b3e94ceab467f20b74e3d4ef74
--- /dev/null
+++ b/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools-focal.list
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2020 Huawei Inc.
+deb http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
+# deb-src http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
diff --git a/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools.gpg b/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..b64a0ccb8bff314af290156d2c4c564edea3eca3
Binary files /dev/null and b/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools.gpg differ
diff --git a/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools.gpg.license b/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools.gpg.license
new file mode 100644
index 0000000000000000000000000000000000000000..5f636925ff0fa51836752e0fdbbf1d0cd908992e
--- /dev/null
+++ b/.oniro-ci/containers/dco-check/ppa/zyga-ubuntu-oh-tools.gpg.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: 2020 Huawei Inc.
diff --git a/.oniro-ci/containers/docs-builder/.gitconfig b/.oniro-ci/containers/docs-builder/.gitconfig
new file mode 100644
index 0000000000000000000000000000000000000000..8b2e0662e836a5cc68d2c0770408e1dd10c7e034
--- /dev/null
+++ b/.oniro-ci/containers/docs-builder/.gitconfig
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2021 Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+[user]
+	name = OSTC Builder 
+	email = ostc-builder@example.org
diff --git a/.oniro-ci/containers/docs-builder/Dockerfile b/.oniro-ci/containers/docs-builder/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..d967e47dfef6c95f654420d238105e72213d1863
--- /dev/null
+++ b/.oniro-ci/containers/docs-builder/Dockerfile
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+FROM ubuntu:20.10
+
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools-groovy.list /etc/apt/sources.list.d/
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools.gpg /etc/apt/trusted.gpg.d/
+
+ARG DEBIAN_FRONTEND="noninteractive"
+RUN apt-get update -qq \
+ && apt-get install -y eatmydata \
+ && eatmydata apt-get install -qq -y \
+      git-repo git \
+      python3-sphinx python3-sphinx-rtd-theme python3-recommonmark python3-sphinx-tabs \
+      python3-sphinxcontrib.plantuml \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20210119~20.10.1' \
+ && eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/.oniro-ci/containers/docs-builder/README.md b/.oniro-ci/containers/docs-builder/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..7b9bf6c9cc95197e6f3bab024da79c7226afa971
--- /dev/null
+++ b/.oniro-ci/containers/docs-builder/README.md
@@ -0,0 +1,8 @@
+<!--
+SPDX-FileCopyrightText: 2021 Huawei Inc.
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# Documentation builder for Oniro
+
+This container provides repo, sphinx and several extensions.
diff --git a/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-groovy.list b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-groovy.list
new file mode 100644
index 0000000000000000000000000000000000000000..2479e09fc82b72eb678cf60f1ceda13d4ccc0d45
--- /dev/null
+++ b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-groovy.list
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2020 Huawei Inc.
+deb http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ groovy main
+# deb-src http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ groovy main
diff --git a/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools.gpg b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..b64a0ccb8bff314af290156d2c4c564edea3eca3
Binary files /dev/null and b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools.gpg differ
diff --git a/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools.gpg.license b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools.gpg.license
new file mode 100644
index 0000000000000000000000000000000000000000..5f636925ff0fa51836752e0fdbbf1d0cd908992e
--- /dev/null
+++ b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools.gpg.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: 2020 Huawei Inc.
diff --git a/.oniro-ci/containers/npm-cspell/Dockerfile b/.oniro-ci/containers/npm-cspell/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..a5930e21f86be70d41bfcbad50d16717e663db9d
--- /dev/null
+++ b/.oniro-ci/containers/npm-cspell/Dockerfile
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+FROM ubuntu:21.04
+
+ARG DEBIAN_FRONTEND="noninteractive"
+RUN apt-get update -qq \
+ && apt-get install -y eatmydata \
+ && eatmydata apt-get install -qq -y npm \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20210119ubuntu0.21.04.1' \
+ && eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN npm install --global cspell
diff --git a/.oniro-ci/containers/npm-cspell/README.md b/.oniro-ci/containers/npm-cspell/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..aa529527200ff03403e83b6675224c972d027607
--- /dev/null
+++ b/.oniro-ci/containers/npm-cspell/README.md
@@ -0,0 +1,8 @@
+<!--
+SPDX-FileCopyrightText: 2021 Huawei Inc.
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# Container with cspell Node package
+
+This container is useful for spell checking with `cspell lint`.
diff --git a/.oniro-ci/containers/reuse/Dockerfile b/.oniro-ci/containers/reuse/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..cc7ad83d1dd94803909ade6e690833de8006d88c
--- /dev/null
+++ b/.oniro-ci/containers/reuse/Dockerfile
@@ -0,0 +1,27 @@
+# Copyright 2020 Huawei Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+FROM ubuntu:20.04
+
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools-focal.list /etc/apt/sources.list.d/
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools.gpg /etc/apt/trusted.gpg.d/
+
+ARG DEBIAN_FRONTEND="noninteractive"
+RUN apt-get update -qq \
+ && apt-get install -y eatmydata \
+ && eatmydata apt-get install -qq -y reuse=0.13.0-1 'spread=0~20201124-1+ohos3' \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20210119~20.04.2' \
+ && eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/.oniro-ci/containers/reuse/README.md b/.oniro-ci/containers/reuse/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c73d49c5b87bc7c7269f9f8a84b607d11cfc5ea5
--- /dev/null
+++ b/.oniro-ci/containers/reuse/README.md
@@ -0,0 +1,8 @@
+<!--
+SPDX-FileCopyrightText: 2020 Huawei Inc.
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# REUSE check for Oniro
+
+This container provides the reuse package.
diff --git a/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools-focal.list b/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools-focal.list
new file mode 100644
index 0000000000000000000000000000000000000000..729b1c91794444b3e94ceab467f20b74e3d4ef74
--- /dev/null
+++ b/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools-focal.list
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2020 Huawei Inc.
+deb http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
+# deb-src http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
diff --git a/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools.gpg b/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..b64a0ccb8bff314af290156d2c4c564edea3eca3
Binary files /dev/null and b/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools.gpg differ
diff --git a/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools.gpg.license b/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools.gpg.license
new file mode 100644
index 0000000000000000000000000000000000000000..5f636925ff0fa51836752e0fdbbf1d0cd908992e
--- /dev/null
+++ b/.oniro-ci/containers/reuse/ppa/zyga-ubuntu-oh-tools.gpg.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: 2020 Huawei Inc.