diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index b488e433..fdb408eb 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -36,28 +36,11 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: meienberger/runtipi:rc-${{ steps.meta.outputs.TAG }}
           cache-from: type=registry,ref=meienberger/runtipi:buildcache
           cache-to: type=registry,ref=meienberger/runtipi:buildcache,mode=max
-    
 
-  # Test installation script
-  # test-install:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@master
-
-  #     - name: Check if user id 1000 exists
-  #       run: |
-  #         if [[ ! $(id -u 1000) -eq 1000 ]]; then
-  #           echo "Creating user 1000"
-  #           sudo useradd -u 1000 test
-  #         fi
-  #       id: check-user-id
-          
-  #     - name: Run install script
-  #       run: sudo ./scripts/start.sh --rc --ci
 
           
diff --git a/Dockerfile b/Dockerfile
index 06d5cae6..1e6ee9cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM node:18-buster-slim AS build
 
-RUN npm install --quiet -g node-gyp
-RUN npm install --quiet -g node-pre-gyp
-
 WORKDIR /common
 COPY ./packages/common /common
 RUN npm i
@@ -33,6 +30,9 @@ RUN apt-get update && apt-get install -y \
     gnupg \
     lsb-release
 
+RUN apt-get install -y \
+    g++ gcc make python
+
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
 
 RUN echo \
@@ -46,7 +46,6 @@ RUN apt-get install -y docker-ce docker-ce-cli containerd.io
 RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 RUN apt-get install -y nodejs
 RUN npm install --quiet -g node-gyp
-RUN npm install --quiet -g node-pre-gyp
 
 # Install docker-compose
 RUN curl -L "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose