diff --git a/Dockerfile-ci b/Dockerfile-ci
index fcdd019..3da26ac 100644
--- a/Dockerfile-ci
+++ b/Dockerfile-ci
@@ -6,6 +6,9 @@ RUN /taito-cli-deps/tools/install-ci-tools.sh
 # Install Docker for executing docker builds
 RUN /taito-cli-deps/tools/install-docker-bin.sh
 
+# Install Docker buildx for docker buildx commands
+RUN /taito-cli-deps/tools/install-docker-buildx.sh
+
 # Install Docker Compose for running integration test suites
 RUN /taito-cli-deps/tools/install-docker-compose.sh
 
diff --git a/Dockerfile-cli b/Dockerfile-cli
index 307f1b1..ac64c0c 100644
--- a/Dockerfile-cli
+++ b/Dockerfile-cli
@@ -53,8 +53,9 @@ RUN /taito-cli-deps/tools/install-openshift-cli.sh
 # Install Argo CLI
 RUN /taito-cli-deps/tools/install-argo-cli.sh
 
-# Install docker (required for executing CI/CD builds on container)
+# Install docker and buildx (required for executing CI/CD builds on container)
 RUN /taito-cli-deps/tools/install-docker-bin.sh
+RUN /taito-cli-deps/tools/install-docker-buildx.sh
 
 # Install ci tools
 RUN /taito-cli-deps/tools/install-ci-tools.sh