diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml
index ff4f338..662aa4c 100644
--- a/.forgejo/workflows/release.yaml
+++ b/.forgejo/workflows/release.yaml
@@ -18,5 +18,12 @@ jobs:
         uses: actions/checkout@v3
       - name: Docker login
         run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} https://${REGISTRY}
-      - name: Build and push container
-        run: docker build . -t ${REGISTRY}/${IMAGE_NAMESPACE}:${{ github.ref_name }} -t ${REGISTRY}/${IMAGE_NAMESPACE}:latest --push
+      - name: Build and push
+        uses: actions/docker-build-push@v4
+        with:
+          push: false
+          tags:
+            - ${REGISTRY}/${IMAGE_NAMESPACE}:${{ github.ref_name }}
+            - ${REGISTRY}/${IMAGE_NAMESPACE}:latest
+      - name: Inspect image
+        run: ${REGISTRY}/${IMAGE_NAMESPACE}:${{ github.ref_name }}
diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml
index d51b9d9..8ec837e 100644
--- a/.forgejo/workflows/test-build.yaml
+++ b/.forgejo/workflows/test-build.yaml
@@ -1,4 +1,4 @@
-name: Release
+name: Test
 on:
   push:
     branches:
@@ -13,7 +13,10 @@ jobs:
         run: apk add --no-cache git nodejs
       - name: Check out repository
         uses: actions/checkout@v3
-      - name: Build container
-        run: docker build . -t toolkit-test:${{ github.ref_name }}
+      - name: Build and push
+        uses: actions/docker-build-push@v4
+        with:
+          push: false
+          tags: toolkit-test:${{ github.ref_name }}
       - name: Inspect image
         run: docker image inspect toolkit-test:${{ github.ref_name }}