diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 00225d1f478..8039a51746f 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -193,7 +193,7 @@ runs:
       if: ${{ inputs.language == 'swift' }}
       id: swiftformat-version
       shell: bash
-      run: echo "SWIFTFORMAT_VERSION=0.58.5" >> $GITHUB_OUTPUT
+      run: echo "SWIFTFORMAT_VERSION=0.58.6" >> $GITHUB_OUTPUT
 
     - name: Checkout swiftformat
       if: ${{ inputs.language == 'swift' }}
diff --git a/scripts/docker/Dockerfile.swift b/scripts/docker/Dockerfile.swift
index ea67dcca645..ec52c22213f 100644
--- a/scripts/docker/Dockerfile.swift
+++ b/scripts/docker/Dockerfile.swift
@@ -1,5 +1,5 @@
 ARG SWIFT_VERSION
-ARG SWIFTFORMAT_VERSION=0.58.5
+ARG SWIFTFORMAT_VERSION=0.58.6
 
 FROM ghcr.io/nicklockwood/swiftformat:${SWIFTFORMAT_VERSION} AS swift_format
 FROM swift:${SWIFT_VERSION}-jammy