diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 3a880fabf278c..e433d337fb2bf 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -37,8 +37,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64,linux/arm64
-          builder: ${{ steps.buildx.outputs.name }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=tootsuite/mastodon:edge
+          cache-to: type=inline
diff --git a/Dockerfile b/Dockerfile
index bb6a3a61fb4e6..d1a7dea6960da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-# syntax=docker/dockerfile:1.4
 FROM ubuntu:20.04 as build-dep
 
 # Use bash for the shell
@@ -66,8 +65,8 @@ RUN cd /opt/mastodon && \
 FROM ubuntu:20.04
 
 # Copy over all the langs needed for runtime
-COPY --from=build-dep --link /opt/node /opt/node
-COPY --from=build-dep --link /opt/ruby /opt/ruby
+COPY --from=build-dep /opt/node /opt/node
+COPY --from=build-dep /opt/ruby /opt/ruby
 
 # Add more PATHs to the PATH
 ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/opt/mastodon/bin"