diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aa091eb2..b4da9fd0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,28 +9,44 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
+      - uses: crazy-max/ghaction-docker-meta@v1
+        id: docker_meta
+        with:
+          images: oxigraph/oxigraph
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v1
         with:
-          dockerfile: server/Dockerfile
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: oxigraph/oxigraph
-          tag_with_ref: true
-          tags: latest
-          add_git_labels: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: server/Dockerfile
+          pull: true
+          push: true
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
   push_wikibase_to_docker_registry:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
+      - uses: crazy-max/ghaction-docker-meta@v1
+        id: docker_meta
+        with:
+          images: oxigraph/oxigraph-wikibase
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v1
         with:
-          dockerfile: wikibase/Dockerfile
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: oxigraph/oxigraph-wikibase
-          tag_with_ref: true
-          tags: latest
-          add_git_labels: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: wikibase/Dockerfile
+          pull: true
+          push: true
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
   publish_lib_crate:
     runs-on: ubuntu-latest
     steps:
@@ -143,4 +159,4 @@ jobs:
           git add .
           git diff-index --quiet HEAD || git commit -m "Updates pyoxigraph documentation"
           git push
-        working-directory: ./website
\ No newline at end of file
+        working-directory: ./website