diff --git a/.github/workflows/template-publish-image/action.yaml b/.github/workflows/template-publish-image/action.yaml
index 56d51b8a2e6..8bb73b3da94 100644
--- a/.github/workflows/template-publish-image/action.yaml
+++ b/.github/workflows/template-publish-image/action.yaml
@@ -30,7 +30,7 @@ runs:
           type=sha,prefix=v1beta1-
 
     - name: Build and Push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         context: .
         file: ${{ inputs.dockerfile }}
diff --git a/.github/workflows/test-charmed-katib.yaml b/.github/workflows/test-charmed-katib.yaml
index 447ba25c848..5e7da2091cf 100644
--- a/.github/workflows/test-charmed-katib.yaml
+++ b/.github/workflows/test-charmed-katib.yaml
@@ -49,15 +49,19 @@ jobs:
           sudo snap install juju-wait --classic
           sudo pip3 install charmcraft==1.3.1
 
+      - name: Set Up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Build Docker images
         run: |
           set -eux
           images=("katib-controller" "katib-ui" "katib-db-manager")
           folders=("katib-controller" "ui" "db-manager")
           for idx in {0..2}; do
-            docker build . \
+            docker buildx build . \
                 -t docker.io/kubeflowkatib/${images[$idx]}:latest \
-                -f cmd/${folders[$idx]}/v1beta1/Dockerfile
+                -f cmd/${folders[$idx]}/v1beta1/Dockerfile \
+                --load
             docker save docker.io/kubeflowkatib/${images[$idx]} > ${images[$idx]}.tar
             microk8s ctr image import ${images[$idx]}.tar
           done