diff --git a/images/base/Dockerfile.ubuntu b/images/base/Dockerfile.ubuntu
index a457c1b..b71a202 100644
--- a/images/base/Dockerfile.ubuntu
+++ b/images/base/Dockerfile.ubuntu
@@ -19,6 +19,7 @@ RUN apt-get update && \
       curl \
       docker-ce \
       docker-ce-cli \
+      docker-buildx-plugin \
       docker-compose-plugin \
       htop \
       locales \
diff --git a/images/base/docker.list b/images/base/docker.list
index 275c6af..8202102 100644
--- a/images/base/docker.list
+++ b/images/base/docker.list
@@ -1 +1 @@
-deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu focal stable
\ No newline at end of file
+deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu focal stable
diff --git a/scripts/build_images.sh b/scripts/build_images.sh
index cc26b6a..a7a9e25 100755
--- a/scripts/build_images.sh
+++ b/scripts/build_images.sh
@@ -7,6 +7,7 @@ source "./lib.sh"
 
 check_dependencies \
   docker
+  depot
 
 source "./images.sh"
 
@@ -100,7 +101,7 @@ for image in "${IMAGES[@]}"; do
     continue
   fi
 
-  run_trace $DRY_RUN depot build --project "gb3p8xrshk" --load \
+  run_trace $DRY_RUN depot build --project "gb3p8xrshk" --load --platform linux/arm64,linux/amd64,linux/arm/v7 --save --metadata-file=build.json \
     "${docker_flags[@]}" \
     "$image_dir" \
     --file="$image_path" \
diff --git a/scripts/push_images.sh b/scripts/push_images.sh
index 70a4c88..e381cca 100755
--- a/scripts/push_images.sh
+++ b/scripts/push_images.sh
@@ -7,6 +7,7 @@ source "./lib.sh"
 
 check_dependencies \
   docker
+  depot
 
 source "./images.sh"
 
@@ -100,7 +101,6 @@ for image in "${IMAGES[@]}"; do
     continue
   fi
 
-  run_trace $DRY_RUN docker push \
-    "${docker_flags[@]}" \
-    "$image_ref" \| indent
+  build_id=$(cat build.json | jq -r .\[\"depot.build\"\].buildID)
+  run_trace $DRY_RUN depot push --project "gb3p8xrshk" "$build_id" 
 done