diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 49bda7c..1f2fb25 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -30,20 +30,17 @@ jobs:
 
       - name: Set up SSH key for haven
         run: |
-          echo /etc/resolv.conf
           mkdir -p ~/.ssh
           echo "${{ secrets.SSH_KEY_DOCKERBUILD }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
           ssh-keyscan docker-build.haven >> ~/.ssh/known_hosts
 
-      - name: Set up haven Docker Buildx builder
+      - name: Set up remote Docker Buildx builder (docker-build.haven)
         run: |
-          docker buildx create \
-            --name docker-build-haven \
-            --driver docker \
-            --use \
-            docker-build.haven
-          docker buildx inspect docker-build-haven --bootstrap
+          docker context create docker-build-haven \
+            --docker "host=ssh://root@docker-build.haven"
+          docker buildx use docker-build-haven
+          docker buildx inspect --bootstrap
 
       - name: Build and Push Multi-Arch Image
         uses: docker/build-push-action@v6