diff --git a/.github/workflows/formsflow-analytics-push-to-dockerhub.yml b/.github/workflows/formsflow-analytics-push-to-dockerhub.yml
index 268231bcb7..0f436e4fd3 100644
--- a/.github/workflows/formsflow-analytics-push-to-dockerhub.yml
+++ b/.github/workflows/formsflow-analytics-push-to-dockerhub.yml
@@ -67,6 +67,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.context }}
+          platforms: linux/amd64,linux/arm64/v8
           # builder: ${{ steps.buildx.outputs.name }}
           push: true
           # file: ${{ matrix.dockerfile }}
diff --git a/Dockerfile b/Dockerfile
index 48771107ae..a63f23cd27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM node:18-bookworm as frontend-builder
+# Use multi-architecture base images
+FROM --platform=$BUILDPLATFORM node:18-bookworm as frontend-builder
 
 RUN npm install --global --force yarn@1.22.19
 
@@ -27,7 +28,8 @@ COPY --chown=redash webpack.config.js /frontend/
 # Use `yarn run` to ensure the locally installed webpack is used
 RUN yarn clean && yarn build:viz && NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production yarn run webpack && mkdir -p /frontend/client/dist && touch /frontend/client/dist/multi_org.html && touch /frontend/client/dist/index.html
 
-FROM python:3.8-slim-bookworm
+# Use multi-architecture base images
+FROM --platform=$BUILDPLATFORM python:3.8-slim-bookworm
 
 EXPOSE 5000
 
@@ -83,4 +85,4 @@ RUN chown redash /app
 USER redash
 
 ENTRYPOINT ["/app/bin/docker-entrypoint"]
-CMD ["server"]
+CMD ["server"]
\ No newline at end of file