diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6132f5850490..a528d643dda6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -348,20 +348,10 @@ jobs:
       - x64
       - arm64
       - armv7
-    runs-on: [self-hosted, linux, x64]
+    runs-on: ubuntu-22.04
     steps:
-      # docker context must be created prior to setting up Docker Buildx
-      # https://github.com/actions-runner-controller/actions-runner-controller/issues/893
-      - name: Set up Docker Context for Buildx
-        shell: bash
-        id: buildx-context
-        run: |
-          docker context inspect buildx-context -f ' ' || docker context create buildx-context
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-        with:
-          endpoint: buildx-context
 
       - name: Run git checkout
         uses: actions/checkout@v3