diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index d86a4dd18bf..b11a7e49880 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -202,7 +202,7 @@ runs:
       if: ${{ inputs.language == 'swift' }}
       id: swiftformat-version
       shell: bash
-      run: echo "SWIFTFORMAT_VERSION=0.57.2" >> $GITHUB_OUTPUT
+      run: echo "SWIFTFORMAT_VERSION=0.58.1" >> $GITHUB_OUTPUT
 
     - name: Checkout swiftformat
       if: ${{ inputs.language == 'swift' }}
diff --git a/scripts/docker/Dockerfile.swift b/scripts/docker/Dockerfile.swift
index f1fb2d92409..715335ab782 100644
--- a/scripts/docker/Dockerfile.swift
+++ b/scripts/docker/Dockerfile.swift
@@ -1,5 +1,5 @@
 ARG SWIFT_VERSION
-ARG SWIFTFORMAT_VERSION=0.57.2
+ARG SWIFTFORMAT_VERSION=0.58.1
 
 FROM ghcr.io/nicklockwood/swiftformat:${SWIFTFORMAT_VERSION} AS swift_format
 FROM swift:${SWIFT_VERSION}-jammy