diff --git a/.ci/clang-format.sh b/.ci/clang-format.sh
index a357de5a6..0ccd4062d 100755
--- a/.ci/clang-format.sh
+++ b/.ci/clang-format.sh
@@ -10,7 +10,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
 fi
 
 # Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-15
+CLANG_FORMAT=clang-format-17
 $CLANG_FORMAT --version
 
 if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 4664b81a3..70b238322 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -17,7 +17,11 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install
-        run: sudo apt-get install clang-format-15
+        run: |
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
+          sudo apt update
+          sudo apt install clang-format-17
       - name: Build
         env:
           COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4380fca65..3a7f732eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ endfunction()
 # against all the src files. This should be used before making a pull request.
 # =======================================================================
 
-set(CLANG_FORMAT_POSTFIX "-15")
+set(CLANG_FORMAT_POSTFIX "-17")
 find_program(CLANG_FORMAT
     NAMES clang-format${CLANG_FORMAT_POSTFIX}
           clang-format
diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index 5e070ec8c..365fcb5dc 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -52,15 +52,13 @@ Instance::Instance(Frontend::WindowSDL& window, s32 physical_device_index)
         for (auto const& physical : physical_devices) {
             properties2.emplace_back(properties2.size(), physical.getProperties2());
         }
-        std::sort(properties2.begin(), properties2.end(),
-                  [](const auto& left, const auto& right) {
-                      if (std::get<1>(left).properties.deviceType ==
-                          std::get<1>(right).properties.deviceType) {
-                          return true;
-                      }
-                      return std::get<1>(left).properties.deviceType ==
-                             vk::PhysicalDeviceType::eDiscreteGpu;
-                  });
+        std::sort(properties2.begin(), properties2.end(), [](const auto& left, const auto& right) {
+            if (std::get<1>(left).properties.deviceType ==
+                std::get<1>(right).properties.deviceType) {
+                return true;
+            }
+            return std::get<1>(left).properties.deviceType == vk::PhysicalDeviceType::eDiscreteGpu;
+        });
         physical_device = physical_devices[std::get<0>(properties2[0])];
     } else {
         ASSERT_MSG(physical_device_index < num_physical_devices,