diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a9e296d9..86aaede5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,10 +61,6 @@ jobs:
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
-      with:
-        # TODO: Remove workaround once https://github.com/docker/build-push-action/issues/761 is fixed
-        driver-opts: |
-          image=moby/buildkit:v0.10.6
 
     - name: Log in to the GitHub Container registry
       uses: docker/login-action@v2
@@ -74,7 +70,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and load
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v4
       with:
         context: ${{ matrix.dir }}
         file: ${{ matrix.file }}
@@ -92,7 +88,7 @@ jobs:
         accept-filenames: usr/share/cmake/Templates/Windows/Windows_TemporaryKey.pfx,etc/trusted-key.key,usr/share/doc/perl-IO-Socket-SSL/certs/server_enc.p12,usr/share/doc/perl-IO-Socket-SSL/certs/server.p12,usr/local/lib/python3.9/dist-packages/azure/core/settings.py,usr/local/lib/python3.8/site-packages/azure/core/settings.py,usr/share/postgresql-common/pgdg/apt.postgresql.org.asc,usr/local/lib/python3.7/dist-packages/azure/core/settings.py,etc/ssl/private/ssl-cert-snakeoil.key,usr/lib/python3.9/site-packages/azure/core/settings.py
 
     - name: Build and push
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v4
       with:
         context: ${{ matrix.dir }}
         file: ${{ matrix.file }}