diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 9cd3aabd0e..8b9e32e0bf 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -28,7 +28,7 @@ jobs:
         context: ./docker/images/n8n
         build-args: |
           N8N_VERSION=${{steps.vars.outputs.tag}}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
         push: true
         tags: |
           ${{ secrets.DOCKER_USERNAME }}/n8n:${{ steps.vars.outputs.tag }}
@@ -39,7 +39,7 @@ jobs:
         context: ./docker/images/n8n-debian
         build-args: |
           N8N_VERSION=${{ steps.vars.outputs.tag }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
         push: true
         tags: |
           ${{ secrets.DOCKER_USERNAME }}/n8n:${{ steps.vars.outputs.tag }}-debian
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index f5aa3cb594..d3fe4f85be 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -13,6 +13,7 @@ USER root
 # Install n8n and the also temporary all the packages
 # it needs to build it correctly.
 RUN apk --update add --virtual build-dependencies python3 build-base ca-certificates && \
+	npm config set python "$(which python3)" && \
 	npm_config_user=root npm install -g full-icu n8n@${N8N_VERSION} && \
 	apk del build-dependencies \
 	&& rm -rf /root /tmp/* /var/cache/apk/* && mkdir /root;