diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 4e29829..9010689 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -38,14 +38,14 @@ jobs:
         uses: docker/setup-buildx-action@v1
         id: buildx
 
-      - name: Run Docker buildx
+      - name: Build client images
         run: |
                 docker buildx build \
                 --platform linux/amd64,linux/arm64 \
                 --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-client:$BRANCH \
                 --output "type=registry" ./client/
 
-      - name: Run Docker buildx
+      - name: Build server images
         run: |
                 docker buildx build \
                 --platform linux/amd64,linux/arm64 \
diff --git a/client/Dockerfile b/client/Dockerfile
index 192688f..12da2d4 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,8 +1,8 @@
-FROM node:17-buster-slim as build
+FROM amd64/node:17-buster-slim as build
 
 WORKDIR /app
 
-COPY package.json .
+COPY package.json package-lock.json .
 
 RUN npm install
 
@@ -14,7 +14,7 @@ COPY public ./public
 
 RUN npm run build
 
-FROM nginx:1.17.8@sha256:380eb808e2a3b0dd954f92c1cae2f845e6558a15037efefcabc5b4e03d666d03
+FROM nginx:1.21.6
 
 EXPOSE 80
 
diff --git a/server/Dockerfile b/server/Dockerfile
index f095c3b..47e6e5a 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -9,8 +9,7 @@ WORKDIR $APP_HOME
 
 EXPOSE 4000
 
-COPY mix.exs .
-COPY mix.lock .
+COPY mix.exs mix.lock .
 COPY bitcoinex ./bitcoinex
 
 RUN mix do deps.get