diff --git a/.gitlab-ci/container.yml b/.gitlab-ci/container.yml
index ef36eb5dd83ec6e57355ae66476212730983f1ff..43a5b9246e59d568db3b082b75bc4ce5207b9e9f 100644
--- a/.gitlab-ci/container.yml
+++ b/.gitlab-ci/container.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 variables:
-  BITBAKE_CONTAINER_VERSION: "0.8"
+  BITBAKE_CONTAINER_VERSION: "0.9"
   OPENHARMONY_CONTAINER_VERSION: "0.1"
 
 .kaniko:
diff --git a/.gitlab-ci/container/bitbake-builder/Dockerfile b/.gitlab-ci/container/bitbake-builder/Dockerfile
index 383207cecbb31b790c0a96e7e0334bb7281ed45c..1329ec99a8752f080eb629fb5ce6fbdb41a20c58 100644
--- a/.gitlab-ci/container/bitbake-builder/Dockerfile
+++ b/.gitlab-ci/container/bitbake-builder/Dockerfile
@@ -47,6 +47,9 @@ RUN echo "dash dash/sh boolean false" | debconf-set-selections \
 # suid to get it working
 RUN chmod u+s $(command -v ping)
 
+# Allow password-less sudo
+RUN echo 'builder ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/toolbox
+
 RUN useradd --create-home --uid 1000 --shell /usr/bin/bash builder
 COPY --chown=builder:builder .gitconfig /home/builder/.gitconfig
 USER builder