diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index e25fa03..c0f256a 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -77,25 +77,14 @@ jobs:
     - uses: actions/checkout@v5
     - name: Build
       run: |
-        docker run swift:6.1 uname -a
-        docker run -v $PWD:/spark -w /spark swift:6.1 swift build -c release
+        docker run swift:6.2 uname -a
+        docker run -v $PWD:/spark -w /spark swift:6.2 swift build -c release
 
-  # setup-swift doesn't support ARM linux yet.
   build-ubuntu-arm:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 20
     steps:
     - uses: actions/checkout@v5
-    - name: Build
-      run: |
-        docker run swift:6.1 uname -a
-        docker run -v $PWD:/spark -w /spark swift:6.1 swift build -c release
-
-  build-ubuntu-swift62:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    steps:
-    - uses: actions/checkout@v5
     - name: Build
       run: |
         docker run swift:6.2 uname -a
@@ -117,8 +106,8 @@ jobs:
     - uses: actions/checkout@v5
     - name: Build
       run: |
-        docker run swift:6.1 uname -a
-        docker run --add-host=host.docker.internal:host-gateway -v $PWD:/spark -w /spark -e SPARK_REMOTE='sc://host.docker.internal:15003' swift:6.1 swift test --no-parallel -c release
+        docker run swift:6.2 uname -a
+        docker run --add-host=host.docker.internal:host-gateway -v $PWD:/spark -w /spark -e SPARK_REMOTE='sc://host.docker.internal:15003' swift:6.2 swift test --no-parallel -c release
 
   integration-test-ubuntu-spark41:
     runs-on: ubuntu-latest
@@ -136,8 +125,8 @@ jobs:
     - uses: actions/checkout@v5
     - name: Build
       run: |
-        docker run swift:6.1 uname -a
-        docker run --add-host=host.docker.internal:host-gateway -v $PWD:/spark -w /spark -e SPARK_REMOTE='sc://host.docker.internal:15003' swift:6.1 swift test --no-parallel -c release
+        docker run swift:6.2 uname -a
+        docker run --add-host=host.docker.internal:host-gateway -v $PWD:/spark -w /spark -e SPARK_REMOTE='sc://host.docker.internal:15003' swift:6.2 swift test --no-parallel -c release
 
   integration-test-mac-spark41:
     runs-on: macos-15