diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 35e697565aa..5426c50e562 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -70,7 +70,6 @@ RUN apt-get update \
     && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
     && apt-get update \
     && apt-get install -y docker-ce-cli \
-    && docker buildx create --use \
     #
     # Install pip & pre-commit
     && apt-get -y install python3-pip \
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index 4a755b7421e..4d79cac0227 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -53,6 +53,9 @@ jobs:
           # Server address of Docker registry. If not set then will default to Docker Hub
           registry: ghcr.io
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Publish on GitHub Container Registry
         run: make publish-multiarch
 
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index a4714b5abc5..9d85879b34b 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -59,6 +59,9 @@ jobs:
         env:
           VERSION: ${{ steps.get_version.outputs.VERSION }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Publish KEDA images on GitHub Container Registry
         run: make publish-multiarch
         env:
diff --git a/tools/build-tools.Dockerfile b/tools/build-tools.Dockerfile
index a57d8939803..e3cc2e3d8a0 100644
--- a/tools/build-tools.Dockerfile
+++ b/tools/build-tools.Dockerfile
@@ -28,8 +28,7 @@ RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent soft
     curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null && \
     add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" && \
     apt-get update &&\
-    apt-get install -y docker-ce-cli && \
-    docker buildx create --use
+    apt-get install -y docker-ce-cli
 
 # Install golang
 RUN GO_VERSION=1.17.3 && \