diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 143b5633..71f8a387 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -2,9 +2,10 @@ name: Docker
 
 on:
   workflow_dispatch:
+  push:
+    branches: ["master"]
 
 jobs:
-  # Push image to GitHub Packages
   push:
     runs-on: ubuntu-latest
 
@@ -21,12 +22,14 @@ jobs:
         with:
           install: true
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build regtest image
+        run:  ./docker/build.py buildx regtest
 
-      - name: Build image
-        run:  ./docker/build.py buildx --organisation ghcr.io/boltzexchange regtest
+      - name: Build backend image
+        run:  ./docker/build.py buildx boltz
diff --git a/docker/boltz/Dockerfile b/docker/boltz/Dockerfile
index b7edfbf5..0f14cb60 100644
--- a/docker/boltz/Dockerfile
+++ b/docker/boltz/Dockerfile
@@ -21,10 +21,7 @@ WORKDIR /boltz-backend
 RUN git checkout ${VERSION}
 RUN npm install -g npm
 
-# Remove dependency that is not needed for the build and unavailable on ARM64
-RUN sed -i "/grpc-tools/d" package.json
-
-RUN npm install
+RUN npm ci
 RUN npm run compile
 
 FROM node:${NODE_VERSION} AS final