diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 16091349..6b198ab6 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -23,7 +23,8 @@ steps:
     - 'darthsim/imgproxy:$TAG_NAME-amd64'
     - '-f'
     - 'docker/Dockerfile'
-    - '--platform=linux/amd64'
+    - '--platform'
+    - 'linux/amd64'
     - '.'
   env:
     - DOCKER_BUILDKIT=1
@@ -36,10 +37,11 @@ steps:
     - 'build'
     - '--load'
     - '-t'
-    - 'darthsim/imgproxy:$TAG_NAME-amd64'
+    - 'darthsim/imgproxy:$TAG_NAME-arm64'
     - '-f'
     - 'docker/Dockerfile'
-    - '--platform=linux/arm64/v8'
+    - '--platform'
+    - 'linux/arm64/v8'
     - '.'
   env:
     - DOCKER_BUILDKIT=1
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5e62d938..382c975d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,13 +2,8 @@ ARG BASE_IMAGE_VERSION="v3.11.0"
 
 FROM darthsim/imgproxy-base:${BASE_IMAGE_VERSION} as build
 
-ARG BUILDARCH
 ARG TARGETARCH
 
-RUN dpkg --add-architecture ${BUILDARCH} \
-  && apt-get update \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libstdc++6:${BUILDARCH}
-
 ENV CGO_ENABLED=1
 ENV GOOS=linux
 ENV GOARCH=$TARGETARCH